From a320025a443294499435bde84045b8d20e37f649 Mon Sep 17 00:00:00 2001 From: Yohe-Am <56622350+Yohe-Am@users.noreply.github.com> Date: Wed, 9 Oct 2024 07:41:29 +0200 Subject: [PATCH] fix: version compatability fixes --- Cargo.lock | 42 +++++++++++----------- Cargo.toml | 2 +- quaint/Cargo.toml | 11 +++--- query-engine/query-engine-c-abi/Cargo.toml | 2 +- 4 files changed, 30 insertions(+), 27 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 62a21959bf0f..da07babc168a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -316,9 +316,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "bitvec" @@ -515,11 +515,11 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.83" +version = "1.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +checksum = "2e80e3b6a3ab07840e1cae9b0666a63970dc28e8ed5ffbcdacbfc760c281bfc1" dependencies = [ - "libc", + "shlex", ] [[package]] @@ -2314,9 +2314,9 @@ dependencies = [ [[package]] name = "libsqlite3-sys" -version = "0.28.0" +version = "0.30.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c10584274047cb335c23d3e61bcef8e323adae7c5c8c760540f73610177fc3f" +checksum = "2e99fb7a497b1e3339bc746195567ed8d3e24945ecd636e3619d20b9de9e9149" dependencies = [ "cc", "pkg-config", @@ -2845,7 +2845,7 @@ version = "2.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43792514b0c95c5beec42996da0c1b39265b02b75c97baa82d163d3ef55cbfa7" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.6.0", "ctor", "napi-derive", "napi-sys", @@ -3071,7 +3071,7 @@ version = "0.10.60" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "79a4c6c3a2b158f7f8f2a2fc5a969fa3a068df6fc9dbb4a43845436e3af7c800" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.6.0", "cfg-if", "foreign-types", "libc", @@ -3466,7 +3466,7 @@ dependencies = [ [[package]] name = "postgres-native-tls" version = "0.5.0" -source = "git+https://github.com/prisma/rust-postgres?branch=pgbouncer-mode#54a490bc6afa315abb9867304fb67e8b12a8fbf3" +source = "git+https://github.com/prisma/rust-postgres?rev=54a490bc#54a490bc6afa315abb9867304fb67e8b12a8fbf3" dependencies = [ "native-tls", "tokio", @@ -3477,7 +3477,7 @@ dependencies = [ [[package]] name = "postgres-protocol" version = "0.6.4" -source = "git+https://github.com/prisma/rust-postgres?branch=pgbouncer-mode#54a490bc6afa315abb9867304fb67e8b12a8fbf3" +source = "git+https://github.com/prisma/rust-postgres?rev=54a490bc#54a490bc6afa315abb9867304fb67e8b12a8fbf3" dependencies = [ "base64 0.13.1", "byteorder", @@ -3494,7 +3494,7 @@ dependencies = [ [[package]] name = "postgres-types" version = "0.2.4" -source = "git+https://github.com/prisma/rust-postgres?branch=pgbouncer-mode#54a490bc6afa315abb9867304fb67e8b12a8fbf3" +source = "git+https://github.com/prisma/rust-postgres?rev=54a490bc#54a490bc6afa315abb9867304fb67e8b12a8fbf3" dependencies = [ "bit-vec", "bytes", @@ -4578,11 +4578,11 @@ dependencies = [ [[package]] name = "rusqlite" -version = "0.31.0" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b838eba278d213a8beaf485bd313fd580ca4505a00d5871caeb1457c55322cae" +checksum = "7753b721174eb8ff87a9a0e799e2d7bc3749323e773db92e0984debb00019d6e" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.6.0", "chrono", "fallible-iterator 0.3.0", "fallible-streaming-iterator", @@ -4645,7 +4645,7 @@ version = "0.38.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.6.0", "errno", "libc", "linux-raw-sys", @@ -5365,9 +5365,9 @@ dependencies = [ [[package]] name = "sqlx-core" -version = "0.8.0" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a999083c1af5b5d6c071d34a708a19ba3e02106ad82ef7bbd69f5e48266b613b" +checksum = "d4d8060b456358185f7d50c55d9b5066ad956956fddec42ee2e8567134a8936e" dependencies = [ "atoi", "byteorder", @@ -5398,9 +5398,9 @@ dependencies = [ [[package]] name = "sqlx-sqlite" -version = "0.8.0" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2cdd83c008a622d94499c0006d8ee5f821f36c89b7d625c900e5dc30b5c5ee" +checksum = "d5b2cf34a45953bfd3daaf3db0f7a7878ab9b7a6b91b422d24a7a9e4c857b680" dependencies = [ "atoi", "flume", @@ -5807,7 +5807,7 @@ dependencies = [ [[package]] name = "tokio-postgres" version = "0.7.7" -source = "git+https://github.com/prisma/rust-postgres?branch=pgbouncer-mode#54a490bc6afa315abb9867304fb67e8b12a8fbf3" +source = "git+https://github.com/prisma/rust-postgres?rev=54a490bc#54a490bc6afa315abb9867304fb67e8b12a8fbf3" dependencies = [ "async-trait", "byteorder", diff --git a/Cargo.toml b/Cargo.toml index f2000ba619d3..2fb3a9ee693c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -74,7 +74,7 @@ wasm-bindgen = { version = "0.2.92" } wasm-bindgen-futures = { version = "0.4" } wasm-rs-dbg = { version = "0.1.2", default-features = false, features = ["console-error"] } wasm-bindgen-test = { version = "0.3.0" } -url = { version = "2.5.0" } +url = { version = "2.4.1" } bson = { version = "2.11.0", features = ["chrono-0_4", "uuid-1"] } mongodb = { git = "https://github.com/prisma/mongo-rust-driver.git", branch = "RUST-1994/happy-eyeballs" } diff --git a/quaint/Cargo.toml b/quaint/Cargo.toml index b63fe18b4941..c5e5c9c81131 100644 --- a/quaint/Cargo.toml +++ b/quaint/Cargo.toml @@ -122,7 +122,7 @@ optional = true branch = "vendored-openssl" [dependencies.rusqlite] -version = "0.31" +version = "0.32" features = ["chrono", "column_decltype"] optional = true @@ -155,7 +155,8 @@ features = [ "with-bit-vec-0_6", ] git = "https://github.com/prisma/rust-postgres" -branch = "pgbouncer-mode" +# branch = "pgbouncer-mode" +rev = "54a490bc" optional = true [dependencies.postgres-types] @@ -166,12 +167,14 @@ features = [ "with-bit-vec-0_6", ] git = "https://github.com/prisma/rust-postgres" -branch = "pgbouncer-mode" +# branch = "pgbouncer-mode" +rev = "54a490bc" optional = true [dependencies.postgres-native-tls] git = "https://github.com/prisma/rust-postgres" -branch = "pgbouncer-mode" +# branch = "pgbouncer-mode" +rev = "54a490bc" optional = true [dependencies.tokio] diff --git a/query-engine/query-engine-c-abi/Cargo.toml b/query-engine/query-engine-c-abi/Cargo.toml index ff55be35b8e9..e9f009397e01 100644 --- a/query-engine/query-engine-c-abi/Cargo.toml +++ b/query-engine/query-engine-c-abi/Cargo.toml @@ -25,7 +25,7 @@ chrono.workspace = true quaint = { path = "../../quaint", default-features = false, features = [ "sqlite", ] } -rusqlite = "0.31" +rusqlite = "0.32" uuid.workspace = true thiserror = "1" connection-string.workspace = true