From 56987003622309de1a775fb848346d4a3c8122a3 Mon Sep 17 00:00:00 2001 From: "vincent.leemrijse" Date: Tue, 21 Jan 2025 21:10:47 +0100 Subject: [PATCH 1/2] chore: bumps to fix some issues in tiberius --- Cargo.lock | 40 ++++++++++++---------------------------- connectorx/Cargo.toml | 6 +++--- 2 files changed, 15 insertions(+), 31 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c0361fc73..0e9cc10f3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -515,22 +515,21 @@ checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] name = "bb8" -version = "0.7.1" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e9f4fa9768efd269499d8fba693260cfc670891cf6de3adc935588447a77cc8" +checksum = "d89aabfae550a5c44b43ab941844ffcd2e993cb6900b342debf59e9ea74acdb8" dependencies = [ "async-trait", - "futures-channel", "futures-util", - "parking_lot 0.11.2", + "parking_lot 0.12.1", "tokio", ] [[package]] name = "bb8-tiberius" -version = "0.8.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8a33c87124c1938413e45ab6a6655e49d9e4cd015e05db61d6ab5a4f96b2c83" +checksum = "61780ef76db8989f8fd30d9a63fcb1d7d1b8d7df3b7d4662c09e66474877b0e6" dependencies = [ "async-trait", "bb8", @@ -711,9 +710,9 @@ dependencies = [ [[package]] name = "bytemuck" -version = "1.14.1" +version = "1.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed2490600f404f2b94c167e31d3ed1d5f3c225a0f3b80230053b3e0b7b962bd9" +checksum = "ef657dfab802224e671f5818e9a4935f9b1957ed18e58292690cc39e7a4092a3" dependencies = [ "bytemuck_derive", ] @@ -2162,7 +2161,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.10", + "socket2 0.5.5", "tokio", "tower-service", "tracing", @@ -3101,20 +3100,6 @@ dependencies = [ "vcpkg", ] -[[package]] -name = "opentls" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f561874f8d6ecfb674fc08863414040c93cc90c0b6963fe679895fab8b65560" -dependencies = [ - "futures-util", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "url", -] - [[package]] name = "oracle" version = "0.5.7" @@ -4139,9 +4124,9 @@ dependencies = [ [[package]] name = "rgb" -version = "0.8.37" +version = "0.8.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8" +checksum = "57397d16646700483b67d2dd6511d79318f9d057fdbd21a4066aeac8b41d310a" dependencies = [ "bytemuck", ] @@ -4917,9 +4902,9 @@ dependencies = [ [[package]] name = "tiberius" -version = "0.7.3" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "833311bc8e26e96c73ad1b5c1f488c588808c747a318905ec67e43d422ea2c08" +checksum = "31d6bfb7b1de4275b4cf566bad8d0c133d800e3d8b35d256407371fab49cfed6" dependencies = [ "async-native-tls", "async-trait", @@ -4936,7 +4921,6 @@ dependencies = [ "libgssapi", "num-traits", "once_cell", - "opentls", "pin-project-lite", "pretty-hex", "rust_decimal", diff --git a/connectorx/Cargo.toml b/connectorx/Cargo.toml index 9e1307c70..01742d197 100644 --- a/connectorx/Cargo.toml +++ b/connectorx/Cargo.toml @@ -24,8 +24,8 @@ chrono = "0.4" arrow = {workspace = true, optional = true} arrow2 = {workspace = true, default-features = false, optional = true} -bb8 = {version = "0.7", optional = true} -bb8-tiberius = {version = "0.8", optional = true} +bb8 = {version = "0.8", optional = true} +bb8-tiberius = {version = "0.11", optional = true} csv = {version = "1", optional = true} fallible-streaming-iterator = {version = "0.1", optional = true} futures = {version = "0.3", optional = true} @@ -50,7 +50,7 @@ regex = {version = "1", optional = true} rusqlite = {version = "0.30.0", features = ["column_decltype", "chrono", "bundled"], optional = true} rust_decimal = {version = "1", features = ["db-postgres"], optional = true} rust_decimal_macros = {version = "1", optional = true} -tiberius = {version = "0.7.3", features = ["rust_decimal", "chrono", "integrated-auth-gssapi"], optional = true} +tiberius = {version = "0.9", features = ["rust_decimal", "chrono", "integrated-auth-gssapi"], optional = true} tokio = {version = "1", features = ["rt", "rt-multi-thread", "net"], optional = true} tokio-util = {version = "0.6", optional = true} urlencoding = {version = "2.1", optional = true} From 70ceff7487ad471d0333c61221e726761a6fd528 Mon Sep 17 00:00:00 2001 From: "vincent.leemrijse" Date: Tue, 21 Jan 2025 21:29:28 +0100 Subject: [PATCH 2/2] chore: bumps to fix some issues in tiberius --- Cargo.lock | 30 +++++++----------------------- connectorx/Cargo.toml | 6 +++--- 2 files changed, 10 insertions(+), 26 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3e97795fe..5d5765fae 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -536,22 +536,21 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "bb8" -version = "0.7.1" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e9f4fa9768efd269499d8fba693260cfc670891cf6de3adc935588447a77cc8" +checksum = "d89aabfae550a5c44b43ab941844ffcd2e993cb6900b342debf59e9ea74acdb8" dependencies = [ "async-trait", - "futures-channel", "futures-util", - "parking_lot 0.11.2", + "parking_lot 0.12.3", "tokio", ] [[package]] name = "bb8-tiberius" -version = "0.8.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8a33c87124c1938413e45ab6a6655e49d9e4cd015e05db61d6ab5a4f96b2c83" +checksum = "61780ef76db8989f8fd30d9a63fcb1d7d1b8d7df3b7d4662c09e66474877b0e6" dependencies = [ "async-trait", "bb8", @@ -3659,20 +3658,6 @@ dependencies = [ "vcpkg", ] -[[package]] -name = "opentls" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f561874f8d6ecfb674fc08863414040c93cc90c0b6963fe679895fab8b65560" -dependencies = [ - "futures-util", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "url", -] - [[package]] name = "option-ext" version = "0.2.0" @@ -6080,9 +6065,9 @@ dependencies = [ [[package]] name = "tiberius" -version = "0.7.3" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "833311bc8e26e96c73ad1b5c1f488c588808c747a318905ec67e43d422ea2c08" +checksum = "31d6bfb7b1de4275b4cf566bad8d0c133d800e3d8b35d256407371fab49cfed6" dependencies = [ "async-native-tls", "async-trait", @@ -6099,7 +6084,6 @@ dependencies = [ "libgssapi", "num-traits", "once_cell", - "opentls", "pin-project-lite", "pretty-hex", "rust_decimal", diff --git a/connectorx/Cargo.toml b/connectorx/Cargo.toml index d031d40fb..e58427936 100644 --- a/connectorx/Cargo.toml +++ b/connectorx/Cargo.toml @@ -27,8 +27,8 @@ arrow2 = {workspace = true, default-features = false, optional = true} polars = {workspace = true, optional = true, features=["dtype-u8", "dtype-u16", "lazy"]} polars-arrow = {workspace = true, optional = true} polars_old = { package = "polars", version = "0.32", optional = true, features=["dtype-u8", "dtype-u16"]} -bb8 = {version = "0.7", optional = true} -bb8-tiberius = {version = "0.8", optional = true} +bb8 = {version = "0.8", optional = true} +bb8-tiberius = {version = "0.11", optional = true} csv = {version = "1", optional = true} fallible-streaming-iterator = {version = "0.1", optional = true} futures = {version = "0.3", optional = true} @@ -51,7 +51,7 @@ regex = {version = "1", optional = true} rusqlite = {version = "0.30.0", features = ["column_decltype", "chrono", "bundled"], optional = true} rust_decimal = {version = "1", features = ["db-postgres"], optional = true} rust_decimal_macros = {version = "1", optional = true} -tiberius = {version = "0.7.3", features = ["rust_decimal", "chrono", "integrated-auth-gssapi"], optional = true} +tiberius = {version = "0.9", features = ["rust_decimal", "chrono", "integrated-auth-gssapi"], optional = true} tokio = {version = "1", features = ["rt", "rt-multi-thread", "net"], optional = true} tokio-util = {version = "0.6", optional = true} urlencoding = {version = "2.1", optional = true}