Skip to content

chore: bump jsonb 0.5.1 #611

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
May 8, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ databend-driver-core = { path = "sql", version = "0.27.1" }
databend-driver-macros = { path = "macros", version = "0.27.1" }

tokio-stream = "0.1"
chrono = { version = "=0.4.39", default-features = false, features = ["clock"] }
arrow = { version = "54.0" }
arrow-array = { version = "54.0" }
arrow-buffer = { version = "54.0" }
arrow-schema = { version = "54.0" }
arrow-flight = { version = "54.0", features = ["flight-sql-experimental"] }
chrono = { version = "=0.4.40", default-features = false, features = ["clock"] }
arrow = { version = "55.0" }
arrow-array = { version = "55.0" }
arrow-buffer = { version = "55.0" }
arrow-schema = { version = "55.0" }
arrow-flight = { version = "55.0", features = ["flight-sql-experimental"] }
tonic = { version = "0.12", default-features = false, features = [
"transport",
"codegen",
Expand Down
2 changes: 1 addition & 1 deletion bindings/nodejs/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ napi = { version = "2.16", default-features = false, features = [
"chrono_date",
] }
napi-derive = "2.16"
once_cell = "1.20"
once_cell = "1.21"
serde_json = "1.0"

[build-dependencies]
Expand Down
4 changes: 2 additions & 2 deletions bindings/python/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ tokio-stream = { workspace = true }

csv = "1.3"
ctor = "0.2"
once_cell = "1.20"
once_cell = "1.21"
pyo3 = { version = "0.24.2", features = ["abi3-py37", "chrono"] }
pyo3-async-runtimes = { version = "0.24", features = ["tokio-runtime"] }
tokio = "1.42"
tokio = "1.44"
26 changes: 13 additions & 13 deletions cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,32 +22,32 @@ databend-client = { workspace = true }
databend-driver = { workspace = true, features = ["rustls", "flight-sql"] }
tokio-stream = { workspace = true }

actix-web = "4.0"
actix-web = "4.10"
anyhow = "1.0"
arrow = { workspace = true }
async-recursion = "1.1.0"
async-recursion = "1.1.1"
async-trait = "0.1"
clap = { version = "4.4", features = ["derive", "env"] }
clap = { version = "4.5", features = ["derive", "env"] }
comfy-table = "7.1"
csv = "1.3"
ctrlc = { version = "3.2.3", features = ["termination"] }
ctrlc = { version = "3.4.6", features = ["termination"] }
databend-common-ast = "0.2.1"
fern = { version = "0.6", features = ["colored"] }
fern = { version = "0.7", features = ["colored"] }
indicatif = "0.17"
log = "0.4"
mime_guess = "2.0"
nom = "8.0.0"
once_cell = "1.18"
once_cell = "1.21"
percent-encoding = "2.3"
rust-embed = "6.8.1"
rustyline = "12.0"
rust-embed = "8.7.0"
rustyline = "15.0"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
sled = "0.34"
sqlformat = "0.3.3"
tempfile = "3.17.1"
terminal_size = "0.3"
tokio = { version = "1.34", features = [
tempfile = "3.19.1"
terminal_size = "0.4"
tokio = { version = "1.44.2", features = [
"macros",
"rt",
"rt-multi-thread",
Expand All @@ -57,9 +57,9 @@ tokio = { version = "1.34", features = [
] }
toml = "0.8"
tracing-appender = "0.2"
unicode-segmentation = "1.10"
unicode-segmentation = "1.12"
url = { version = "2.5", default-features = false }
webbrowser = "1.0.1"
webbrowser = "1.0.4"

[build-dependencies]
vergen-gix = { version = "1.0.9", features = ["build"] }
Expand Down
3 changes: 2 additions & 1 deletion cli/src/helper.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ use rustyline::completion::Completer;
use rustyline::completion::FilenameCompleter;
use rustyline::completion::Pair;
use rustyline::error::ReadlineError;
use rustyline::highlight::CmdKind;
use rustyline::highlight::Highlighter;
use rustyline::hint::Hinter;
use rustyline::validate::ValidationContext;
Expand Down Expand Up @@ -72,7 +73,7 @@ impl Highlighter for CliHelper {
std::borrow::Cow::Borrowed(candidate)
}

fn highlight_char(&self, line: &str, _pos: usize) -> bool {
fn highlight_char(&self, line: &str, _pos: usize, _kind: CmdKind) -> bool {
!line.is_empty()
}
}
Expand Down
6 changes: 3 additions & 3 deletions core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,17 @@ tokio-stream = { workspace = true }

cookie = "0.18.1"
log = "0.4"
once_cell = "1.18"
once_cell = "1.21"
parking_lot = "0.12.3"
percent-encoding = "2.3"
reqwest = { version = "0.12", default-features = false, features = ["json", "multipart", "stream", "cookies"] }
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 = { version = "1.44", features = ["macros"] }
tokio-retry = "0.3"
tokio-util = { version = "0.7", features = ["io-util"] }
url = { version = "2.5", default-features = false }
uuid = { version = "1.6", features = ["v4"] }
uuid = { version = "1.16", features = ["v4"] }

[dev-dependencies]
chrono = { workspace = true }
4 changes: 2 additions & 2 deletions driver/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@ databend-common-ast = "0.2.1"
derive-visitor = { version = "0.4.0", features = ["std-types-drive"] }

async-trait = "0.1"
chrono = { version = "=0.4.39", default-features = false, features = ["clock"] }
chrono = { version = "=0.4.40", default-features = false, features = ["clock"] }
csv = "1.3"
glob = "0.3"
log = "0.4"
once_cell = "1.18"
once_cell = "1.21"
percent-encoding = "2.3"
serde_json = { version = "1.0", default-features = false, features = ["std"] }
tokio = { version = "1.34", features = ["macros"] }
Expand Down
8 changes: 4 additions & 4 deletions sql/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@ databend-client = { workspace = true }
tokio-stream = { workspace = true }
tonic = { workspace = true, optional = true }

chrono = { version = "=0.4.39", default-features = false }
chrono = { version = "=0.4.40", default-features = false }
geozero = { version = "0.14.0", features = ["with-wkb"] }
glob = "0.3"
hex = "0.4.3"
itertools = "0.12"
jsonb = { version = "0.4.1", optional = true }
lexical-core = "1.0.1"
jsonb = { version = "0.5.1", optional = true }
lexical-core = "1.0.5"
memchr = "2.7"
roaring = { version = "0.10", features = ["serde"] }
roaring = { version = "0.10.12", features = ["serde"] }
serde = { version = "1.0", default-features = false, features = ["derive"] }
serde_json = { version = "1.0", default-features = false, features = ["std"] }
url = { version = "2.5", default-features = false }
5 changes: 4 additions & 1 deletion sql/src/value.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ use std::io::Cursor;

use arrow_buffer::i256;
use chrono::{DateTime, Datelike, NaiveDate, NaiveDateTime};
use jsonb::RawJsonb;

use crate::cursor_ext::{
collect_binary_number, collect_number, BufferReadStringExt, ReadBytesExt, ReadCheckPointExt,
Expand Down Expand Up @@ -270,7 +271,9 @@ impl TryFrom<(&ArrowField, &Arc<dyn ArrowArray>, usize)> for Value {
return Ok(Value::Null);
}
match array.as_any().downcast_ref::<LargeBinaryArray>() {
Some(array) => Ok(Value::Variant(jsonb::to_string(array.value(seq)))),
Some(array) => {
Ok(Value::Variant(RawJsonb::new(array.value(seq)).to_string()))
}
None => Err(ConvertError::new("variant", format!("{:?}", array)).into()),
}
}
Expand Down
Loading