From 7cad78c0e439069a8ede5d919eb2891b3f32148e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 10 Apr 2025 02:22:24 +0000 Subject: [PATCH 1/2] Bump odbc-api from 11.1.1 to 12.0.0 Bumps [odbc-api](https://github.com/pacman82/odbc-api) from 11.1.1 to 12.0.0. - [Release notes](https://github.com/pacman82/odbc-api/releases) - [Changelog](https://github.com/pacman82/odbc-api/blob/main/CHANGELOG.md) - [Commits](https://github.com/pacman82/odbc-api/compare/v11.1.1...v12.0.0) --- updated-dependencies: - dependency-name: odbc-api dependency-version: 12.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- Cargo.lock | 26 ++++++++++++++++++++------ core/Cargo.toml | 2 +- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9d7d1464..12a049d3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -422,7 +422,7 @@ dependencies = [ "arrow", "chrono", "log", - "odbc-api", + "odbc-api 11.1.1", "thiserror 2.0.12", ] @@ -1911,7 +1911,7 @@ dependencies = [ "mysql_async", "native-tls", "num-bigint", - "odbc-api", + "odbc-api 12.0.0", "pem", "postgres-native-tls", "prost", @@ -3240,9 +3240,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.26" +version = "0.4.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30bde2b3dc3671ae49d8e2e9f044c7c005836e7a023ee57cffa25ab82764bb9e" +checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" [[package]] name = "lru" @@ -3843,6 +3843,20 @@ dependencies = [ "winit", ] +[[package]] +name = "odbc-api" +version = "12.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9be84015faaef7d511c2341e962d6861c56b67d4871d32811b522793609ccde9" +dependencies = [ + "atoi", + "log", + "odbc-sys", + "thiserror 2.0.12", + "widestring", + "winit", +] + [[package]] name = "odbc-sys" version = "0.25.0" @@ -6127,9 +6141,9 @@ dependencies = [ [[package]] name = "widestring" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311" +checksum = "dd7cf3379ca1aac9eea11fba24fd7e315d621f8dfe35c8d7d2be8b793726e07d" [[package]] name = "winapi" diff --git a/core/Cargo.toml b/core/Cargo.toml index 39f2ccb5..ab8d9080 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -58,7 +58,7 @@ mysql_async = { version = "0.35", features = [ ], optional = true } native-tls = { version = "0.2", optional = true } num-bigint = "0.4" -odbc-api = { version = "11.1", optional = true } +odbc-api = { version = "12.0", optional = true } pem = { version = "3.0.4", optional = true } postgres-native-tls = { version = "0.5.0", optional = true } prost = { version = "0.13", optional = true } From 5e06e8de2779de781ae21d1486ce3e15a6d18cbd Mon Sep 17 00:00:00 2001 From: Phillip LeBlanc Date: Thu, 10 Apr 2025 11:38:48 +0900 Subject: [PATCH 2/2] Also upgrade arrow-odbc --- Cargo.lock | 22 ++++------------------ Cargo.toml | 2 +- 2 files changed, 5 insertions(+), 19 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 12a049d3..bd680bfd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -415,14 +415,14 @@ dependencies = [ [[package]] name = "arrow-odbc" -version = "15.1.1" +version = "16.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49b1136f1476bd241f020a6379643742b2071d1ad28c5bf56679edd86211189b" +checksum = "df5c9eaa58d98c0ba1d2a1a57c1fc2daa8ed25283c54a9b3b7daaf818f473914" dependencies = [ "arrow", "chrono", "log", - "odbc-api 11.1.1", + "odbc-api", "thiserror 2.0.12", ] @@ -1911,7 +1911,7 @@ dependencies = [ "mysql_async", "native-tls", "num-bigint", - "odbc-api 12.0.0", + "odbc-api", "pem", "postgres-native-tls", "prost", @@ -3829,20 +3829,6 @@ dependencies = [ "walkdir", ] -[[package]] -name = "odbc-api" -version = "11.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c285198749d5fe2cc75db87bd7356daedceb311c5435ce8d314bf85bf0164a9" -dependencies = [ - "atoi", - "log", - "odbc-sys", - "thiserror 2.0.12", - "widestring", - "winit", -] - [[package]] name = "odbc-api" version = "12.0.0" diff --git a/Cargo.toml b/Cargo.toml index 7aec30d8..eb0fe3f9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -39,7 +39,7 @@ arrow-flight = { version = "54.2.1", features = [ ] } arrow-schema = { version = "54.2.1", features = ["serde"] } arrow-json = "54.2.1" -arrow-odbc = { version = "=15.1.1" } +arrow-odbc = { version = "16" } datafusion = { version = "46", default-features = false } datafusion-expr = { version = "46" } datafusion-federation = { version = "=0.3.7" }