From ecb9b8d3539cde82dd8bb6e4f4a58116cb0f4cc7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 26 Jul 2024 13:48:59 +0000 Subject: [PATCH 01/15] chore(deps): bump predicates from 3.1.0 to 3.1.2 Bumps [predicates](https://github.com/assert-rs/predicates-rs) from 3.1.0 to 3.1.2. - [Changelog](https://github.com/assert-rs/predicates-rs/blob/master/CHANGELOG.md) - [Commits](https://github.com/assert-rs/predicates-rs/compare/v3.1.0...v3.1.2) --- updated-dependencies: - dependency-name: predicates dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 4 ++-- rstests/Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1c45e791f..b7ba958a9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6406,9 +6406,9 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "predicates" -version = "3.1.0" +version = "3.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b87bfd4605926cdfefc1c3b5f8fe560e3feca9d5552cf68c466d3d8236c7e8" +checksum = "7e9086cc7640c29a356d1a29fd134380bee9d8f79a17410aa76e7ad295f42c97" dependencies = [ "anstyle", "difflib", diff --git a/rstests/Cargo.toml b/rstests/Cargo.toml index 4df691a16..1f74eec3e 100644 --- a/rstests/Cargo.toml +++ b/rstests/Cargo.toml @@ -7,7 +7,7 @@ edition = { workspace = true } doctest = false [dev-dependencies] -predicates = "3.1.0" +predicates = "3.1.2" assert_cmd = "2.0.14" tokio-postgres = "0.7.8" tempfile = { workspace = true } From 9e1afcd3c08adb9a9287662033f33487c3f4ffd3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 26 Jul 2024 13:49:18 +0000 Subject: [PATCH 02/15] chore(deps): bump assert_cmd from 2.0.14 to 2.0.15 Bumps [assert_cmd](https://github.com/assert-rs/assert_cmd) from 2.0.14 to 2.0.15. - [Changelog](https://github.com/assert-rs/assert_cmd/blob/master/CHANGELOG.md) - [Commits](https://github.com/assert-rs/assert_cmd/compare/v2.0.14...v2.0.15) --- updated-dependencies: - dependency-name: assert_cmd dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 4 ++-- rstests/Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1c45e791f..c6d4f39aa 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -484,9 +484,9 @@ dependencies = [ [[package]] name = "assert_cmd" -version = "2.0.14" +version = "2.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed72493ac66d5804837f480ab3766c72bdfab91a65e565fc54fa9e42db0073a8" +checksum = "bc65048dd435533bb1baf2ed9956b9a278fbfdcf90301b39ee117f06c0199d37" dependencies = [ "anstyle", "bstr", diff --git a/rstests/Cargo.toml b/rstests/Cargo.toml index 4df691a16..1bd2d6b86 100644 --- a/rstests/Cargo.toml +++ b/rstests/Cargo.toml @@ -8,6 +8,6 @@ doctest = false [dev-dependencies] predicates = "3.1.0" -assert_cmd = "2.0.14" +assert_cmd = "2.0.15" tokio-postgres = "0.7.8" tempfile = { workspace = true } From 3665f61fa5875a52f67a7f5c47d91f04e7a32ff0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 26 Jul 2024 13:49:36 +0000 Subject: [PATCH 03/15] chore(deps): bump rustls from 0.23.11 to 0.23.12 Bumps [rustls](https://github.com/rustls/rustls) from 0.23.11 to 0.23.12. - [Release notes](https://github.com/rustls/rustls/releases) - [Changelog](https://github.com/rustls/rustls/blob/main/CHANGELOG.md) - [Commits](https://github.com/rustls/rustls/compare/v/0.23.11...v/0.23.12) --- updated-dependencies: - dependency-name: rustls dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 34 +++++++++++++++++----------------- Cargo.toml | 2 +- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1c45e791f..65cc81ac9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -783,9 +783,9 @@ dependencies = [ [[package]] name = "aws-lc-rs" -version = "1.7.1" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8487b59d62764df8231cb371c459314df895b41756df457a1fb1243d65c89195" +checksum = "4ae74d9bd0a7530e8afd1770739ad34b36838829d6ad61818f9230f683f5ad77" dependencies = [ "aws-lc-sys", "mirai-annotations", @@ -795,9 +795,9 @@ dependencies = [ [[package]] name = "aws-lc-sys" -version = "0.16.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c15eb61145320320eb919d9bab524617a7aa4216c78d342fae3a758bc33073e4" +checksum = "2e89b6941c2d1a7045538884d6e760ccfffdf8e1ffc2613d8efa74305e1f3752" dependencies = [ "bindgen", "cc", @@ -2941,7 +2941,7 @@ dependencies = [ "reqwest 0.12.4", "ring 0.17.8", "rust_decimal", - "rustls 0.23.11", + "rustls 0.23.12", "scylla", "serde", "serde_json", @@ -4274,7 +4274,7 @@ dependencies = [ "http 1.1.0", "hyper 1.4.1", "hyper-util", - "rustls 0.23.11", + "rustls 0.23.12", "rustls-native-certs 0.7.0", "rustls-pki-types", "tokio", @@ -6241,7 +6241,7 @@ dependencies = [ "pgrepr", "proxyutil", "reqwest 0.12.4", - "rustls 0.23.11", + "rustls 0.23.12", "rustls-pemfile 2.1.2", "serde", "sqlexec", @@ -7450,23 +7450,23 @@ dependencies = [ "log", "ring 0.17.8", "rustls-pki-types", - "rustls-webpki 0.102.5", + "rustls-webpki 0.102.6", "subtle", "zeroize", ] [[package]] name = "rustls" -version = "0.23.11" +version = "0.23.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4828ea528154ae444e5a642dbb7d5623354030dc9822b83fd9bb79683c7399d0" +checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" dependencies = [ "aws-lc-rs", "log", "once_cell", "ring 0.17.8", "rustls-pki-types", - "rustls-webpki 0.102.5", + "rustls-webpki 0.102.6", "subtle", "zeroize", ] @@ -7545,9 +7545,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.102.5" +version = "0.102.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a6fccd794a42c2c105b513a2f62bc3fd8f3ba57a4593677ceb0bd035164d78" +checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e" dependencies = [ "aws-lc-rs", "ring 0.17.8", @@ -8296,7 +8296,7 @@ dependencies = [ "protogen", "proxyutil", "reqwest 0.12.4", - "rustls 0.23.11", + "rustls 0.23.12", "serde", "sqlbuiltins", "telemetry", @@ -8936,7 +8936,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04fb792ccd6bbcd4bba408eb8a292f70fc4a3589e5d793626f45190e6454b6ab" dependencies = [ "ring 0.17.8", - "rustls 0.23.11", + "rustls 0.23.12", "tokio", "tokio-postgres", "tokio-rustls 0.26.0", @@ -8981,7 +8981,7 @@ version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ - "rustls 0.23.11", + "rustls 0.23.12", "rustls-pki-types", "tokio", ] @@ -10047,7 +10047,7 @@ dependencies = [ "hyper-util", "log", "percent-encoding", - "rustls 0.23.11", + "rustls 0.23.12", "rustls-pemfile 2.1.2", "seahash", "serde", diff --git a/Cargo.toml b/Cargo.toml index fb68bcb49..b815ed95a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -36,7 +36,7 @@ object_store = "0.9" prost = "0.12" prost-build = "0.12" prost-types = "0.12" -rustls = "0.23.11" +rustls = "0.23.12" serde_json = "1.0.120" tempfile = "3.10.1" thiserror = "1.0" From 2ecd0a527b9d76522b494b8560d3d7f475b47046 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 26 Jul 2024 13:50:40 +0000 Subject: [PATCH 04/15] chore(deps): bump reedline from 0.32.0 to 0.33.0 Bumps [reedline](https://github.com/nushell/reedline) from 0.32.0 to 0.33.0. - [Release notes](https://github.com/nushell/reedline/releases) - [Commits](https://github.com/nushell/reedline/compare/v0.32.0...v0.33.0) --- updated-dependencies: - dependency-name: reedline dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 4 ++-- crates/cli/Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1c45e791f..27c2eb545 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6941,9 +6941,9 @@ dependencies = [ [[package]] name = "reedline" -version = "0.32.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abf59e4c97b5049ba96b052cdb652368305a2eddcbce9bf1c16f9d003139eeea" +checksum = "2f8c676a3f3814a23c6a0fc9dff6b6c35b2e04df8134aae6f3929cc34de21a53" dependencies = [ "chrono", "crossterm", diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml index c407fb0d2..1ee01cc12 100644 --- a/crates/cli/Cargo.toml +++ b/crates/cli/Cargo.toml @@ -45,7 +45,7 @@ terminal_util = { path = "../terminal_util" } num_cpus = "1.16.0" colored = "2.1.0" -reedline = "0.32.0" +reedline = "0.33.0" nu-ansi-term = "0.50.0" atty = "0.2.14" console-subscriber = "0.3.0" From 393be2570ba0bab12eb221d4b9ed035c2be57baf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 26 Jul 2024 13:51:00 +0000 Subject: [PATCH 05/15] chore(deps): bump tokio from 1.38.1 to 1.39.1 Bumps [tokio](https://github.com/tokio-rs/tokio) from 1.38.1 to 1.39.1. - [Release notes](https://github.com/tokio-rs/tokio/releases) - [Commits](https://github.com/tokio-rs/tokio/compare/tokio-1.38.1...tokio-1.39.1) --- updated-dependencies: - dependency-name: tokio dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1c45e791f..d04c4f222 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2361,7 +2361,7 @@ dependencies = [ "bitflags 2.5.0", "crossterm_winapi", "libc", - "mio", + "mio 0.8.11", "parking_lot", "serde", "signal-hook", @@ -5431,6 +5431,18 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "mio" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4" +dependencies = [ + "hermit-abi 0.3.9", + "libc", + "wasi", + "windows-sys 0.52.0", +] + [[package]] name = "mirai-annotations" version = "1.12.0" @@ -5590,7 +5602,7 @@ dependencies = [ "keyed_priority_queue", "lazy_static", "lru 0.12.3", - "mio", + "mio 0.8.11", "mysql_common", "once_cell", "pem", @@ -8028,7 +8040,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af" dependencies = [ "libc", - "mio", + "mio 0.8.11", "signal-hook", ] @@ -8854,22 +8866,21 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.38.1" +version = "1.39.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb2caba9f80616f438e09748d5acda951967e1ea58508ef53d9c6402485a46df" +checksum = "d040ac2b29ab03b09d4129c2f5bbd012a3ac2f79d38ff506a4bf8dd34b0eac8a" dependencies = [ "backtrace", "bytes", "libc", - "mio", - "num_cpus", + "mio 1.0.1", "parking_lot", "pin-project-lite", "signal-hook-registry", "socket2", "tokio-macros", "tracing", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -8884,9 +8895,9 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", From 3c6f4fc1a8b5be91b710c3ff3938e80acfc2d3c8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 26 Jul 2024 13:51:47 +0000 Subject: [PATCH 06/15] chore(deps): bump nu-ansi-term from 0.50.0 to 0.50.1 Bumps [nu-ansi-term](https://github.com/nushell/nu-ansi-term) from 0.50.0 to 0.50.1. - [Release notes](https://github.com/nushell/nu-ansi-term/releases) - [Changelog](https://github.com/nushell/nu-ansi-term/blob/main/CHANGELOG.md) - [Commits](https://github.com/nushell/nu-ansi-term/compare/v0.50.0...v0.50.1) --- updated-dependencies: - dependency-name: nu-ansi-term dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 10 +++++----- crates/cli/Cargo.toml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1c45e791f..d817046f8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2025,7 +2025,7 @@ dependencies = [ "logutil", "lzma-sys", "metastore", - "nu-ansi-term 0.50.0", + "nu-ansi-term 0.50.1", "num_cpus", "object_store", "object_store_util", @@ -5742,11 +5742,11 @@ dependencies = [ [[package]] name = "nu-ansi-term" -version = "0.50.0" +version = "0.50.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd2800e1520bdc966782168a627aa5d1ad92e33b984bf7c7615d31280c83ff14" +checksum = "d4a28e057d01f97e61255210fcff094d74ed0466038633e95017f5beb68e4399" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -6949,7 +6949,7 @@ dependencies = [ "crossterm", "fd-lock", "itertools 0.12.1", - "nu-ansi-term 0.50.0", + "nu-ansi-term 0.50.1", "serde", "strip-ansi-escapes", "strum 0.26.3", diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml index c407fb0d2..ce8e7ff0e 100644 --- a/crates/cli/Cargo.toml +++ b/crates/cli/Cargo.toml @@ -46,7 +46,7 @@ terminal_util = { path = "../terminal_util" } num_cpus = "1.16.0" colored = "2.1.0" reedline = "0.32.0" -nu-ansi-term = "0.50.0" +nu-ansi-term = "0.50.1" atty = "0.2.14" console-subscriber = "0.3.0" tokio-postgres = "0.7.8" From e0d7b561439de6d08e3229e1ad87814a543a8839 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 26 Jul 2024 13:52:17 +0000 Subject: [PATCH 07/15] chore(deps): bump clap from 4.5.9 to 4.5.11 Bumps [clap](https://github.com/clap-rs/clap) from 4.5.9 to 4.5.11. - [Release notes](https://github.com/clap-rs/clap/releases) - [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md) - [Commits](https://github.com/clap-rs/clap/compare/clap_complete-v4.5.9...clap_complete-v4.5.11) --- updated-dependencies: - dependency-name: clap dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 12 ++++++------ Cargo.toml | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1c45e791f..65087ffcb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1968,9 +1968,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.9" +version = "4.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64acc1846d54c1fe936a78dc189c34e28d3f5afc348403f28ecf53660b9b8462" +checksum = "35723e6a11662c2afb578bcf0b88bf6ea8e21282a953428f240574fcc3a2b5b3" dependencies = [ "clap_builder", "clap_derive", @@ -1978,9 +1978,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.9" +version = "4.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb8393d67ba2e7bfaf28a23458e4e2b543cc73a99595511eb207fdb8aede942" +checksum = "49eb96cbfa7cfa35017b7cd548c75b14c3118c98b423041d70562665e07fb0fa" dependencies = [ "anstream", "anstyle", @@ -1990,9 +1990,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.8" +version = "4.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bac35c6dafb060fd4d275d9a4ffae97917c13a6327903a8be2153cd964f7085" +checksum = "5d029b67f89d30bbb547c89fd5161293c0aec155fc691d7924b64550662db93e" dependencies = [ "heck 0.5.0", "proc-macro2", diff --git a/Cargo.toml b/Cargo.toml index fb68bcb49..134516eb3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,7 +17,7 @@ strip = true wildcard_imports = "deny" [workspace.dependencies] -clap = { version = "4.5.9", features = ["derive"] } +clap = { version = "4.5.11", features = ["derive"] } datafusion = { version = "36.0.0", features = ["avro"] } arrow-flight = { version = "50.0.0", features = ["flight-sql-experimental"] } datafusion-proto = { version = "36.0.0" } From 615ee887cfbaf8194145409c4b1b70b105d6788c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 26 Jul 2024 13:52:34 +0000 Subject: [PATCH 08/15] chore(deps): bump async-sqlite from 0.3.0 to 0.3.1 Bumps [async-sqlite](https://github.com/ryanfowler/async-sqlite) from 0.3.0 to 0.3.1. - [Commits](https://github.com/ryanfowler/async-sqlite/commits) --- updated-dependencies: - dependency-name: async-sqlite dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 12 ++++++------ crates/datasources/Cargo.toml | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1c45e791f..84fd4cd86 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -590,9 +590,9 @@ dependencies = [ [[package]] name = "async-sqlite" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16accb9f16881e444a38975a96006f9d6b75c2e802b367b416c03cd6db0ffbb4" +checksum = "4e420455ac3543544cbf17c36ff308807a6e62d7952e965c749dab53d860870c" dependencies = [ "crossbeam-channel", "futures-channel", @@ -5087,9 +5087,9 @@ dependencies = [ [[package]] name = "libsqlite3-sys" -version = "0.28.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c10584274047cb335c23d3e61bcef8e323adae7c5c8c760540f73610177fc3f" +checksum = "6b694a822684ddb75df4d657029161431bcb4a85c1856952f845b76912bc6fec" dependencies = [ "cc", "pkg-config", @@ -7334,9 +7334,9 @@ dependencies = [ [[package]] name = "rusqlite" -version = "0.31.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b838eba278d213a8beaf485bd313fd580ca4505a00d5871caeb1457c55322cae" +checksum = "1cdbe9230a57259b37f7257d0aff38b8c9dbda3513edba2105e59b130189d82f" dependencies = [ "bitflags 2.5.0", "fallible-iterator 0.3.0", diff --git a/crates/datasources/Cargo.toml b/crates/datasources/Cargo.toml index c280fa0b8..209759089 100644 --- a/crates/datasources/Cargo.toml +++ b/crates/datasources/Cargo.toml @@ -38,7 +38,7 @@ tracing = { workspace = true } url = { workspace = true } apache-avro = "0.16" async-channel = "2.3.1" -async-sqlite = "0.3.0" +async-sqlite = "0.3.1" async-stream = "0.3.5" bitvec = "1" bson = "2.11.0" From b9afb4204eee490310d7f10e3ee44cd7c08b4b5d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 26 Jul 2024 13:52:53 +0000 Subject: [PATCH 09/15] chore(deps): bump postgres-protocol from 0.6.6 to 0.6.7 Bumps [postgres-protocol](https://github.com/sfackler/rust-postgres) from 0.6.6 to 0.6.7. - [Release notes](https://github.com/sfackler/rust-postgres/releases) - [Commits](https://github.com/sfackler/rust-postgres/compare/postgres-protocol-v0.6.6...postgres-protocol-v0.6.7) --- updated-dependencies: - dependency-name: postgres-protocol dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 6 +++--- crates/pgprototest/Cargo.toml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1c45e791f..4c1fd5785 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6361,11 +6361,11 @@ checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" [[package]] name = "postgres-protocol" -version = "0.6.6" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49b6c5ef183cd3ab4ba005f1ca64c21e8bd97ce4699cfea9e8d9a2c4958ca520" +checksum = "acda0ebdebc28befa84bee35e651e4c5f09073d668c7aed4cf7e23c3cda84b23" dependencies = [ - "base64 0.21.7", + "base64 0.22.1", "byteorder", "bytes", "fallible-iterator 0.2.0", diff --git a/crates/pgprototest/Cargo.toml b/crates/pgprototest/Cargo.toml index f83260939..3afede9f7 100644 --- a/crates/pgprototest/Cargo.toml +++ b/crates/pgprototest/Cargo.toml @@ -18,6 +18,6 @@ serde_json = { workspace = true } clap = { workspace = true } anyhow = { workspace = true } datadriven = "0.6.0" -postgres-protocol = "0.6.5" +postgres-protocol = "0.6.7" bytes = { workspace = true } fallible-iterator = "0.2.0" From 32541fedf1e2757570102df87f67995177062b1f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 26 Jul 2024 13:53:12 +0000 Subject: [PATCH 10/15] chore(deps): bump tokio-postgres from 0.7.10 to 0.7.11 Bumps [tokio-postgres](https://github.com/sfackler/rust-postgres) from 0.7.10 to 0.7.11. - [Release notes](https://github.com/sfackler/rust-postgres/releases) - [Commits](https://github.com/sfackler/rust-postgres/compare/tokio-postgres-v0.7.10...tokio-postgres-v0.7.11) --- updated-dependencies: - dependency-name: tokio-postgres dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 14 +++++++------- crates/bench_runner/Cargo.toml | 2 +- crates/cli/Cargo.toml | 2 +- crates/datasources/Cargo.toml | 2 +- crates/pgrepr/Cargo.toml | 2 +- crates/pgsrv/Cargo.toml | 2 +- crates/slt/Cargo.toml | 2 +- crates/sqlexec/Cargo.toml | 2 +- rstests/Cargo.toml | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1c45e791f..8ac770861 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6361,11 +6361,11 @@ checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" [[package]] name = "postgres-protocol" -version = "0.6.6" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49b6c5ef183cd3ab4ba005f1ca64c21e8bd97ce4699cfea9e8d9a2c4958ca520" +checksum = "acda0ebdebc28befa84bee35e651e4c5f09073d668c7aed4cf7e23c3cda84b23" dependencies = [ - "base64 0.21.7", + "base64 0.22.1", "byteorder", "bytes", "fallible-iterator 0.2.0", @@ -6379,9 +6379,9 @@ dependencies = [ [[package]] name = "postgres-types" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d2234cdee9408b523530a9b6d2d6b373d1db34f6a8e51dc03ded1828d7fb67c" +checksum = "02048d9e032fb3cc3413bbf7b83a15d84a5d419778e2628751896d856498eee9" dependencies = [ "bytes", "chrono", @@ -8905,9 +8905,9 @@ dependencies = [ [[package]] name = "tokio-postgres" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d340244b32d920260ae7448cb72b6e238bddc3d4f7603394e7dd46ed8e48f5b8" +checksum = "03adcf0147e203b6032c0b2d30be1415ba03bc348901f3ff1cc0df6a733e60c3" dependencies = [ "async-trait", "byteorder", diff --git a/crates/bench_runner/Cargo.toml b/crates/bench_runner/Cargo.toml index 4b3e9cf1e..9eea1bb32 100644 --- a/crates/bench_runner/Cargo.toml +++ b/crates/bench_runner/Cargo.toml @@ -19,6 +19,6 @@ async-trait = { workspace = true } clap = { workspace = true } tokio = { workspace = true } tracing = { workspace = true } -tokio-postgres = "0.7.8" +tokio-postgres = "0.7.11" glob = "0.3.1" regex = "1.10.5" diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml index c407fb0d2..1f1965d2e 100644 --- a/crates/cli/Cargo.toml +++ b/crates/cli/Cargo.toml @@ -49,7 +49,7 @@ reedline = "0.32.0" nu-ansi-term = "0.50.0" atty = "0.2.14" console-subscriber = "0.3.0" -tokio-postgres = "0.7.8" +tokio-postgres = "0.7.11" uuid = { version = "1.10.0", features = ["v4", "fast-rng", "macro-diagnostics"] } glob = "0.3.1" diff --git a/crates/datasources/Cargo.toml b/crates/datasources/Cargo.toml index c280fa0b8..bf35621c9 100644 --- a/crates/datasources/Cargo.toml +++ b/crates/datasources/Cargo.toml @@ -66,7 +66,7 @@ mysql_common = { version = "0.32.4", default-features = false, features = ["chro rust_decimal = { version = "1.35.0", features = ["db-tokio-postgres"] } ssh-key = { version = "0.6.6", features = ["ed25519", "alloc"] } tiberius = { version = "0.12.3", default-features = false, features = ["tds73","rustls","chrono"] } -tokio-postgres = { version = "0.7.8", features = ["with-uuid-1", "with-serde_json-1","with-chrono-0_4"] } +tokio-postgres = { version = "0.7.11", features = ["with-uuid-1", "with-serde_json-1","with-chrono-0_4"] } memoize = { version = "0.4.2", features = ["full"] } bigquery-storage = { git = "https://github.com/glaredb/bigquery-storage", branch = "deps/2023-10-27-update" } lance = { git = "https://github.com/GlareDB/lance", branch = "df36" } diff --git a/crates/pgrepr/Cargo.toml b/crates/pgrepr/Cargo.toml index 0e88f3bbd..1edb35887 100644 --- a/crates/pgrepr/Cargo.toml +++ b/crates/pgrepr/Cargo.toml @@ -13,7 +13,7 @@ doctest = false [dependencies] thiserror.workspace = true datafusion = {workspace = true} -tokio-postgres = { version = "0.7.8", features = ["with-uuid-1", "with-serde_json-1", "with-chrono-0_4"] } +tokio-postgres = { version = "0.7.11", features = ["with-uuid-1", "with-serde_json-1", "with-chrono-0_4"] } chrono = { workspace = true } tracing = { workspace = true } repr = { path = "../repr" } diff --git a/crates/pgsrv/Cargo.toml b/crates/pgsrv/Cargo.toml index c8795d227..b58a3c6fb 100644 --- a/crates/pgsrv/Cargo.toml +++ b/crates/pgsrv/Cargo.toml @@ -28,7 +28,7 @@ pgrepr = { path = "../pgrepr" } proxyutil = { path = "../proxyutil" } sqlexec = { path = "../sqlexec" } rustls-pemfile = "2.1.2" -tokio-postgres = "0.7.8" +tokio-postgres = "0.7.11" tokio-rustls = "0.26.0" tokio-util = { version = "0.7.11", features = ["codec"] } uuid = { version = "1.10.0", features = ["v4", "fast-rng", "macro-diagnostics"] } diff --git a/crates/slt/Cargo.toml b/crates/slt/Cargo.toml index a3e6d648a..cba18de81 100644 --- a/crates/slt/Cargo.toml +++ b/crates/slt/Cargo.toml @@ -37,5 +37,5 @@ glob = "0.3.1" once_cell = "1.19.0" regex = "1.10.5" sqllogictest = "0.21.0" -tokio-postgres = "0.7.8" +tokio-postgres = "0.7.11" walkdir = "2.5.0" diff --git a/crates/sqlexec/Cargo.toml b/crates/sqlexec/Cargo.toml index cdf1b041f..66064a8c8 100644 --- a/crates/sqlexec/Cargo.toml +++ b/crates/sqlexec/Cargo.toml @@ -43,7 +43,7 @@ rustls = { workspace = true } url = { workspace = true } bytes = { workspace = true } uuid = { version = "1.10.0", features = ["v4", "fast-rng", "macro-diagnostics"] } -tokio-postgres = "0.7.8" +tokio-postgres = "0.7.11" once_cell = "1.19.0" parking_lot = "0.12.3" num_cpus = "1.16.0" diff --git a/rstests/Cargo.toml b/rstests/Cargo.toml index 4df691a16..f992dd6e0 100644 --- a/rstests/Cargo.toml +++ b/rstests/Cargo.toml @@ -9,5 +9,5 @@ doctest = false [dev-dependencies] predicates = "3.1.0" assert_cmd = "2.0.14" -tokio-postgres = "0.7.8" +tokio-postgres = "0.7.11" tempfile = { workspace = true } From d4b0dcb92feb0e54cd05b32bb45f561069e540ba Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 26 Jul 2024 13:53:49 +0000 Subject: [PATCH 11/15] chore(deps): bump napi-derive from 2.16.9 to 2.16.10 Bumps [napi-derive](https://github.com/napi-rs/napi-rs) from 2.16.9 to 2.16.10. - [Release notes](https://github.com/napi-rs/napi-rs/releases) - [Commits](https://github.com/napi-rs/napi-rs/compare/napi-derive@2.16.9...napi-derive@2.16.10) --- updated-dependencies: - dependency-name: napi-derive dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 8 ++++---- bindings/nodejs/Cargo.toml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1c45e791f..6ef622e42 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5678,9 +5678,9 @@ checksum = "e1c0f5d67ee408a4685b61f5ab7e58605c8ae3f2b4189f0127d804ff13d5560a" [[package]] name = "napi-derive" -version = "2.16.9" +version = "2.16.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87c3b5d4ab13e20a4bb9d3a1e2f3d4e77eee4a205d0f810abfd226b971dc6ce5" +checksum = "b13934cae1f98599ae96d461d14ce3a9199215de1e9a9a201b64b118b3dfa329" dependencies = [ "cfg-if", "convert_case 0.6.0", @@ -5692,9 +5692,9 @@ dependencies = [ [[package]] name = "napi-derive-backend" -version = "1.0.71" +version = "1.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96de436a6ab93265beef838f8333c8345438f059df6081fe0ad0b8648ee0c524" +checksum = "632d41c6057955f455824a7585ce19bc69b2c83472d16581e8f0175fcf4759b7" dependencies = [ "convert_case 0.6.0", "once_cell", diff --git a/bindings/nodejs/Cargo.toml b/bindings/nodejs/Cargo.toml index 86981c8d2..76571a2ae 100644 --- a/bindings/nodejs/Cargo.toml +++ b/bindings/nodejs/Cargo.toml @@ -20,7 +20,7 @@ url = { workspace = true } async-trait = { workspace = true } lzma-sys = { version = "*", features = ["static"] } # Prevent dynamic linking of lzma, which comes from datafusion napi = { version = "2.16.8", default-features = false, features = ["full"] } -napi-derive = "2.16.9" +napi-derive = "2.16.10" once_cell = "1.19.0" async-once-cell = "0.5.3" From d104fa373c92a5840a1748728ecdad08d8c5155a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 26 Jul 2024 13:54:32 +0000 Subject: [PATCH 12/15] chore(deps): bump env_logger from 0.11.3 to 0.11.5 Bumps [env_logger](https://github.com/rust-cli/env_logger) from 0.11.3 to 0.11.5. - [Release notes](https://github.com/rust-cli/env_logger/releases) - [Changelog](https://github.com/rust-cli/env_logger/blob/main/CHANGELOG.md) - [Commits](https://github.com/rust-cli/env_logger/compare/v0.11.3...v0.11.5) --- updated-dependencies: - dependency-name: env_logger dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1c45e791f..2f5e7add3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3441,9 +3441,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.11.3" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9" +checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d" dependencies = [ "anstream", "anstyle", From 4ecf02d41832fe11e9572998f0b7ffd9b2284637 Mon Sep 17 00:00:00 2001 From: tycho garen Date: Fri, 26 Jul 2024 15:01:13 -0400 Subject: [PATCH 13/15] Revert "chore(deps): bump async-sqlite from 0.3.0 to 0.3.1" This reverts commit 615ee887cfbaf8194145409c4b1b70b105d6788c. --- Cargo.lock | 12 ++++++------ crates/datasources/Cargo.toml | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index be51daa81..2d0a3cb03 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -590,9 +590,9 @@ dependencies = [ [[package]] name = "async-sqlite" -version = "0.3.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e420455ac3543544cbf17c36ff308807a6e62d7952e965c749dab53d860870c" +checksum = "16accb9f16881e444a38975a96006f9d6b75c2e802b367b416c03cd6db0ffbb4" dependencies = [ "crossbeam-channel", "futures-channel", @@ -5087,9 +5087,9 @@ dependencies = [ [[package]] name = "libsqlite3-sys" -version = "0.30.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b694a822684ddb75df4d657029161431bcb4a85c1856952f845b76912bc6fec" +checksum = "0c10584274047cb335c23d3e61bcef8e323adae7c5c8c760540f73610177fc3f" dependencies = [ "cc", "pkg-config", @@ -7346,9 +7346,9 @@ dependencies = [ [[package]] name = "rusqlite" -version = "0.32.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cdbe9230a57259b37f7257d0aff38b8c9dbda3513edba2105e59b130189d82f" +checksum = "b838eba278d213a8beaf485bd313fd580ca4505a00d5871caeb1457c55322cae" dependencies = [ "bitflags 2.5.0", "fallible-iterator 0.3.0", diff --git a/crates/datasources/Cargo.toml b/crates/datasources/Cargo.toml index e8456a32b..bf35621c9 100644 --- a/crates/datasources/Cargo.toml +++ b/crates/datasources/Cargo.toml @@ -38,7 +38,7 @@ tracing = { workspace = true } url = { workspace = true } apache-avro = "0.16" async-channel = "2.3.1" -async-sqlite = "0.3.1" +async-sqlite = "0.3.0" async-stream = "0.3.5" bitvec = "1" bson = "2.11.0" From a0b8ebe98c1e17cceb815adcb0c8a6a34ec14c2a Mon Sep 17 00:00:00 2001 From: tycho garen Date: Fri, 26 Jul 2024 15:21:10 -0400 Subject: [PATCH 14/15] fix: compile errors --- crates/cli/src/highlighter.rs | 1 + crates/slt/src/clients/postgres.rs | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/crates/cli/src/highlighter.rs b/crates/cli/src/highlighter.rs index 63f3752ac..0ddf527f6 100644 --- a/crates/cli/src/highlighter.rs +++ b/crates/cli/src/highlighter.rs @@ -250,6 +250,7 @@ impl Hinter for SQLHinter { _pos: usize, history: &dyn reedline::History, use_ansi_coloring: bool, + _cwd: &str, ) -> String { self.current_hint = if line.chars().count() >= self.min_chars { history diff --git a/crates/slt/src/clients/postgres.rs b/crates/slt/src/clients/postgres.rs index 0bb108899..cc73c15f1 100644 --- a/crates/slt/src/clients/postgres.rs +++ b/crates/slt/src/clients/postgres.rs @@ -80,7 +80,8 @@ impl AsyncDB for PgTestClient { output.push(row_output); } SimpleQueryMessage::CommandComplete(_) => {} - _ => unreachable!(), + SimpleQueryMessage::RowDescription(_) => {} + msg => unreachable!("message: '{msg:?}'"), } } if output.is_empty() && num_columns == 0 { From 56265f0d67adc73d1643faeaba214ac66a0d8406 Mon Sep 17 00:00:00 2001 From: tycho garen Date: Fri, 26 Jul 2024 16:10:05 -0400 Subject: [PATCH 15/15] fix: lint --- crates/pgprototest/src/messages.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/pgprototest/src/messages.rs b/crates/pgprototest/src/messages.rs index a241af89d..e43c4e774 100644 --- a/crates/pgprototest/src/messages.rs +++ b/crates/pgprototest/src/messages.rs @@ -80,7 +80,7 @@ impl TryFrom<(char, Message)> for SerializedMessage { serde_json::to_string(&ErrorResponse { fields: msg .fields() - .map(|field| Ok(field.value().to_string())) + .map(|field| Ok(String::from_utf8(field.value_bytes().to_owned()).unwrap())) .collect()?, })?, ), @@ -89,7 +89,7 @@ impl TryFrom<(char, Message)> for SerializedMessage { serde_json::to_string(&ErrorResponse { fields: msg .fields() - .map(|field| Ok(field.value().to_string())) + .map(|field| Ok(String::from_utf8(field.value_bytes().to_owned()).unwrap())) .collect()?, })?, ),