Support VARCHAR column & get current database

crossdb-org · Oct 20, 2024 · 9654125 · 9654125
1 parent 141e496
commit 9654125
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 2 deletions.
diff --git a/crossdb b/crossdb
diff --git a/src/de.rs b/src/de.rs
@@ -90,6 +90,8 @@ impl<'de> Deserializer<'de> for ValueDeserializer<'de> {
             Value::F32(v) => visitor.visit_f32(v),
             Value::F64(v) => visitor.visit_f64(v),
             Value::Char(v) => visitor.visit_str(v),
+            // TODO: Deserialize Binary to Vec<u8>
+            Value::Binary(_) => unimplemented!(),
         }
     }
 

diff --git a/src/lib.rs b/src/lib.rs
@@ -68,6 +68,14 @@ impl Connection {
         Self::open(":memory:")
     }
 
+    pub fn current_database(&self) -> Result<&str> {
+        unsafe {
+            let ptr = xdb_curdb(self.ptr);
+            let db = CStr::from_ptr(ptr).to_str()?;
+            Ok(db)
+        }
+    }
+
     pub fn query<S: AsRef<str>>(&self, sql: S) -> Result<Query> {
         let sql = CString::new(sql.as_ref())?;
         unsafe {

diff --git a/src/value.rs b/src/value.rs
@@ -10,6 +10,7 @@ pub enum Value<'a> {
     F32(f32),
     F64(f64),
     Char(&'a str),
+    Binary(&'a [u8]),
 }
 
 impl Display for Value<'_> {
@@ -23,6 +24,7 @@ impl Display for Value<'_> {
             Value::F32(v) => write!(f, "{}", v),
             Value::F64(v) => write!(f, "{}", v),
             Value::Char(v) => write!(f, "{}", v),
+            Value::Binary(v) => write!(f, "{:?}", v),
         }
     }
 }
@@ -43,10 +45,14 @@ 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::Char => {
+            DataType::Char | DataType::VChar => {
                 let s = CStr::from_ptr(xdb_column_str(meta, row, col));
                 Value::Char(s.to_str().unwrap())
             }
+            DataType::Binary | DataType::VBinary => {
+                // xdb_column_blob(meta, row, col, pLen);
+                todo!()
+            }
             _ => unimplemented!(),
         }
     }
+2 −2		Makefile
+1 −1		examples/c/example.c
+12 −9		include/crossdb.h
+12 −0		src/admin/xdb_backup.c
+27 −16		src/admin/xdb_shell.c
+2 −1		src/core/xdb_common.h
+564 −64		src/core/xdb_crud.c
+7 −2		src/core/xdb_db.c
+18 −18		src/core/xdb_hash.c
+3 −3		src/core/xdb_index.h
+61 −8		src/core/xdb_sql.c
+26 −2		src/core/xdb_store.c
+9 −0		src/core/xdb_store.h
+5 −5		src/core/xdb_sysdb.c
+36 −12		src/core/xdb_table.c
+4 −0		src/core/xdb_table.h
+3 −0		src/core/xdb_trans.c
+158 −0		src/core/xdb_vdata.c
+81 −0		src/core/xdb_vdata.h
+10 −3		src/crossdb.c
+1 −1		src/lib/xdb_bmp.c
+24 −0		src/lib/xdb_lib.c
+14 −5		src/lib/xdb_lib.h
+1 −1		src/lib/xdb_str.c
+10 −10		src/lib/xdb_thread.c
+70 −21		src/parser/xdb_parser_dml.c
+12 −0		src/parser/xdb_parser_tbl.c
+8 −0		src/parser/xdb_stmt.h
+33 −0		src/parser/xdb_token.c
+1 −0		src/parser/xdb_token.h
+99 −4		test/xdb_smoke_dml.c
+15 −15		test/xdb_smoke_test.c