Bump chrono-tz except for clickhouse

Signed-off-by: Darach Ennis <darach@gmail.com>
tremor-rs · May 14, 2024 · 9bb1e44 · 9bb1e44
1 parent 4623e12
commit 9bb1e44
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 22 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/tremor-connectors/Cargo.toml b/tremor-connectors/Cargo.toml
@@ -142,7 +142,8 @@ clickhouse-rs = { version = "1.1.0-alpha.1", optional = true, default-features =
     "tokio_io",
     "tls",
 ] }
-chrono-tz = { version = "0.8", optional = true, default-features = false }
+# Clickhouse chrono-tz is out of date so we ringfence it here. Hopefully a new version will be released soon...
+clickhouse-chrono-tz = { package = "chrono-tz", version = "0.8", optional = true, default-features = false }
 
 # crononome
 serde_yaml = { version = "0.9", optional = true, default-features = false }
@@ -208,12 +209,7 @@ tls = [
 ]
 
 dns = ["dep:trust-dns-resolver"]
-elasticsearch = [
-    "dep:elasticsearch",
-    "dep:serde_yaml",
-    "tls",
-    "http",
-]
+elasticsearch = ["dep:elasticsearch", "dep:serde_yaml", "tls", "http"]
 http = [
     "dep:base64",
     "dep:dashmap",
@@ -239,7 +235,7 @@ file = ["dep:file-mode", "dep:async-compression"]
 kv = ["dep:sled"]
 wal = ["dep:qwal", "dep:simd-json-derive"]
 bench = ["dep:xz2", "dep:hdrhistogram"]
-clickhouse = ["dep:clickhouse-rs", "dep:chrono-tz", "dep:uuid"]
+clickhouse = ["dep:clickhouse-rs", "dep:clickhouse-chrono-tz", "dep:uuid"]
 crononome = ["dep:serde_yaml", "dep:chrono", "dep:cron"]
 stdio = []
 metronome = []

diff --git a/tremor-connectors/src/impls/clickhouse.rs b/tremor-connectors/src/impls/clickhouse.rs
@@ -283,6 +283,7 @@
 mod conversion;
 
 use crate::sink::prelude::*;
+use clickhouse_chrono_tz::Tz;
 use clickhouse_rs::{
     errors::Error as CError,
     types::{DateTimeType, SqlType},
@@ -598,17 +599,15 @@ impl From<&DummySqlType> for &'static SqlType {
             DummySqlType::Ipv6 => SqlType::Ipv6,
             DummySqlType::Uuid => SqlType::Uuid,
             DummySqlType::DateTime => SqlType::DateTime(DateTimeType::DateTime32),
-            DummySqlType::DateTime64Secs => {
-                SqlType::DateTime(DateTimeType::DateTime64(0, chrono_tz::Tz::UTC))
-            }
+            DummySqlType::DateTime64Secs => SqlType::DateTime(DateTimeType::DateTime64(0, Tz::UTC)),
             DummySqlType::DateTime64Millis => {
-                SqlType::DateTime(DateTimeType::DateTime64(3, chrono_tz::Tz::UTC))
+                SqlType::DateTime(DateTimeType::DateTime64(3, Tz::UTC))
             }
             DummySqlType::DateTime64Micros => {
-                SqlType::DateTime(DateTimeType::DateTime64(6, chrono_tz::Tz::UTC))
+                SqlType::DateTime(DateTimeType::DateTime64(6, Tz::UTC))
             }
             DummySqlType::DateTime64Nanos => {
-                SqlType::DateTime(DateTimeType::DateTime64(9, chrono_tz::Tz::UTC))
+                SqlType::DateTime(DateTimeType::DateTime64(9, Tz::UTC))
             }
         };
 
@@ -697,7 +696,7 @@ mod tests {
     }
 
     mod dummy_sql_type_into_sql_type {
-        use chrono_tz::Tz::UTC;
+        use Tz::UTC;
 
         use super::*;
 

diff --git a/tremor-connectors/src/impls/clickhouse/conversion.rs b/tremor-connectors/src/impls/clickhouse/conversion.rs
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 use super::DummySqlType;
-use chrono_tz::Tz;
+use clickhouse_chrono_tz::Tz;
 pub(super) use clickhouse_rs::types::Value as CValue;
 use either::Either;
 use std::{

diff --git a/tremor-script/Cargo.toml b/tremor-script/Cargo.toml
@@ -25,7 +25,7 @@ atty = "0.2"
 beef = { version = "0.5", features = ["impl_serde"] }
 byteorder = "1"
 chrono = "0.4"
-chrono-tz = "0.8"
+chrono-tz = "0.9"
 cidr-utils = "0.6"
 codespan = "0.11"
 dissect = "0.7"
@@ -62,7 +62,7 @@ xz2 = "0.1"
 
 [build-dependencies]
 lalrpop = "0.20"
-chrono-tz = "0.8"
+chrono-tz = "0.9"
 
 [dev-dependencies]
 criterion = "0.5"