diff --git a/Cargo.lock b/Cargo.lock index f5c2d5450a278..595efdcd81ec8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3692,9 +3692,9 @@ dependencies = [ [[package]] name = "libsqlite3-sys" -version = "0.24.2" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "898745e570c7d0453cc1fbc4a701eb6c662ed54e8fec8b7d14be137ebeeb9d14" +checksum = "9f0455f2c1bc9a7caa792907026e469c1d91761fb0ea37cbb16427c77280cf35" dependencies = [ "cc", "pkg-config", @@ -7693,8 +7693,7 @@ dependencies = [ [[package]] name = "sqlx" version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9249290c05928352f71c077cc44a464d880c63f26f7534728cca008e135c0428" +source = "git+https://github.com/huitseeker/sqlx?branch=update_libsqlite3#fa4613e770a82a606b2cbaa4d36e3ca628c67dad" dependencies = [ "sqlx-core", "sqlx-macros", @@ -7703,8 +7702,7 @@ dependencies = [ [[package]] name = "sqlx-core" version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcbc16ddba161afc99e14d1713a453747a2b07fc097d2009f4c300ec99286105" +source = "git+https://github.com/huitseeker/sqlx?branch=update_libsqlite3#fa4613e770a82a606b2cbaa4d36e3ca628c67dad" dependencies = [ "ahash", "atoi", @@ -7749,8 +7747,7 @@ dependencies = [ [[package]] name = "sqlx-macros" version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b850fa514dc11f2ee85be9d055c512aa866746adfacd1cb42d867d68e6a5b0d9" +source = "git+https://github.com/huitseeker/sqlx?branch=update_libsqlite3#fa4613e770a82a606b2cbaa4d36e3ca628c67dad" dependencies = [ "dotenvy", "either", @@ -7768,8 +7765,7 @@ dependencies = [ [[package]] name = "sqlx-rt" version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24c5b2d25fa654cc5f841750b8e1cdedbe21189bf9a9382ee90bfa9dd3562396" +source = "git+https://github.com/huitseeker/sqlx?branch=update_libsqlite3#fa4613e770a82a606b2cbaa4d36e3ca628c67dad" dependencies = [ "once_cell", "tokio", diff --git a/Cargo.toml b/Cargo.toml index 5a187a8c8d618..d4cf4a6292112 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -107,3 +107,8 @@ anemo-tower = { git = "https://github.com/mystenlabs/anemo.git", rev = "7da7c9a1 # Use the same workspace-hack across crates. workspace-hack = { path = "crates/workspace-hack" } + +# patch sqlx to a version using libsqlite3-sys v0.25.1 or later, see +# https://github.com/launchbadge/sqlx/pull/2176 +[patch.crates-io] +sqlx = { git="https://github.com/huitseeker/sqlx", branch="update_libsqlite3" } diff --git a/crates/workspace-hack/Cargo.toml b/crates/workspace-hack/Cargo.toml index 2870dddea769d..cc26f34fc23f1 100644 --- a/crates/workspace-hack/Cargo.toml +++ b/crates/workspace-hack/Cargo.toml @@ -277,7 +277,7 @@ lexical-core = { version = "0.7", features = ["arrayvec", "correct", "ryu", "sta libc = { version = "0.2", features = ["std"] } libm = { version = "0.2" } librocksdb-sys = { version = "0.8", features = ["bzip2", "bzip2-sys", "libz-sys", "lz4", "snappy", "static", "zlib", "zstd", "zstd-sys"] } -libsqlite3-sys = { version = "0.24", default-features = false, features = ["bundled", "bundled_bindings", "cc", "pkg-config", "unlock_notify", "vcpkg"] } +libsqlite3-sys = { version = "0.25", default-features = false, features = ["bundled", "bundled_bindings", "cc", "pkg-config", "unlock_notify", "vcpkg"] } libtest-mimic = { version = "0.5", default-features = false } libz-sys = { version = "1", default-features = false, features = ["static"] } linked-hash-map = { version = "0.5", default-features = false } @@ -501,9 +501,9 @@ soketto = { version = "0.7" } spin-274715c4dabd11b0 = { package = "spin", version = "0.9", features = ["barrier", "lazy", "lock_api", "lock_api_crate", "mutex", "once", "rwlock", "spin_mutex"] } spki = { version = "0.6", default-features = false, features = ["alloc", "base64ct", "std"] } sqlformat = { version = "0.2", default-features = false } -sqlx = { version = "0.6", features = ["_rt-tokio", "macros", "migrate", "runtime-tokio-rustls", "sqlite", "sqlx-macros"] } -sqlx-core = { version = "0.6", default-features = false, features = ["_rt-tokio", "_tls-rustls", "any", "crc", "flume", "futures-executor", "libsqlite3-sys", "migrate", "runtime-tokio-rustls", "rustls", "rustls-pemfile", "sha2", "sqlite", "tokio-stream", "webpki-roots"] } -sqlx-rt = { version = "0.6", default-features = false, features = ["_rt-tokio", "_tls-rustls", "once_cell", "runtime-tokio-rustls", "tokio", "tokio-rustls"] } +sqlx = { git = "https://github.com/huitseeker/sqlx", branch = "update_libsqlite3", features = ["_rt-tokio", "macros", "migrate", "runtime-tokio-rustls", "sqlite", "sqlx-macros"] } +sqlx-core = { git = "https://github.com/huitseeker/sqlx", branch = "update_libsqlite3", default-features = false, features = ["_rt-tokio", "_tls-rustls", "any", "crc", "flume", "futures-executor", "libsqlite3-sys", "migrate", "runtime-tokio-rustls", "rustls", "rustls-pemfile", "sha2", "sqlite", "tokio-stream", "webpki-roots"] } +sqlx-rt = { git = "https://github.com/huitseeker/sqlx", branch = "update_libsqlite3", default-features = false, features = ["_rt-tokio", "_tls-rustls", "once_cell", "runtime-tokio-rustls", "tokio", "tokio-rustls"] } stable_deref_trait = { version = "1", features = ["alloc", "std"] } static_assertions = { version = "1", default-features = false } stringprep = { version = "0.1", default-features = false } @@ -925,7 +925,7 @@ libc = { version = "0.2", features = ["std"] } libloading = { version = "0.7", default-features = false } libm = { version = "0.2" } librocksdb-sys = { version = "0.8", features = ["bzip2", "bzip2-sys", "libz-sys", "lz4", "snappy", "static", "zlib", "zstd", "zstd-sys"] } -libsqlite3-sys = { version = "0.24", default-features = false, features = ["bundled", "bundled_bindings", "cc", "pkg-config", "unlock_notify", "vcpkg"] } +libsqlite3-sys = { version = "0.25", default-features = false, features = ["bundled", "bundled_bindings", "cc", "pkg-config", "unlock_notify", "vcpkg"] } libtest-mimic = { version = "0.5", default-features = false } libz-sys = { version = "1", default-features = false, features = ["static"] } linked-hash-map = { version = "0.5", default-features = false } @@ -1195,10 +1195,10 @@ soketto = { version = "0.7" } spin-274715c4dabd11b0 = { package = "spin", version = "0.9", features = ["barrier", "lazy", "lock_api", "lock_api_crate", "mutex", "once", "rwlock", "spin_mutex"] } spki = { version = "0.6", default-features = false, features = ["alloc", "base64ct", "std"] } sqlformat = { version = "0.2", default-features = false } -sqlx = { version = "0.6", features = ["_rt-tokio", "macros", "migrate", "runtime-tokio-rustls", "sqlite", "sqlx-macros"] } -sqlx-core = { version = "0.6", default-features = false, features = ["_rt-tokio", "_tls-rustls", "any", "crc", "flume", "futures-executor", "libsqlite3-sys", "migrate", "runtime-tokio-rustls", "rustls", "rustls-pemfile", "sha2", "sqlite", "tokio-stream", "webpki-roots"] } -sqlx-macros = { version = "0.6", default-features = false, features = ["_rt-tokio", "migrate", "runtime-tokio-rustls", "sha2", "sqlite"] } -sqlx-rt = { version = "0.6", default-features = false, features = ["_rt-tokio", "_tls-rustls", "once_cell", "runtime-tokio-rustls", "tokio", "tokio-rustls"] } +sqlx = { git = "https://github.com/huitseeker/sqlx", branch = "update_libsqlite3", features = ["_rt-tokio", "macros", "migrate", "runtime-tokio-rustls", "sqlite", "sqlx-macros"] } +sqlx-core = { git = "https://github.com/huitseeker/sqlx", branch = "update_libsqlite3", default-features = false, features = ["_rt-tokio", "_tls-rustls", "any", "crc", "flume", "futures-executor", "libsqlite3-sys", "migrate", "runtime-tokio-rustls", "rustls", "rustls-pemfile", "sha2", "sqlite", "tokio-stream", "webpki-roots"] } +sqlx-macros = { git = "https://github.com/huitseeker/sqlx", branch = "update_libsqlite3", default-features = false, features = ["_rt-tokio", "migrate", "runtime-tokio-rustls", "sha2", "sqlite"] } +sqlx-rt = { git = "https://github.com/huitseeker/sqlx", branch = "update_libsqlite3", default-features = false, features = ["_rt-tokio", "_tls-rustls", "once_cell", "runtime-tokio-rustls", "tokio", "tokio-rustls"] } stable_deref_trait = { version = "1", features = ["alloc", "std"] } static_assertions = { version = "1", default-features = false } stringprep = { version = "0.1", default-features = false }