diff --git a/Cargo.toml b/Cargo.toml index 6704ee76..636850c7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -26,5 +26,19 @@ databend-driver = { path = "driver", version = "0.20.0" } databend-driver-core = { path = "sql", version = "0.20.0" } databend-driver-macros = { path = "macros", version = "0.20.0" } +tokio-stream = "0.1" +chrono = { version = "0.4.35", default-features = false, features = ["clock"] } +arrow = { version = "52.0" } +arrow-array = { version = "52.0" } +arrow-schema = { version = "52.0" } +arrow-flight = { version = "52.0", features = ["flight-sql-experimental"] } +tonic = { version = "0.11", default-features = false, features = [ + "transport", + "codegen", + "tls", + "tls-webpki-roots", + "prost", +] } + [patch.crates-io] pyo3-asyncio = { git = "https://github.com/everpcpc/pyo3-asyncio", rev = "42af887" } diff --git a/bindings/nodejs/Cargo.toml b/bindings/nodejs/Cargo.toml index de39ad31..9a8ff58b 100644 --- a/bindings/nodejs/Cargo.toml +++ b/bindings/nodejs/Cargo.toml @@ -13,9 +13,10 @@ crate-type = ["cdylib"] doc = false [dependencies] +chrono = { workspace = true } databend-driver = { workspace = true, features = ["rustls", "flight-sql"] } +tokio-stream = { workspace = true } -chrono = { version = "0.4.35", default-features = false } napi = { version = "2.14", default-features = false, features = [ "napi6", "async", @@ -24,7 +25,6 @@ napi = { version = "2.14", default-features = false, features = [ ] } napi-derive = "2.14" once_cell = "1.18" -tokio-stream = "0.1" [build-dependencies] napi-build = "2" diff --git a/bindings/python/Cargo.toml b/bindings/python/Cargo.toml index ac5f2cf8..e0850dff 100644 --- a/bindings/python/Cargo.toml +++ b/bindings/python/Cargo.toml @@ -13,11 +13,12 @@ name = "databend_driver" doc = false [dependencies] -chrono = { version = "0.4.35", default-features = false } -ctor = "0.2.5" +chrono = { workspace = true } databend-driver = { workspace = true, features = ["rustls", "flight-sql"] } +tokio-stream = { workspace = true } + +ctor = "0.2.5" once_cell = "1.18" pyo3 = { version = "0.21", features = ["abi3-py37", "chrono"] } pyo3-asyncio = { version = "0.21", features = ["tokio-runtime"] } tokio = "1.34" -tokio-stream = "0.1" diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 40b38a5d..49c01660 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -11,13 +11,14 @@ authors = { workspace = true } repository = { workspace = true } [dependencies] +chrono = { workspace = true } databend-client = { workspace = true } databend-driver = { workspace = true, features = ["rustls", "flight-sql"] } +tokio-stream = { workspace = true } anyhow = "1.0" async-recursion = "1.1.0" async-trait = "0.1" -chrono = { version = "0.4.35", default-features = false, features = ["clock"] } clap = { version = "4.4", features = ["derive", "env"] } comfy-table = "7.1" csv = "1.3" @@ -25,8 +26,8 @@ databend-common-ast = "0.0.2" fern = { version = "0.6", features = ["colored"] } indicatif = "0.17" log = "0.4" -percent-encoding = "2.3" once_cell = "1.18" +percent-encoding = "2.3" rustyline = "12.0" serde = { version = "1.0", features = ["derive"] } terminal_size = "0.3" @@ -37,7 +38,6 @@ tokio = { version = "1.34", features = [ "sync", "parking_lot", ] } -tokio-stream = "0.1" toml = "0.8" tracing-appender = "0.2" unicode-segmentation = "1.10" diff --git a/core/Cargo.toml b/core/Cargo.toml index f0b20701..9ce5561a 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -19,6 +19,8 @@ rustls = ["reqwest/rustls-tls"] native-tls = ["reqwest/native-tls"] [dependencies] +tokio-stream = { workspace = true } + async-trait = "0.1" log = "0.4" once_cell = "1.18" @@ -28,10 +30,9 @@ serde = { version = "1.0", default-features = false, features = ["derive"] } serde_json = { version = "1.0", default-features = false, features = ["std"] } tokio = { version = "1.34", features = ["macros"] } tokio-retry = "0.3" -tokio-stream = "0.1" tokio-util = { version = "0.7", features = ["io-util"] } url = { version = "2.5", default-features = false } uuid = { version = "1.6", features = ["v4"] } [dev-dependencies] -chrono = { version = "0.4.35", default-features = false, features = ["clock"] } +chrono = { workspace = true } diff --git a/deny.toml b/deny.toml index bd7c7085..510cf03e 100644 --- a/deny.toml +++ b/deny.toml @@ -11,7 +11,6 @@ version = 2 allow = [ "Apache-2.0 WITH LLVM-exception", "Apache-2.0", - "BSD-2-Clause", "BSD-3-Clause", "BSL-1.0", "CC0-1.0", diff --git a/driver/Cargo.toml b/driver/Cargo.toml index cd8d66f3..c801d90b 100644 --- a/driver/Cargo.toml +++ b/driver/Cargo.toml @@ -26,9 +26,14 @@ flight-sql = [ ] [dependencies] +arrow = { workspace = true } +arrow-flight = { workspace = true, optional = true } +arrow-schema = { workspace = true, optional = true } databend-client = { workspace = true } databend-driver-core = { workspace = true } databend-driver-macros = { workspace = true } +tokio-stream = { workspace = true } +tonic = { workspace = true, optional = true } async-compression = { version = "0.4", features = ["tokio", "zstd"] } async-trait = "0.1" @@ -41,18 +46,6 @@ once_cell = "1.18" percent-encoding = "2.3" serde_json = { version = "1.0", default-features = false, features = ["std"] } tokio = { version = "1.34", features = ["macros"] } -tokio-stream = "0.1" url = { version = "2.5", default-features = false } -arrow = { version = "52.0" } -arrow-flight = { version = "52.0", features = ["flight-sql-experimental"], optional = true } -arrow-schema = { version = "52.0", optional = true } -tonic = { version = "0.11", default-features = false, features = [ - "transport", - "codegen", - "tls", - "tls-webpki-roots", - "prost", -], optional = true } - [dev-dependencies] diff --git a/sql/Cargo.toml b/sql/Cargo.toml index 20b0495c..a60b5d37 100644 --- a/sql/Cargo.toml +++ b/sql/Cargo.toml @@ -14,30 +14,22 @@ repository = { workspace = true } flight-sql = ["dep:arrow-array", "dep:arrow-schema", "dep:tonic"] [dependencies] +arrow = { workspace = true } +arrow-array = { workspace = true, optional = true } +arrow-schema = { workspace = true, optional = true } databend-client = { workspace = true } +tokio-stream = { workspace = true } +tonic = { workspace = true, optional = true } chrono = { version = "0.4.35", default-features = false } geozero = { version = "0.13", features = ["default", "with-wkb"] } glob = "0.3" +hex = "0.4.3" itertools = "0.12" jsonb = "0.4" lexical-core = "0.8" memchr = "2.7" - roaring = { version = "0.10", features = ["serde"] } serde = { version = "1.0", default-features = false, features = ["derive"] } serde_json = { version = "1.0", default-features = false, features = ["std"] } -tokio-stream = "0.1" url = { version = "2.5", default-features = false } - -arrow = { version = "52.0" } -arrow-array = { version = "52.0", optional = true } -arrow-schema = { version = "52.0", optional = true } -hex = "0.4.3" -tonic = { version = "0.11", default-features = false, features = [ - "transport", - "codegen", - "tls", - "tls-webpki-roots", - "prost", -], optional = true }