From 2ba330b7bc4976228309983fc2cac51ca3e78f6a Mon Sep 17 00:00:00 2001 From: Philip Cristiano Date: Thu, 31 Oct 2024 13:39:45 -0400 Subject: [PATCH] chore: Use sqlx fork until upstream merge Use a fork of sqlx until support for `?` is merged in # https://github.com/launchbadge/sqlx/pull/3553 --- Cargo.lock | 67 ++++++------------------------------------------------ Cargo.toml | 9 +++++++- 2 files changed, 15 insertions(+), 61 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 821a49e..f303980 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1711,7 +1711,6 @@ version = "0.30.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2e99fb7a497b1e3339bc746195567ed8d3e24945ecd636e3619d20b9de9e9149" dependencies = [ - "cc", "pkg-config", "vcpkg", ] @@ -1809,12 +1808,6 @@ dependencies = [ "unicase", ] -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - [[package]] name = "miniz_oxide" version = "0.8.0" @@ -1836,16 +1829,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "nom" -version = "7.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" -dependencies = [ - "memchr", - "minimal-lexical", -] - [[package]] name = "nu-ansi-term" version = "0.46.0" @@ -2142,12 +2125,6 @@ dependencies = [ "windows-targets 0.52.6", ] -[[package]] -name = "paste" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" - [[package]] name = "pem-rfc7468" version = "0.7.0" @@ -3283,16 +3260,6 @@ dependencies = [ "der", ] -[[package]] -name = "sqlformat" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bba3a93db0cc4f7bdece8bb09e77e2e785c20bfebf79eb8340ed80708048790" -dependencies = [ - "nom", - "unicode_categories", -] - [[package]] name = "sqlparser" version = "0.51.0" @@ -3305,8 +3272,7 @@ dependencies = [ [[package]] name = "sqlx" version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93334716a037193fac19df402f8571269c84a00852f6a7066b5d2616dcd64d3e" +source = "git+https://github.com/philipcristiano/sqlx.git?branch=pglquery-hasarraytype#9a222d501543879762eeae315f8837a5f8a4d4b3" dependencies = [ "sqlx-core", "sqlx-macros", @@ -3318,30 +3284,24 @@ dependencies = [ [[package]] name = "sqlx-core" version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4d8060b456358185f7d50c55d9b5066ad956956fddec42ee2e8567134a8936e" +source = "git+https://github.com/philipcristiano/sqlx.git?branch=pglquery-hasarraytype#9a222d501543879762eeae315f8837a5f8a4d4b3" dependencies = [ - "atoi", - "byteorder", "bytes", "chrono", "crc", "crossbeam-queue", "either", "event-listener", - "futures-channel", "futures-core", "futures-intrusive", "futures-io", "futures-util", "hashbrown 0.14.5", "hashlink", - "hex", "indexmap 2.6.0", "log", "memchr", "once_cell", - "paste", "percent-encoding", "rust_decimal", "rustls 0.23.15", @@ -3350,7 +3310,6 @@ dependencies = [ "serde_json", "sha2", "smallvec", - "sqlformat", "thiserror", "tokio", "tokio-stream", @@ -3363,8 +3322,7 @@ dependencies = [ [[package]] name = "sqlx-macros" version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cac0692bcc9de3b073e8d747391827297e075c7710ff6276d9f7a1f3d58c6657" +source = "git+https://github.com/philipcristiano/sqlx.git?branch=pglquery-hasarraytype#9a222d501543879762eeae315f8837a5f8a4d4b3" dependencies = [ "proc-macro2", "quote", @@ -3376,8 +3334,7 @@ dependencies = [ [[package]] name = "sqlx-macros-core" version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1804e8a7c7865599c9c79be146dc8a9fd8cc86935fa641d3ea58e5f0688abaa5" +source = "git+https://github.com/philipcristiano/sqlx.git?branch=pglquery-hasarraytype#9a222d501543879762eeae315f8837a5f8a4d4b3" dependencies = [ "dotenvy", "either", @@ -3402,8 +3359,7 @@ dependencies = [ [[package]] name = "sqlx-mysql" version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64bb4714269afa44aef2755150a0fc19d756fb580a67db8885608cf02f47d06a" +source = "git+https://github.com/philipcristiano/sqlx.git?branch=pglquery-hasarraytype#9a222d501543879762eeae315f8837a5f8a4d4b3" dependencies = [ "atoi", "base64 0.22.1", @@ -3447,8 +3403,7 @@ dependencies = [ [[package]] name = "sqlx-postgres" version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fa91a732d854c5d7726349bb4bb879bb9478993ceb764247660aee25f67c2f8" +source = "git+https://github.com/philipcristiano/sqlx.git?branch=pglquery-hasarraytype#9a222d501543879762eeae315f8837a5f8a4d4b3" dependencies = [ "atoi", "base64 0.22.1", @@ -3460,7 +3415,6 @@ dependencies = [ "etcetera", "futures-channel", "futures-core", - "futures-io", "futures-util", "hex", "hkdf", @@ -3488,8 +3442,7 @@ dependencies = [ [[package]] name = "sqlx-sqlite" version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5b2cf34a45953bfd3daaf3db0f7a7878ab9b7a6b91b422d24a7a9e4c857b680" +source = "git+https://github.com/philipcristiano/sqlx.git?branch=pglquery-hasarraytype#9a222d501543879762eeae315f8837a5f8a4d4b3" dependencies = [ "atoi", "chrono", @@ -4077,12 +4030,6 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e70f2a8b45122e719eb623c01822704c4e0907e7e426a05927e1a1cfff5b75d0" -[[package]] -name = "unicode_categories" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" - [[package]] name = "universal-hash" version = "0.5.1" diff --git a/Cargo.toml b/Cargo.toml index 7c5c59e..84436c2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -31,7 +31,10 @@ tonic = { version = "0.12.0", features = ["tls", "tls-roots"] } url = "2.5.0" signal-hook = "0.3.17" service_conventions = { version = "0.0.23", features = ["tracing", "oidc", "tracing-http"]} -sqlx = { version = "0.8.0", features = ["runtime-tokio", "tls-rustls", "postgres", "macros", "uuid", "chrono", "rust_decimal"] } + +# https://github.com/launchbadge/sqlx/pull/3553 +sqlx = { git = "https://github.com/philipcristiano/sqlx.git", branch="pglquery-hasarraytype", features = ["runtime-tokio", "tls-rustls", "postgres", "macros", "uuid", "chrono", "rust_decimal"] } +# sqlx = { version = "0.8.0", features = ["runtime-tokio", "tls-rustls", "postgres", "macros", "uuid", "chrono", "rust_decimal"] } base64 = "0.22.1" reqwest = { version = "0.12.4", features = ["rustls-tls", "json"], default-features = false } uuid = {version = "1.8.0", features = ["v4", "serde"]} @@ -46,3 +49,7 @@ chronoutil = "0.2.7" declare_schema = { version = "0.0.9" } charts-rs = "0.3.11" + +[patch.crates-io] +# https://github.com/launchbadge/sqlx/pull/3553 +sqlx = { git = "https://github.com/philipcristiano/sqlx.git", branch="pglquery-hasarraytype", features = ["runtime-tokio", "tls-rustls", "postgres", "macros", "uuid", "chrono", "rust_decimal"] }