feat: support new DataType TimestampTz (#696)

Author: KKould

bindings/nodejs/src/lib.rs

@@ -339,6 +339,7 @@ impl ToNapiValue for Value<'_> {
                     String::to_napi_value(env, s.to_string())
                 }
             }
+            databend_driver::Value::TimestampTz(s) => String::to_napi_value(env, s.to_string()),
             databend_driver::Value::Geometry(s) => String::to_napi_value(env, s.to_string()),
             databend_driver::Value::Interval(s) => String::to_napi_value(env, s.to_string()),
             databend_driver::Value::Geography(s) => String::to_napi_value(env, s.to_string()),

bindings/python/src/types.rs

@@ -99,6 +99,7 @@ impl<'py> IntoPyObject<'py> for Value {
                 let tuple = PyTuple::new(py, inner.into_iter().map(Value))?;
                 tuple.into_bound_py_any(py)?
             }
+            databend_driver::Value::TimestampTz(s) => s.into_bound_py_any(py)?,
             databend_driver::Value::Bitmap(s) => s.into_bound_py_any(py)?,
             databend_driver::Value::Variant(s) => s.into_bound_py_any(py)?,
             databend_driver::Value::Geometry(s) => s.into_bound_py_any(py)?,

cli/Cargo.toml

@@ -25,7 +25,7 @@ clap = { version = "4.5", features = ["derive", "env"] }
 comfy-table = "7.1"
 csv = "1.3"
 ctrlc = { version = "3.4.6", features = ["termination"] }
-databend-common-ast = "0.2.1"
+databend-common-ast = "0.2.3"
 fern = { version = "0.7", features = ["colored"] }
 indicatif = "0.17"
 log = "0.4"

driver/Cargo.toml

@@ -38,7 +38,7 @@ tonic = { workspace = true, optional = true }
 
 async-trait = "0.1"
 csv = "1.3"
-databend-common-ast = "0.2.2"
+databend-common-ast = "0.2.3"
 derive-visitor = { version = "0.4.0", features = ["std-types-drive"] }
 glob = "0.3"
 log = "0.4"

sql/src/schema.rs

@@ -87,6 +87,7 @@ pub enum DataType {
     Number(NumberDataType),
     Decimal(DecimalDataType),
     Timestamp,
+    TimestampTz,
     Date,
     Nullable(Box<DataType>),
     Array(Box<DataType>),
@@ -137,6 +138,7 @@ impl std::fmt::Display for DataType {
                 write!(f, "Decimal({}, {})", size.precision, size.scale)
             }
             DataType::Timestamp => write!(f, "Timestamp"),
+            DataType::TimestampTz => write!(f, "TimestampTz"),
             DataType::Date => write!(f, "Date"),
             DataType::Nullable(inner) => write!(f, "Nullable({inner})"),
             DataType::Array(inner) => write!(f, "Array({inner})"),
@@ -283,6 +285,7 @@ impl TryFrom<&TypeDesc<'_>> for DataType {
                 let dimension = desc.args[0].name.parse::<u64>()?;
                 DataType::Vector(dimension)
             }
+            "TimestampTz" => DataType::TimestampTz,
             _ => return Err(Error::Parsing(format!("Unknown type: {desc:?}"))),
         };
         Ok(dt)

sql/src/value.rs

@@ -85,6 +85,7 @@ pub enum Value {
     Number(NumberValue),
     /// Microseconds from 1970-01-01 00:00:00 UTC
     Timestamp(i64),
+    TimestampTz(String),
     Date(i32),
     Array(Vec<Value>),
     Map(Vec<(Value, Value)>),
@@ -121,6 +122,7 @@ impl Value {
                 NumberValue::Decimal256(_, s) => DataType::Decimal(DecimalDataType::Decimal256(*s)),
             },
             Self::Timestamp(_) => DataType::Timestamp,
+            Self::TimestampTz(_) => DataType::TimestampTz,
 
             Self::Date(_) => DataType::Date,
             Self::Interval(_) => DataType::Interval,
@@ -223,6 +225,7 @@ impl TryFrom<(&DataType, String)> for Value {
                     .and_utc()
                     .timestamp_micros(),
             )),
+            DataType::TimestampTz => Ok(Self::TimestampTz(v)),
             DataType::Date => Ok(Self::Date(
                 NaiveDate::parse_from_str(v.as_str(), "%Y-%m-%d")?.num_days_from_ce()
                     - DAYS_FROM_CE,
@@ -884,6 +887,7 @@ fn encode_value(f: &mut std::fmt::Formatter<'_>, val: &Value, raw: bool) -> std:
         | Value::Bitmap(s)
         | Value::Variant(s)
         | Value::Interval(s)
+        | Value::TimestampTz(s)
         | Value::Geometry(s)
         | Value::Geography(s) => {
             if raw {
@@ -1670,6 +1674,7 @@ impl ValueDecoder {
             DataType::String => self.read_string(reader),
             DataType::Binary => self.read_binary(reader),
             DataType::Timestamp => self.read_timestamp(reader),
+            DataType::TimestampTz => self.read_timestamp_tz(reader),
             DataType::Date => self.read_date(reader),
             DataType::Bitmap => self.read_bitmap(reader),
             DataType::Variant => self.read_variant(reader),
@@ -1817,6 +1822,14 @@ impl ValueDecoder {
         Ok(Value::Interval(unsafe { String::from_utf8_unchecked(buf) }))
     }
 
+    fn read_timestamp_tz<R: AsRef<[u8]>>(&self, reader: &mut Cursor<R>) -> Result<Value> {
+        let mut buf = Vec::new();
+        reader.read_quoted_text(&mut buf, b'\'')?;
+        Ok(Value::TimestampTz(unsafe {
+            String::from_utf8_unchecked(buf)
+        }))
+    }
+
     fn read_bitmap<R: AsRef<[u8]>>(&self, reader: &mut Cursor<R>) -> Result<Value> {
         let mut buf = Vec::new();
         reader.read_quoted_text(&mut buf, b'\'')?;
@@ -2191,6 +2204,7 @@ impl Value {
                 let dt = DateTime::from_timestamp_micros(*ts).unwrap();
                 format!("'{}'", dt.format(TIMESTAMP_FORMAT))
             }
+            Value::TimestampTz(t) => format!("'{t}'"),
             Value::Date(d) => {
                 let date = NaiveDate::from_num_days_from_ce_opt(*d + DAYS_FROM_CE).unwrap();
                 format!("'{}'", date.format("%Y-%m-%d"))