Skip to content

Commit 73b4c8d

Browse files
authored
fix: fix chrono version (#362)
* update * update * chore: bump version to 0.14 * chore: bump version to 0.14.0 * chore: bump version to 0.13.3 * update
1 parent 9290c2a commit 73b4c8d

File tree

6 files changed

+11
-9
lines changed

6 files changed

+11
-9
lines changed

bindings/nodejs/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ doc = false
1515
[dependencies]
1616
databend-driver = { workspace = true, features = ["rustls", "flight-sql"] }
1717

18-
chrono = { version = "0.4", default-features = false }
18+
chrono = { version = "0.4.35", default-features = false }
1919
napi = { version = "2.14", default-features = false, features = [
2020
"napi6",
2121
"async",

cli/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ databend-driver = { workspace = true, features = ["rustls", "flight-sql"] }
1515

1616
anyhow = "1.0"
1717
async-trait = "0.1"
18-
chrono = { version = "0.4.31", default-features = false, features = ["clock"] }
18+
chrono = { version = "0.4.35", default-features = false, features = ["clock"] }
1919
clap = { version = "4.4", features = ["derive", "env"] }
2020
comfy-table = "7.1"
2121
csv = "1.3"

core/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,4 @@ url = { version = "2.5", default-features = false }
3434
uuid = { version = "1.6", features = ["v4"] }
3535

3636
[dev-dependencies]
37-
chrono = { version = "0.4", default-features = false, features = ["clock"] }
37+
chrono = { version = "0.4.35", default-features = false, features = ["clock"] }

driver/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ databend-driver-macros = { workspace = true }
3131
databend-sql = { workspace = true }
3232

3333
async-trait = "0.1"
34-
chrono = { version = "0.4.31", default-features = false, features = ["clock"] }
34+
chrono = { version = "0.4.35", default-features = false, features = ["clock"] }
3535
csv = "1.3"
3636
dyn-clone = "1.0"
3737
glob = "0.3"

sql/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ flight-sql = ["dep:arrow-array", "dep:arrow-schema", "dep:tonic"]
1616
[dependencies]
1717
databend-client = { workspace = true }
1818

19-
chrono = { version = "0.4", default-features = false }
19+
chrono = { version = "0.4.35", default-features = false }
2020
geozero = { version = "0.12.0", features = ["default", "with-wkb"] }
2121
glob = "0.3"
2222
itertools = "0.12"

sql/src/value.rs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
// limitations under the License.
1414

1515
use arrow::datatypes::{i256, ArrowNativeTypeOp};
16-
use chrono::{Datelike, NaiveDate, NaiveDateTime};
16+
use chrono::{DateTime, Datelike, NaiveDate, NaiveDateTime};
1717

1818
use crate::{
1919
error::{ConvertError, Error, Result},
@@ -189,6 +189,7 @@ impl TryFrom<(&DataType, &str)> for Value {
189189

190190
DataType::Timestamp => Ok(Self::Timestamp(
191191
chrono::NaiveDateTime::parse_from_str(v, "%Y-%m-%d %H:%M:%S%.6f")?
192+
.and_utc()
192193
.timestamp_micros(),
193194
)),
194195
DataType::Date => Ok(Self::Date(
@@ -525,9 +526,9 @@ impl TryFrom<Value> for NaiveDateTime {
525526
Value::Timestamp(i) => {
526527
let secs = i / 1_000_000;
527528
let nanos = ((i % 1_000_000) * 1000) as u32;
528-
let t = NaiveDateTime::from_timestamp_opt(secs, nanos);
529+
let t = DateTime::from_timestamp(secs, nanos);
529530
match t {
530-
Some(t) => Ok(t),
531+
Some(t) => Ok(t.naive_utc()),
531532
None => Err(ConvertError::new("NaiveDateTime", "".to_string()).into()),
532533
}
533534
}
@@ -633,7 +634,8 @@ fn encode_value(f: &mut std::fmt::Formatter<'_>, val: &Value, raw: bool) -> std:
633634
Value::Timestamp(i) => {
634635
let secs = i / 1_000_000;
635636
let nanos = ((i % 1_000_000) * 1000) as u32;
636-
let t = NaiveDateTime::from_timestamp_opt(secs, nanos).unwrap_or_default();
637+
let t = DateTime::from_timestamp(secs, nanos).unwrap_or_default();
638+
let t = t.naive_utc();
637639
if raw {
638640
write!(f, "{}", t)
639641
} else {

0 commit comments

Comments
 (0)