From 927e3ab0225c7a2579d85c123f1c7b98e7fdf32d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 9 Feb 2024 14:33:34 +0000 Subject: [PATCH 01/15] chore(deps): bump prql-compiler from 0.11.1 to 0.11.2 Bumps [prql-compiler](https://github.com/PRQL/prql) from 0.11.1 to 0.11.2. - [Release notes](https://github.com/PRQL/prql/releases) - [Changelog](https://github.com/PRQL/prql/blob/main/CHANGELOG.md) - [Commits](https://github.com/PRQL/prql/compare/0.11.1...0.11.2) --- updated-dependencies: - dependency-name: prql-compiler dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 102 +++++++++++++++++++++++++++----------- crates/sqlexec/Cargo.toml | 2 +- 2 files changed, 73 insertions(+), 31 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b668a3a6c..8e6b578e4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -106,9 +106,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.7" +version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cd2405b3ac1faab2990b74d728624cd9fd115651fcecc7c2d8daf01376275ba" +checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5" dependencies = [ "anstyle", "anstyle-parse", @@ -197,9 +197,9 @@ checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" [[package]] name = "ariadne" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72fe02fc62033df9ba41cba57ee19acf5e742511a140c7dbc3a873e19a19a1bd" +checksum = "dd002a6223f12c7a95cdd4b1cb3a0149d22d37f7a9ecdb2cb691a071fe236c29" dependencies = [ "unicode-width", "yansi", @@ -1455,7 +1455,7 @@ checksum = "4acbb09d9ee8e23699b9634375c72795d095bf268439da88562cf9b501f181fa" dependencies = [ "camino", "cargo-platform", - "semver 1.0.20", + "semver 1.0.21", "serde", "serde_json", ] @@ -2237,7 +2237,7 @@ dependencies = [ "parquet", "pin-project-lite", "rand", - "sqlparser", + "sqlparser 0.41.0", "tempfile", "tokio", "tokio-util", @@ -2266,7 +2266,7 @@ dependencies = [ "object_store", "parquet", "pyo3", - "sqlparser", + "sqlparser 0.41.0", ] [[package]] @@ -2301,7 +2301,7 @@ dependencies = [ "arrow-array", "datafusion-common", "paste", - "sqlparser", + "sqlparser 0.41.0", "strum 0.25.0", "strum_macros 0.25.3", ] @@ -2415,7 +2415,7 @@ dependencies = [ "datafusion-common", "datafusion-expr", "log", - "sqlparser", + "sqlparser 0.41.0", ] [[package]] @@ -2620,7 +2620,7 @@ dependencies = [ "errno", "fix-hidden-lifetime-bug", "futures", - "hashbrown 0.12.3", + "hashbrown 0.14.2", "indexmap 2.2.2", "itertools 0.12.0", "lazy_static", @@ -2640,7 +2640,7 @@ dependencies = [ "roaring", "serde", "serde_json", - "sqlparser", + "sqlparser 0.41.0", "thiserror", "tokio", "tracing", @@ -5093,7 +5093,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "semver 1.0.20", + "semver 1.0.21", "syn 2.0.48", ] @@ -6059,9 +6059,18 @@ dependencies = [ [[package]] name = "prql-compiler" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d57e90671dbcb08b282e91db60837fc43f93a99945c1a44d3fa8e78f5ccd860" +checksum = "28478c330c978501601390a6dd3b760d7dd9184f9ad2d5ccff179cee0590c37e" +dependencies = [ + "prqlc", +] + +[[package]] +name = "prqlc" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d557b3285b3c738a7e969c5eeca36bff2c753aa5e9bfd0dc59c720865091a12f" dependencies = [ "anstream", "anyhow", @@ -6075,37 +6084,39 @@ dependencies = [ "prqlc-ast", "prqlc-parser", "regex", - "semver 1.0.20", + "semver 1.0.21", "serde", "serde_json", + "serde_yaml", "sqlformat", - "sqlparser", - "strum 0.25.0", - "strum_macros 0.25.3", + "sqlparser 0.43.1", + "strum 0.26.1", + "strum_macros 0.26.1", ] [[package]] name = "prqlc-ast" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e77bf8e4af75cfe1d055b4a30995466c1cb2726318b8255b4589b6ae177e45b1" +checksum = "5fada7485784f43c5068e22b1e3fa9ba4d9a1f12a60865f5229b5afd8fbcc28c" dependencies = [ + "anyhow", "enum-as-inner 0.6.0", - "semver 1.0.20", + "semver 1.0.21", "serde", - "strum 0.25.0", + "strum 0.26.1", ] [[package]] name = "prqlc-parser" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54a828f1f50699defbfd0bc1dec9368c5b5a1f0e7f12193129ed74160b96415b" +checksum = "0d9390810db80ae28e3558fa70524dae6334ce5c4f96cc138eb321b31a3316b6" dependencies = [ "chumsky", "itertools 0.12.0", "prqlc-ast", - "semver 1.0.20", + "semver 1.0.21", "stacker", ] @@ -6905,7 +6916,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.20", + "semver 1.0.21", ] [[package]] @@ -7287,9 +7298,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.20" +version = "1.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" +checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0" dependencies = [ "serde", ] @@ -7865,10 +7876,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5cc2c25a6c66789625ef164b4c7d2e548d627902280c13710d33da8222169964" dependencies = [ "log", - "serde", "sqlparser_derive", ] +[[package]] +name = "sqlparser" +version = "0.43.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f95c4bae5aba7cd30bd506f7140026ade63cff5afd778af8854026f9606bf5d4" +dependencies = [ + "log", + "serde", +] + [[package]] name = "sqlparser_derive" version = "0.2.2" @@ -7982,6 +8002,15 @@ dependencies = [ "strum_macros 0.25.3", ] +[[package]] +name = "strum" +version = "0.26.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "723b93e8addf9aa965ebe2d11da6d7540fa2283fcea14b3371ff055f7ba13f5f" +dependencies = [ + "strum_macros 0.26.1", +] + [[package]] name = "strum_macros" version = "0.23.1" @@ -8008,6 +8037,19 @@ dependencies = [ "syn 2.0.48", ] +[[package]] +name = "strum_macros" +version = "0.26.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a3417fc93d76740d974a01654a09777cb500428cc874ca9f45edfe0c4d4cd18" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "quote", + "rustversion", + "syn 2.0.48", +] + [[package]] name = "subprocess" version = "0.2.9" @@ -8041,7 +8083,7 @@ dependencies = [ "prost-build", "prost-types", "schemars", - "semver 1.0.20", + "semver 1.0.21", "serde", "serde_json", "serde_yaml", diff --git a/crates/sqlexec/Cargo.toml b/crates/sqlexec/Cargo.toml index f08920308..2dc5d85ac 100644 --- a/crates/sqlexec/Cargo.toml +++ b/crates/sqlexec/Cargo.toml @@ -40,7 +40,7 @@ url.workspace = true parking_lot = "0.12.1" serde = { workspace = true } reqwest = { workspace = true } -prql-compiler = "0.11.1" +prql-compiler = "0.11.2" num_cpus = "1.16.0" [dev-dependencies] From 0e0c8ef77f57abaa9fe578a2c6409ebd881e5bac Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 9 Feb 2024 14:33:53 +0000 Subject: [PATCH 02/15] chore(deps): bump async-channel from 2.1.1 to 2.2.0 Bumps [async-channel](https://github.com/smol-rs/async-channel) from 2.1.1 to 2.2.0. - [Release notes](https://github.com/smol-rs/async-channel/releases) - [Changelog](https://github.com/smol-rs/async-channel/blob/master/CHANGELOG.md) - [Commits](https://github.com/smol-rs/async-channel/compare/v2.1.1...v2.2.0) --- updated-dependencies: - dependency-name: async-channel dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 18 +++++++++--------- crates/datasources/Cargo.toml | 2 +- crates/distexec/Cargo.toml | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b668a3a6c..1c5790dd0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -492,12 +492,12 @@ dependencies = [ [[package]] name = "async-channel" -version = "2.1.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ca33f4bc4ed1babef42cad36cc1f51fa88be00420404e5b1e80ab1b18f7678c" +checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3" dependencies = [ "concurrent-queue", - "event-listener 4.0.0", + "event-listener 5.0.0", "event-listener-strategy", "futures-core", "pin-project-lite", @@ -2620,7 +2620,7 @@ dependencies = [ "errno", "fix-hidden-lifetime-bug", "futures", - "hashbrown 0.12.3", + "hashbrown 0.14.2", "indexmap 2.2.2", "itertools 0.12.0", "lazy_static", @@ -3089,9 +3089,9 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "event-listener" -version = "4.0.0" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "770d968249b5d99410d61f5bf89057f3199a077a04d087092f58e7d10692baae" +checksum = "b72557800024fabbaa2449dd4bf24e37b93702d457a4d4f2b0dd1f0f039f20c1" dependencies = [ "concurrent-queue", "parking", @@ -3100,11 +3100,11 @@ dependencies = [ [[package]] name = "event-listener-strategy" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" +checksum = "feedafcaa9b749175d5ac357452a9d41ea2911da598fde46ce1fe02c37751291" dependencies = [ - "event-listener 4.0.0", + "event-listener 5.0.0", "pin-project-lite", ] diff --git a/crates/datasources/Cargo.toml b/crates/datasources/Cargo.toml index cdd797870..0b2e5f6fb 100644 --- a/crates/datasources/Cargo.toml +++ b/crates/datasources/Cargo.toml @@ -10,7 +10,7 @@ workspace = true ioutil = { path = "../ioutil" } logutil = { path = "../logutil" } apache-avro = "0.16" -async-channel = "2.1.1" +async-channel = "2.2.0" async-stream = "0.3.5" async-trait = { workspace = true } bigquery-storage = { git = "https://github.com/glaredb/bigquery-storage", branch = "deps/2023-10-27-update" } diff --git a/crates/distexec/Cargo.toml b/crates/distexec/Cargo.toml index 0ab61f81b..9c454ae3e 100644 --- a/crates/distexec/Cargo.toml +++ b/crates/distexec/Cargo.toml @@ -12,4 +12,4 @@ tokio.workspace = true futures.workspace = true tracing.workspace = true parking_lot = "0.12.1" -async-channel = "2.1.1" +async-channel = "2.2.0" From e2f3ae8c7180bec9682c7ad2b3f96759e1b5a616 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 9 Feb 2024 14:34:35 +0000 Subject: [PATCH 03/15] chore(deps): bump num-traits from 0.2.17 to 0.2.18 Bumps [num-traits](https://github.com/rust-num/num-traits) from 0.2.17 to 0.2.18. - [Changelog](https://github.com/rust-num/num-traits/blob/master/RELEASES.md) - [Commits](https://github.com/rust-num/num-traits/compare/num-traits-0.2.17...num-traits-0.2.18) --- updated-dependencies: - dependency-name: num-traits dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 6 +++--- crates/decimal/Cargo.toml | 2 +- crates/pgrepr/Cargo.toml | 2 +- crates/repr/Cargo.toml | 2 +- crates/sqlbuiltins/Cargo.toml | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b668a3a6c..df4191181 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2620,7 +2620,7 @@ dependencies = [ "errno", "fix-hidden-lifetime-bug", "futures", - "hashbrown 0.12.3", + "hashbrown 0.14.2", "indexmap 2.2.2", "itertools 0.12.0", "lazy_static", @@ -5238,9 +5238,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" dependencies = [ "autocfg", "libm", diff --git a/crates/decimal/Cargo.toml b/crates/decimal/Cargo.toml index b4311a949..e35fe91c4 100644 --- a/crates/decimal/Cargo.toml +++ b/crates/decimal/Cargo.toml @@ -8,5 +8,5 @@ workspace = true [dependencies] thiserror.workspace = true -num-traits = "0.2.17" +num-traits = "0.2.18" regex = "1.10.3" diff --git a/crates/pgrepr/Cargo.toml b/crates/pgrepr/Cargo.toml index a7d275a7f..02ed7484d 100644 --- a/crates/pgrepr/Cargo.toml +++ b/crates/pgrepr/Cargo.toml @@ -14,7 +14,7 @@ chrono = { workspace = true } tracing = { workspace = true } repr = { path = "../repr" } decimal = { path = "../decimal" } -num-traits = "0.2.17" +num-traits = "0.2.18" dtoa = "1.0.9" chrono-tz = "0.8.5" bytes = "1.4.0" diff --git a/crates/repr/Cargo.toml b/crates/repr/Cargo.toml index 4bdc6c590..d40a4e4a2 100644 --- a/crates/repr/Cargo.toml +++ b/crates/repr/Cargo.toml @@ -8,7 +8,7 @@ workspace = true [dependencies] thiserror.workspace = true -num-traits = "0.2.17" +num-traits = "0.2.18" dtoa = "1.0.9" chrono = { workspace = true } decimal = { path = "../decimal" } diff --git a/crates/sqlbuiltins/Cargo.toml b/crates/sqlbuiltins/Cargo.toml index 17fe5dde7..420b243fc 100644 --- a/crates/sqlbuiltins/Cargo.toml +++ b/crates/sqlbuiltins/Cargo.toml @@ -24,7 +24,7 @@ thiserror.workspace = true tracing = { workspace = true } uuid = { version = "1.7.0", features = ["v4", "fast-rng", "macro-diagnostics"] } once_cell = "1.19.0" -num-traits = "0.2.17" +num-traits = "0.2.18" strum = "0.25.0" kdl = "5.0.0-alpha.1" siphasher = "1.0.0" From d8a9e8ee4647897db869b9df814cfd7fc48a02d6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 9 Feb 2024 14:34:57 +0000 Subject: [PATCH 04/15] chore(deps): bump calamine from 0.23.1 to 0.24.0 Bumps [calamine](https://github.com/tafia/calamine) from 0.23.1 to 0.24.0. - [Changelog](https://github.com/tafia/calamine/blob/master/Changelog.md) - [Commits](https://github.com/tafia/calamine/compare/v0.23.1...v0.24.0) --- updated-dependencies: - dependency-name: calamine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 6 +++--- crates/datasources/Cargo.toml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b668a3a6c..e4e1080e9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1414,9 +1414,9 @@ dependencies = [ [[package]] name = "calamine" -version = "0.23.1" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47a4d6ea525ea187df1e3a1c4b23469b1cbe60c5bafc1c0ef14b2b8738a8303d" +checksum = "8a3a315226fdc5b1c3e33521073e1712a05944bc0664d665ff1f6ff0396334da" dependencies = [ "byteorder", "chrono", @@ -2620,7 +2620,7 @@ dependencies = [ "errno", "fix-hidden-lifetime-bug", "futures", - "hashbrown 0.12.3", + "hashbrown 0.14.2", "indexmap 2.2.2", "itertools 0.12.0", "lazy_static", diff --git a/crates/datasources/Cargo.toml b/crates/datasources/Cargo.toml index cdd797870..690698837 100644 --- a/crates/datasources/Cargo.toml +++ b/crates/datasources/Cargo.toml @@ -63,7 +63,7 @@ tracing = { workspace = true } uuid = "1.7.0" url.workspace = true webpki-roots = "0.26.0" -calamine = { version = "0.23.1", features = ["dates"] } +calamine = { version = "0.24.0", features = ["dates"] } tiberius = { version = "0.12.2", default-features = false, features = [ "tds73", "rustls", From 11066e936853fbc5241a4d0bd6ee307ee2b58e6f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 9 Feb 2024 14:35:21 +0000 Subject: [PATCH 05/15] chore(deps): bump napi-derive from 2.15.0 to 2.15.1 Bumps [napi-derive](https://github.com/napi-rs/napi-rs) from 2.15.0 to 2.15.1. - [Release notes](https://github.com/napi-rs/napi-rs/releases) - [Commits](https://github.com/napi-rs/napi-rs/compare/napi-derive@2.15.0...napi-derive@2.15.1) --- updated-dependencies: - dependency-name: napi-derive dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 10 +++++----- bindings/nodejs/Cargo.toml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b668a3a6c..7b15cb59f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2620,7 +2620,7 @@ dependencies = [ "errno", "fix-hidden-lifetime-bug", "futures", - "hashbrown 0.12.3", + "hashbrown 0.14.2", "indexmap 2.2.2", "itertools 0.12.0", "lazy_static", @@ -5070,9 +5070,9 @@ checksum = "d4b4532cf86bfef556348ac65e561e3123879f0e7566cca6d43a6ff5326f13df" [[package]] name = "napi-derive" -version = "2.15.0" +version = "2.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7622f0dbe0968af2dacdd64870eee6dee94f93c989c841f1ad8f300cf1abd514" +checksum = "8d56bb899c164ab1be5e542ae7db8b26750c864bf2eef07295f17754e6358777" dependencies = [ "cfg-if", "convert_case 0.6.0", @@ -5084,9 +5084,9 @@ dependencies = [ [[package]] name = "napi-derive-backend" -version = "1.0.59" +version = "1.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ec514d65fce18a959be55e7f683ac89c6cb850fb59b09e25ab777fd5a4a8d9e" +checksum = "6cf2d74ac66fd1cccb646be75fdd1c1dce8acfe20a68f61566a31da0d3eb9786" dependencies = [ "convert_case 0.6.0", "once_cell", diff --git a/bindings/nodejs/Cargo.toml b/bindings/nodejs/Cargo.toml index d863e9f7d..a1a70d3a4 100644 --- a/bindings/nodejs/Cargo.toml +++ b/bindings/nodejs/Cargo.toml @@ -13,7 +13,7 @@ workspace = true # Default enable napi4 feature, see https://nodejs.org/api/n-api.html#node-api-version-matrix ioutil = { path = "../../crates/ioutil" } napi = { version = "2.15.1", default-features = false, features = ["full"] } -napi-derive = "2.15.0" +napi-derive = "2.15.1" sqlexec = { path = "../../crates/sqlexec" } metastore = { path = "../../crates/metastore" } telemetry = { path = "../../crates/telemetry" } From 6adc9ce9086c0d222c6dacd9c21d5019c5b31507 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 9 Feb 2024 14:35:49 +0000 Subject: [PATCH 06/15] chore(deps): bump scylla from 0.11.1 to 0.12.0 Bumps [scylla](https://github.com/scylladb/scylla-rust-driver) from 0.11.1 to 0.12.0. - [Release notes](https://github.com/scylladb/scylla-rust-driver/releases) - [Changelog](https://github.com/scylladb/scylla-rust-driver/blob/main/RELEASE.md) - [Commits](https://github.com/scylladb/scylla-rust-driver/compare/v0.11.1...v0.12.0) --- updated-dependencies: - dependency-name: scylla dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 60 ++++++++++------------------------- crates/datasources/Cargo.toml | 2 +- 2 files changed, 18 insertions(+), 44 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b668a3a6c..a6622bd72 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -173,7 +173,7 @@ dependencies = [ "lazy_static", "libflate", "log", - "num-bigint 0.4.4", + "num-bigint", "quad-rand", "rand", "regex-lite", @@ -1087,17 +1087,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "bigdecimal" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1e50562e37200edf7c6c43e54a08e64a5553bfb59d9c297d5572512aa517256" -dependencies = [ - "num-bigint 0.3.3", - "num-integer", - "num-traits", -] - [[package]] name = "bigdecimal" version = "0.4.2" @@ -1106,7 +1095,7 @@ checksum = "c06619be423ea5bb86c95f087d5707942791a08a85530df0db2209a3ecfb8bc9" dependencies = [ "autocfg", "libm", - "num-bigint 0.4.4", + "num-bigint", "num-integer", "num-traits", ] @@ -2620,13 +2609,13 @@ dependencies = [ "errno", "fix-hidden-lifetime-bug", "futures", - "hashbrown 0.12.3", + "hashbrown 0.14.2", "indexmap 2.2.2", "itertools 0.12.0", "lazy_static", "libc", "maplit", - "num-bigint 0.4.4", + "num-bigint", "num-traits", "num_cpus", "object_store", @@ -3016,7 +3005,7 @@ version = "3.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bf1fa3f06bbff1ea5b1a9c7b14aa992a39657db60a2759457328d7e058f49ee" dependencies = [ - "num-bigint 0.4.4", + "num-bigint", "num-traits", "proc-macro2", "quote", @@ -4957,7 +4946,7 @@ checksum = "56b0d8a0db9bf6d2213e11f2c701cb91387b0614361625ab7b9743b41aa4938f" dependencies = [ "darling 0.20.3", "heck 0.4.1", - "num-bigint 0.4.4", + "num-bigint", "proc-macro-crate 1.3.1", "proc-macro-error", "proc-macro2", @@ -5011,7 +5000,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06f19e4cfa0ab5a76b627cec2d81331c49b034988eaf302c3bafeada684eadef" dependencies = [ "base64 0.21.7", - "bigdecimal 0.4.2", + "bigdecimal", "bindgen", "bitflags 2.4.1", "bitvec", @@ -5026,7 +5015,7 @@ dependencies = [ "frunk", "lazy_static", "mysql-common-derive", - "num-bigint 0.4.4", + "num-bigint", "num-traits", "rand", "regex", @@ -5147,7 +5136,7 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af" dependencies = [ - "num-bigint 0.4.4", + "num-bigint", "num-complex", "num-integer", "num-iter", @@ -5155,17 +5144,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "num-bigint" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f6f7833f2cbf2360a6cfd58cd41a53aa7a90bd4c202f5b1c7dd2ed73c57b2c3" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - [[package]] name = "num-bigint" version = "0.4.4" @@ -5231,7 +5209,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" dependencies = [ "autocfg", - "num-bigint 0.4.4", + "num-bigint", "num-integer", "num-traits", ] @@ -5509,7 +5487,7 @@ dependencies = [ "hashbrown 0.14.2", "lz4_flex", "num", - "num-bigint 0.4.4", + "num-bigint", "object_store", "paste", "seq-macro", @@ -7136,13 +7114,12 @@ dependencies = [ [[package]] name = "scylla" -version = "0.11.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db4bca1987121cceb419f0644cf064416f719c73c44b6cbe849b62fd3b7adc3c" +checksum = "03d2db76aa23f55d2ece5354e1a3778633098a3d1ea76153f494d71e92cd02d8" dependencies = [ "arc-swap", "async-trait", - "bigdecimal 0.2.2", "byteorder", "bytes", "chrono", @@ -7151,7 +7128,6 @@ dependencies = [ "histogram", "itertools 0.11.0", "lz4_flex", - "num-bigint 0.3.3", "num_enum", "rand", "rand_pcg", @@ -7170,16 +7146,14 @@ dependencies = [ [[package]] name = "scylla-cql" -version = "0.0.11" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50938b1bbb5c6364617977939c09644384495f658dc899ec37fd90bce73e6f37" +checksum = "345626c0dd5d9624c413daaba854685bba6a65cff4eb5ea0fb0366df16901f67" dependencies = [ "async-trait", - "bigdecimal 0.2.2", "byteorder", "bytes", "lz4_flex", - "num-bigint 0.3.3", "num_enum", "scylla-macros", "snap", @@ -7190,9 +7164,9 @@ dependencies = [ [[package]] name = "scylla-macros" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22b6659cdeed34c5b83719edd4d9f023c18357677e3fbe14237a59f00403acce" +checksum = "eb6085ff9c3fd7e5163826901d39164ab86f11bdca16b2f766a00c528ff9cef9" dependencies = [ "darling 0.20.3", "proc-macro2", diff --git a/crates/datasources/Cargo.toml b/crates/datasources/Cargo.toml index cdd797870..c6b88d403 100644 --- a/crates/datasources/Cargo.toml +++ b/crates/datasources/Cargo.toml @@ -71,7 +71,7 @@ tiberius = { version = "0.12.2", default-features = false, features = [ ] } lance = { git = "https://github.com/lancedb/lance", rev = "310d79eccf93f3c6a48c162c575918cdba13faec" } bson = "2.9.0" -scylla = { version = "0.11.1" } +scylla = { version = "0.12.0" } glob = "0.3.1" indexmap = "2.2.2" From 2ce1e17aafc8c710f5bbb6889754f506bf15140d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 9 Feb 2024 14:36:15 +0000 Subject: [PATCH 07/15] chore(deps): bump reedline from 0.28.0 to 0.29.0 Bumps [reedline](https://github.com/nushell/reedline) from 0.28.0 to 0.29.0. - [Release notes](https://github.com/nushell/reedline/releases) - [Commits](https://github.com/nushell/reedline/compare/v0.28.0...v0.29.0) --- updated-dependencies: - dependency-name: reedline dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 17 +++++++++++++---- crates/glaredb/Cargo.toml | 2 +- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b668a3a6c..526d81592 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2620,7 +2620,7 @@ dependencies = [ "errno", "fix-hidden-lifetime-bug", "futures", - "hashbrown 0.12.3", + "hashbrown 0.14.2", "indexmap 2.2.2", "itertools 0.12.0", "lazy_static", @@ -5141,6 +5141,15 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "nu-ansi-term" +version = "0.50.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd2800e1520bdc966782168a627aa5d1ad92e33b984bf7c7615d31280c83ff14" +dependencies = [ + "windows-sys 0.48.0", +] + [[package]] name = "num" version = "0.4.1" @@ -6411,15 +6420,15 @@ dependencies = [ [[package]] name = "reedline" -version = "0.28.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68f4e89a0f80909b3ca4bca9759ed37e4bfddb6f5d2ffb1b4ceb2b1638a3e1eb" +checksum = "9e01ebfbdb1a88963121d3c928c97be7f10fec7795bec8b918c8cda1db7c29e6" dependencies = [ "chrono", "crossterm", "fd-lock", "itertools 0.12.0", - "nu-ansi-term 0.49.0", + "nu-ansi-term 0.50.0", "serde", "strip-ansi-escapes", "strum 0.25.0", diff --git a/crates/glaredb/Cargo.toml b/crates/glaredb/Cargo.toml index 52d5861cc..93a115b14 100644 --- a/crates/glaredb/Cargo.toml +++ b/crates/glaredb/Cargo.toml @@ -41,7 +41,7 @@ terminal_util = { path = "../terminal_util" } num_cpus = "1.16.0" colored = "2.1.0" -reedline = "0.28.0" +reedline = "0.29.0" nu-ansi-term = "0.49.0" atty = "0.2.14" console-subscriber = "0.2.0" From 9e8123e52cfa909d8cc1f5420c43250ac852ef33 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 9 Feb 2024 14:36:43 +0000 Subject: [PATCH 08/15] chore(deps): bump clap from 4.4.18 to 4.5.0 Bumps [clap](https://github.com/clap-rs/clap) from 4.4.18 to 4.5.0. - [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/v4.4.18...clap_complete-v4.5.0) --- updated-dependencies: - dependency-name: clap dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 34 ++++++++++++++++++++-------------- Cargo.toml | 2 +- 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b668a3a6c..a8eda03a0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1584,9 +1584,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.18" +version = "4.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e578d6ec4194633722ccf9544794b71b1385c3c027efe0c55db226fc880865c" +checksum = "80c21025abd42669a92efc996ef13cfb2c5c627858421ea58d5c3b331a6c134f" dependencies = [ "clap_builder", "clap_derive", @@ -1594,21 +1594,21 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.18" +version = "4.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4df4df40ec50c46000231c914968278b1eb05098cf8f1b3a518a95030e71d1c7" +checksum = "458bf1f341769dfcf849846f65dffdf9146daa56bcd2a47cb4e1de9915567c99" dependencies = [ "anstream", "anstyle", "clap_lex", - "strsim", + "strsim 0.11.0", ] [[package]] name = "clap_derive" -version = "4.4.7" +version = "4.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" +checksum = "307bc0538d5f0f83b8248db3087aa92fe504e4691294d0c96c0eabc33f47ba47" dependencies = [ "heck 0.4.1", "proc-macro2", @@ -1618,9 +1618,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" +checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" [[package]] name = "cmake" @@ -2097,7 +2097,7 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "strsim", + "strsim 0.10.0", "syn 1.0.109", ] @@ -2111,7 +2111,7 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "strsim", + "strsim 0.10.0", "syn 1.0.109", ] @@ -2125,7 +2125,7 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "strsim", + "strsim 0.10.0", "syn 2.0.48", ] @@ -2620,7 +2620,7 @@ dependencies = [ "errno", "fix-hidden-lifetime-bug", "futures", - "hashbrown 0.12.3", + "hashbrown 0.14.2", "indexmap 2.2.2", "itertools 0.12.0", "lazy_static", @@ -4930,7 +4930,7 @@ dependencies = [ "sha2 0.10.8", "socket2 0.4.10", "stringprep", - "strsim", + "strsim 0.10.0", "take_mut", "thiserror", "tokio", @@ -7967,6 +7967,12 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +[[package]] +name = "strsim" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" + [[package]] name = "strum" version = "0.23.0" diff --git a/Cargo.toml b/Cargo.toml index 8bfb556e8..536a49236 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,7 +17,7 @@ strip = true wildcard_imports = "deny" [workspace.dependencies] -clap = { version = "4.4.18", features = ["derive"] } +clap = { version = "4.5.0", features = ["derive"] } datafusion = { version = "35.0.0", features = ["avro"] } arrow-flight = { version = "50.0.0", features = ["flight-sql-experimental"] } datafusion-proto = { version = "35.0.0" } From c7335c9f1adcb154ec6f25d59e3ca91ebdbdb20d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 9 Feb 2024 14:37:05 +0000 Subject: [PATCH 09/15] chore(deps): bump webpki-roots from 0.26.0 to 0.26.1 Bumps [webpki-roots](https://github.com/rustls/webpki-roots) from 0.26.0 to 0.26.1. - [Release notes](https://github.com/rustls/webpki-roots/releases) - [Commits](https://github.com/rustls/webpki-roots/compare/v/0.26.0...v/0.26.1) --- updated-dependencies: - dependency-name: webpki-roots dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 10 +++++----- crates/datasources/Cargo.toml | 2 +- crates/pgsrv/Cargo.toml | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b668a3a6c..c8e8b4071 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2523,7 +2523,7 @@ dependencies = [ "tracing", "url", "uuid", - "webpki-roots 0.26.0", + "webpki-roots 0.26.1", ] [[package]] @@ -2620,7 +2620,7 @@ dependencies = [ "errno", "fix-hidden-lifetime-bug", "futures", - "hashbrown 0.12.3", + "hashbrown 0.14.2", "indexmap 2.2.2", "itertools 0.12.0", "lazy_static", @@ -5668,7 +5668,7 @@ dependencies = [ "tokio-util", "tracing", "uuid", - "webpki-roots 0.26.0", + "webpki-roots 0.26.1", ] [[package]] @@ -9123,9 +9123,9 @@ checksum = "1778a42e8b3b90bff8d0f5032bf22250792889a5cdc752aa0020c84abe3aaf10" [[package]] name = "webpki-roots" -version = "0.26.0" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0de2cfda980f21be5a7ed2eadb3e6fe074d56022bea2cdeb1a62eb220fc04188" +checksum = "b3de34ae270483955a94f4b21bdaaeb83d508bb84a01435f393818edb0012009" dependencies = [ "rustls-pki-types", ] diff --git a/crates/datasources/Cargo.toml b/crates/datasources/Cargo.toml index cdd797870..588b062f2 100644 --- a/crates/datasources/Cargo.toml +++ b/crates/datasources/Cargo.toml @@ -62,7 +62,7 @@ tokio-rustls = "0.24.1" tracing = { workspace = true } uuid = "1.7.0" url.workspace = true -webpki-roots = "0.26.0" +webpki-roots = "0.26.1" calamine = { version = "0.23.1", features = ["dates"] } tiberius = { version = "0.12.2", default-features = false, features = [ "tds73", diff --git a/crates/pgsrv/Cargo.toml b/crates/pgsrv/Cargo.toml index f153ecaf9..ea94d4770 100644 --- a/crates/pgsrv/Cargo.toml +++ b/crates/pgsrv/Cargo.toml @@ -22,7 +22,7 @@ pgrepr = {path = "../pgrepr"} datafusion_ext = {path = "../datafusion_ext"} bytes = "1.4.0" rustls = "0.21.10" -webpki-roots = "0.26.0" +webpki-roots = "0.26.1" tokio-rustls = "0.24.1" rustls-pemfile = "2.0.0" tokio-util = { version = "0.7.10", features = ["codec"] } From c586dea030b6a8f8ee740eb3c6fa95737afecc3a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 9 Feb 2024 14:37:26 +0000 Subject: [PATCH 10/15] chore(deps): bump serde_with from 3.6.0 to 3.6.1 Bumps [serde_with](https://github.com/jonasbb/serde_with) from 3.6.0 to 3.6.1. - [Release notes](https://github.com/jonasbb/serde_with/releases) - [Commits](https://github.com/jonasbb/serde_with/compare/v3.6.0...v3.6.1) --- updated-dependencies: - dependency-name: serde_with dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 15 ++++++++------- crates/datasources/Cargo.toml | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b668a3a6c..f5a289c82 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2510,7 +2510,7 @@ dependencies = [ "scylla", "serde", "serde_json", - "serde_with 3.6.0", + "serde_with 3.6.1", "snowflake_connector", "ssh-key", "tempfile", @@ -2620,7 +2620,7 @@ dependencies = [ "errno", "fix-hidden-lifetime-bug", "futures", - "hashbrown 0.12.3", + "hashbrown 0.14.2", "indexmap 2.2.2", "itertools 0.12.0", "lazy_static", @@ -7403,9 +7403,9 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.6.0" +version = "3.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b0ed1662c5a68664f45b76d18deb0e234aff37207086803165c961eb695e981" +checksum = "15d167997bd841ec232f5b2b8e0e26606df2e7caa4c31b95ea9ca52b200bd270" dependencies = [ "base64 0.21.7", "chrono", @@ -7413,8 +7413,9 @@ dependencies = [ "indexmap 1.9.3", "indexmap 2.2.2", "serde", + "serde_derive", "serde_json", - "serde_with_macros 3.6.0", + "serde_with_macros 3.6.1", "time", ] @@ -7432,9 +7433,9 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.6.0" +version = "3.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "568577ff0ef47b879f736cd66740e022f3672788cdf002a05a4e609ea5a6fb15" +checksum = "865f9743393e638991566a8b7a479043c2c8da94a33e0a31f18214c9cae0a64d" dependencies = [ "darling 0.20.3", "proc-macro2", diff --git a/crates/datasources/Cargo.toml b/crates/datasources/Cargo.toml index cdd797870..9b21ab62d 100644 --- a/crates/datasources/Cargo.toml +++ b/crates/datasources/Cargo.toml @@ -44,7 +44,7 @@ rustls = "0.21.10" reqwest = { workspace = true } rust_decimal = { version = "1.34.2", features = ["db-tokio-postgres"] } serde = { workspace = true } -serde_with = "3.6.0" +serde_with = "3.6.1" serde_json = {workspace = true} snowflake_connector = { path = "../snowflake_connector" } tempfile = { workspace = true } From 39250d53c665d7697448948a748d45d6b886ea8e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 9 Feb 2024 14:37:54 +0000 Subject: [PATCH 11/15] chore(deps): bump tempfile from 3.9.0 to 3.10.0 Bumps [tempfile](https://github.com/Stebalien/tempfile) from 3.9.0 to 3.10.0. - [Changelog](https://github.com/Stebalien/tempfile/blob/master/CHANGELOG.md) - [Commits](https://github.com/Stebalien/tempfile/compare/v3.9.0...v3.10.0) --- updated-dependencies: - dependency-name: tempfile dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 15 +++++++-------- Cargo.toml | 2 +- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b668a3a6c..0ed7f434e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2620,7 +2620,7 @@ dependencies = [ "errno", "fix-hidden-lifetime-bug", "futures", - "hashbrown 0.12.3", + "hashbrown 0.14.2", "indexmap 2.2.2", "itertools 0.12.0", "lazy_static", @@ -4445,9 +4445,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.151" +version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "libflate" @@ -6920,9 +6920,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.28" +version = "0.38.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316" +checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" dependencies = [ "bitflags 2.4.1", "errno", @@ -8154,13 +8154,12 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.9.0" +version = "3.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa" +checksum = "a365e8cd18e44762ef95d87f284f4b5cd04107fec2ff3052bd6a3e6069669e67" dependencies = [ "cfg-if", "fastrand", - "redox_syscall 0.4.1", "rustix", "windows-sys 0.52.0", ] diff --git a/Cargo.toml b/Cargo.toml index 8bfb556e8..718a36d14 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -37,7 +37,7 @@ prost = "0.12" prost-build = "0.12" prost-types = "0.12" serde_json = "1.0.113" -tempfile = "3.9.0" +tempfile = "3.10.0" thiserror = "1.0" tracing = "0.1" url = "2.5.0" From 07502618febc202a46612634295313ecf14a5837 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 9 Feb 2024 14:38:15 +0000 Subject: [PATCH 12/15] chore(deps): bump async-openai from 0.18.2 to 0.18.3 Bumps [async-openai](https://github.com/64bit/async-openai) from 0.18.2 to 0.18.3. - [Release notes](https://github.com/64bit/async-openai/releases) - [Commits](https://github.com/64bit/async-openai/compare/async-openai-v0.18.2...async-openai-v0.18.3) --- updated-dependencies: - dependency-name: async-openai dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 6 +++--- crates/sqlbuiltins/Cargo.toml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b668a3a6c..77db89938 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -541,9 +541,9 @@ dependencies = [ [[package]] name = "async-openai" -version = "0.18.2" +version = "0.18.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b34bfaa81ed6e96ae205528fa7dfb59f5c25f55b6a3e5cdbcb223df168774572" +checksum = "dea5c9223f84965c603fd58c4c9ddcd1907efb2e54acf6fb47039358cd374df4" dependencies = [ "async-convert", "backoff", @@ -2620,7 +2620,7 @@ dependencies = [ "errno", "fix-hidden-lifetime-bug", "futures", - "hashbrown 0.12.3", + "hashbrown 0.14.2", "indexmap 2.2.2", "itertools 0.12.0", "lazy_static", diff --git a/crates/sqlbuiltins/Cargo.toml b/crates/sqlbuiltins/Cargo.toml index 17fe5dde7..4946efb89 100644 --- a/crates/sqlbuiltins/Cargo.toml +++ b/crates/sqlbuiltins/Cargo.toml @@ -30,6 +30,6 @@ kdl = "5.0.0-alpha.1" siphasher = "1.0.0" fnv = "1.0.7" memoize = { version = "0.4.2", features = ["full"] } -async-openai = "0.18.2" +async-openai = "0.18.3" tokio.workspace = true reqwest.workspace = true From 7890a87fb4d6dd9e1751b257d00118a656cf1502 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 9 Feb 2024 14:38:37 +0000 Subject: [PATCH 13/15] chore(deps): bump tonic-build from 0.10.2 to 0.11.0 Bumps [tonic-build](https://github.com/hyperium/tonic) from 0.10.2 to 0.11.0. - [Changelog](https://github.com/hyperium/tonic/blob/master/CHANGELOG.md) - [Commits](https://github.com/hyperium/tonic/compare/v0.10.2...v0.11.0) --- updated-dependencies: - dependency-name: tonic-build dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 19 ++++++++++++++++--- crates/protogen/Cargo.toml | 2 +- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b668a3a6c..f70db56ab 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1121,7 +1121,7 @@ dependencies = [ "prost", "prost-types", "tonic", - "tonic-build", + "tonic-build 0.10.2", "yup-oauth2 5.1.0", ] @@ -2620,7 +2620,7 @@ dependencies = [ "errno", "fix-hidden-lifetime-bug", "futures", - "hashbrown 0.12.3", + "hashbrown 0.14.2", "indexmap 2.2.2", "itertools 0.12.0", "lazy_static", @@ -6038,7 +6038,7 @@ dependencies = [ "prost-types", "thiserror", "tonic", - "tonic-build", + "tonic-build 0.11.0", "tracing", "uuid", ] @@ -8536,6 +8536,19 @@ dependencies = [ "syn 2.0.48", ] +[[package]] +name = "tonic-build" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4ef6dd70a610078cb4e338a0f79d06bc759ff1b22d2120c2ff02ae264ba9c2" +dependencies = [ + "prettyplease", + "proc-macro2", + "prost-build", + "quote", + "syn 2.0.48", +] + [[package]] name = "tower" version = "0.4.13" diff --git a/crates/protogen/Cargo.toml b/crates/protogen/Cargo.toml index cb32330b3..5f42469b6 100644 --- a/crates/protogen/Cargo.toml +++ b/crates/protogen/Cargo.toml @@ -19,6 +19,6 @@ uuid = { version = "1.7.0", features = ["v4", "fast-rng", "macro-diagnostics"] } tracing = { workspace = true } [build-dependencies] -tonic-build = "0.10" +tonic-build = "0.11" # Only needed to handle custom btree mapping; can be removed when we bump the tonic version which will have this too prost-build = { workspace = true } From 66662bbed489defd88626c050b1a469a911443d2 Mon Sep 17 00:00:00 2001 From: tycho garen Date: Fri, 9 Feb 2024 16:03:04 -0500 Subject: [PATCH 14/15] fix compile --- crates/datasources/src/excel/mod.rs | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/crates/datasources/src/excel/mod.rs b/crates/datasources/src/excel/mod.rs index cdb87a462..0057654d5 100644 --- a/crates/datasources/src/excel/mod.rs +++ b/crates/datasources/src/excel/mod.rs @@ -3,7 +3,7 @@ use std::collections::{HashMap, HashSet}; use std::path::PathBuf; use std::sync::Arc; -use calamine::{open_workbook, Range, Reader, Xlsx}; +use calamine::{open_workbook, DataType as CalamineDataType, Range, Reader, Xlsx}; use datafusion::arrow::array::{ArrayRef, BooleanArray, Date64Array, PrimitiveArray, StringArray}; use datafusion::arrow::datatypes::{DataType, Field, Float64Type, Int64Type, Schema}; use datafusion::arrow::record_batch::RecordBatch; @@ -18,15 +18,15 @@ pub enum Error { OpenWorkbook(#[from] calamine::XlsxError), } -fn infer_value_type(v: &calamine::DataType) -> Result { +fn infer_value_type(v: &calamine::Data) -> Result { match v { - calamine::DataType::Int(_) if v.get_int().is_some() => Ok(DataType::Int64), - calamine::DataType::Float(_) if v.get_float().is_some() => Ok(DataType::Float64), - calamine::DataType::Bool(_) if v.get_bool().is_some() => Ok(DataType::Boolean), - calamine::DataType::String(_) if v.get_string().is_some() => Ok(DataType::Utf8), - calamine::DataType::Error(e) => Err(Error::Load { msg: e.to_string() }), - calamine::DataType::DateTime(_) => Ok(DataType::Date64), - calamine::DataType::Empty => Ok(DataType::Null), + calamine::Data::Int(_) => Ok(DataType::Int64), + calamine::Data::Float(_) => Ok(DataType::Float64), + calamine::Data::Bool(_) => Ok(DataType::Boolean), + calamine::Data::String(_) => Ok(DataType::Utf8), + calamine::Data::Error(e) => Err(Error::Load { msg: e.to_string() }), + calamine::Data::DateTime(_) => Ok(DataType::Date64), + calamine::Data::Empty => Ok(DataType::Null), _ => Err(Error::Load { msg: "Failed to parse the cell value".to_owned(), }), @@ -34,7 +34,7 @@ fn infer_value_type(v: &calamine::DataType) -> Result { } fn infer_schema( - r: &Range, + r: &Range, has_header: Option, infer_schema_length: usize, ) -> Result<(Schema, bool), Error> { @@ -93,7 +93,7 @@ fn infer_schema( // TODO: vectorize this to improve performance // Ideally we can iterate over the columns instead of iterating over the rows fn xlsx_sheet_value_to_record_batch( - r: Range, + r: Range, has_header: Option, infer_schema_length: usize, ) -> Result { From 3b4fed212f6660a3b2b815de52ac253fddc7d49d Mon Sep 17 00:00:00 2001 From: tycho garen Date: Sat, 10 Feb 2024 12:29:18 -0500 Subject: [PATCH 15/15] one more upgrade term --- Cargo.lock | 11 +---------- crates/glaredb/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e2272b174..82519720c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3468,7 +3468,7 @@ dependencies = [ "logutil", "lzma-sys", "metastore", - "nu-ansi-term 0.49.0", + "nu-ansi-term 0.50.0", "num_cpus", "object_store", "object_store_util", @@ -5123,15 +5123,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "nu-ansi-term" -version = "0.49.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c073d3c1930d0751774acf49e66653acecb416c3a54c6ec095a9b11caddb5a68" -dependencies = [ - "windows-sys 0.48.0", -] - [[package]] name = "nu-ansi-term" version = "0.50.0" diff --git a/crates/glaredb/Cargo.toml b/crates/glaredb/Cargo.toml index 28dd9d7b9..dc0acea0c 100644 --- a/crates/glaredb/Cargo.toml +++ b/crates/glaredb/Cargo.toml @@ -42,7 +42,7 @@ terminal_util = { path = "../terminal_util" } num_cpus = "1.16.0" colored = "2.1.0" reedline = "0.29.0" -nu-ansi-term = "0.49.0" +nu-ansi-term = "0.50.0" atty = "0.2.14" console-subscriber = "0.2.0" tokio-postgres = "0.7.8"