Support NULL, BOOL, TIMESTAMP

Author: wyhaya

crossdb

@@ -2,7 +2,7 @@ use crate::*;
 use std::rc::Rc;
 use std::slice::Iter;
 
-// https://crossdb.org/client/api-c/#xdb_type_t
+// https://github.com/crossdb-org/crossdb/blob/main/include/crossdb.h
 #[derive(Debug, Clone, Copy)]
 pub enum DataType {
     Null,
@@ -21,6 +21,7 @@ pub enum DataType {
     Binary,
     VChar,
     VBinary,
+    Bool,
     Max,
 }
 
@@ -43,6 +44,7 @@ impl Display for DataType {
             DataType::Binary => write!(f, "BINARY"),
             DataType::VChar => write!(f, "VCHAR"),
             DataType::VBinary => write!(f, "VBINARY"),
+            DataType::Bool => write!(f, "BOOL"),
             DataType::Max => write!(f, "MAX"),
         }
     }
@@ -69,6 +71,7 @@ impl DataType {
             xdb_type_t_XDB_TYPE_BINARY => Self::Binary,
             xdb_type_t_XDB_TYPE_VCHAR => Self::VChar,
             xdb_type_t_XDB_TYPE_VBINARY => Self::VBinary,
+            xdb_type_t_XDB_TYPE_BOOL => Self::Bool,
             xdb_type_t_XDB_TYPE_MAX => Self::Max,
             _ => unreachable!(),
         }

src/column.rs

@@ -89,9 +89,12 @@ impl<'de> Deserializer<'de> for ValueDeserializer<'de> {
             Value::I64(v) => visitor.visit_i64(v),
             Value::F32(v) => visitor.visit_f32(v),
             Value::F64(v) => visitor.visit_f64(v),
-            Value::Char(v) => visitor.visit_str(v),
+            // TODO
+            Value::Timestamp(v) => visitor.visit_i64(v),
+            Value::String(v) => visitor.visit_str(v),
             // TODO: Deserialize Binary to Vec<u8>
             Value::Binary(_) => unimplemented!(),
+            Value::Bool(v) => visitor.visit_bool(v),
         }
     }
 
@@ -144,8 +147,8 @@ mod tests {
         de(&Value::I16(1), Some(1i16));
         de(&Value::I16(1), Some(1_u128));
 
-        de(&Value::Char("Hello"), String::from("Hello"));
-        de(&Value::Char("Hello"), Some(String::from("Hello")));
+        de(&Value::String("Hello"), String::from("Hello"));
+        de(&Value::String("Hello"), Some(String::from("Hello")));
     }
 
     #[test]

src/de.rs

@@ -9,8 +9,10 @@ pub enum Value<'a> {
     I64(i64),
     F32(f32),
     F64(f64),
-    Char(&'a str),
+    Timestamp(i64),
+    String(&'a str),
     Binary(&'a [u8]),
+    Bool(bool),
 }
 
 impl Display for Value<'_> {
@@ -23,8 +25,10 @@ impl Display for Value<'_> {
             Value::I64(v) => write!(f, "{}", v),
             Value::F32(v) => write!(f, "{}", v),
             Value::F64(v) => write!(f, "{}", v),
-            Value::Char(v) => write!(f, "{}", v),
+            Value::Timestamp(v) => write!(f, "{}", v),
+            Value::String(v) => write!(f, "{}", v),
             Value::Binary(v) => write!(f, "{:?}", v),
+            Value::Bool(v) => write!(f, "{}", v),
         }
     }
 }
@@ -45,14 +49,19 @@ impl<'a> Value<'a> {
             DataType::BigInt => Value::I64(xdb_column_int64(meta, row, col)),
             DataType::Float => Value::F32(xdb_column_float(meta, row, col)),
             DataType::Double => Value::F64(xdb_column_double(meta, row, col)),
+            DataType::Timestamp => Value::Timestamp(xdb_column_int64(meta, row, col)),
             DataType::Char | DataType::VChar => {
-                let s = CStr::from_ptr(xdb_column_str(meta, row, col));
-                Value::Char(s.to_str().unwrap())
+                let ptr = xdb_column_str(meta, row, col);
+                if ptr.is_null() {
+                    return Value::Null;
+                }
+                Value::String(CStr::from_ptr(ptr).to_str().unwrap())
             }
             DataType::Binary | DataType::VBinary => {
                 // xdb_column_blob(meta, row, col, pLen);
                 todo!()
             }
+            DataType::Bool => Value::Bool(xdb_column_int(meta, row, col) == 1),
             _ => unimplemented!(),
         }
     }