tests

Author: tephrocactus

README.md

@@ -4,6 +4,7 @@
 
 # chdb-rust <img src="https://upload.wikimedia.org/wikipedia/commons/thumb/d/d5/Rust_programming_language_black_logo.svg/1024px-Rust_programming_language_black_logo.svg.png" height=20 />
 Experimental [chDB](https://github.com/chdb-io/chdb) FFI bindings for Rust
+
 ### Status
 
 - Experimental, unstable, subject to changes
@@ -14,3 +15,9 @@ Experimental [chDB](https://github.com/chdb-io/chdb) FFI bindings for Rust
 ./update_libchdb.sh
 RUST_BACKTRACE=full cargo build --verbose
 ```
+
+### Run tests
+`cargo test`
+
+### Examples
+See `tests` directory.

src/arg.rs

@@ -2,20 +2,15 @@ use std::borrow::Cow;
 use std::ffi::CString;
 
 use crate::error::Error;
-use crate::format::InputFormat;
 use crate::format::OutputFormat;
 use crate::log_level::LogLevel;
 
 #[derive(Debug)]
 pub enum Arg<'a> {
     /// --config-file=<value>
     ConfigFilePath(Cow<'a, str>),
-    /// --database=<value>
-    Database(Cow<'a, str>),
     /// --log-level=<value>
     LogLevel(LogLevel),
-    /// --input-format=<value>
-    InputFormat(InputFormat),
     /// --output-format=<value>
     OutputFormat(OutputFormat),
     /// --multiquery
@@ -39,9 +34,7 @@ impl<'a> Arg<'a> {
     pub(crate) fn to_cstring(&self) -> Result<CString, Error> {
         Ok(match self {
             Self::ConfigFilePath(v) => CString::new(format!("--config-file={}", v)),
-            Self::Database(v) => CString::new(format!("--database={}", v)),
             Self::LogLevel(v) => CString::new(format!("--log-level={}", v.as_str())),
-            Self::InputFormat(v) => CString::new(format!("--input-format={}", v.as_str())),
             Self::OutputFormat(v) => CString::new(format!("--output-format={}", v.as_str())),
             Self::MultiQuery => CString::new("-n"),
             Self::Custom(k, v) => match v {

src/format.rs

@@ -131,6 +131,7 @@ pub enum OutputFormat {
     RawBLOB,
     MsgPack,
     Markdown,
+    Vertical,
 }
 
 impl InputFormat {
@@ -274,6 +275,7 @@ impl OutputFormat {
             Self::RawBLOB => "RawBLOB",
             Self::MsgPack => "MsgPack",
             Self::Markdown => "Markdown",
+            Self::Vertical => "Vertical",
         }
     }
 }

src/query_result.rs

@@ -1,4 +1,6 @@
 use core::slice;
+use std::borrow::Cow;
+use std::ffi::CStr;
 use std::time::Duration;
 
 use crate::bindings;
@@ -13,6 +15,10 @@ impl QueryResult {
             .map_err(|e| Error::NonUtf8Sequence(e.to_string()))
     }
 
+    pub fn data_utf8_lossy<'a>(&'a self) -> Cow<'a, str> {
+        String::from_utf8_lossy(self.data_ref())
+    }
+
     pub fn data_utf8_unchecked(&self) -> String {
         unsafe { String::from_utf8_unchecked(self.data_ref().to_vec()) }
     }
@@ -38,18 +44,15 @@ impl QueryResult {
     }
 
     pub(crate) fn check_error(self) -> Result<Self, Error> {
-        let buf = unsafe { (*self.0).error_message };
+        let err_ptr = unsafe { (*self.0).error_message };
 
-        if buf.is_null() {
+        if err_ptr.is_null() {
             return Ok(self);
         }
 
-        let len = unsafe { (*self.0).len };
-        let bytes: &[u8] = unsafe { slice::from_raw_parts(buf as *const u8, len) };
-
-        Err(Error::QueryError(
-            String::from_utf8_lossy(bytes).to_string(),
-        ))
+        Err(Error::QueryError(unsafe {
+            CStr::from_ptr(err_ptr).to_string_lossy().to_string()
+        }))
     }
 }
 

tests/examples.rs

@@ -0,0 +1,79 @@
+use chdb_rust::arg::Arg;
+use chdb_rust::execute;
+use chdb_rust::format::InputFormat;
+use chdb_rust::format::OutputFormat;
+use chdb_rust::log_level::LogLevel;
+use chdb_rust::session::SessionBuilder;
+
+#[test]
+fn stateful() {
+    //
+    // Create session.
+    //
+
+    let session = SessionBuilder::new()
+        .with_data_path("/tmp/chdb")
+        .with_arg(Arg::LogLevel(LogLevel::Debug))
+        .with_arg(Arg::Custom("priority".into(), Some("1".into())))
+        .with_auto_cleanup(true)
+        .build()
+        .unwrap();
+
+    //
+    // Create database.
+    //
+
+    session
+        .execute("CREATE DATABASE demo; USE demo", Some(&[Arg::MultiQuery]))
+        .unwrap();
+
+    //
+    // Create table.
+    //
+
+    session
+        .execute(
+            "CREATE TABLE logs (id UInt64, msg String) ENGINE = MergeTree ORDER BY id",
+            None,
+        )
+        .unwrap();
+
+    //
+    // Insert into table.
+    //
+
+    session
+        .execute("INSERT INTO logs (id, msg) VALUES (1, 'test')", None)
+        .unwrap();
+
+    //
+    // Select from table.
+    //
+
+    let result = session
+        .execute(
+            "SELECT * FROM logs",
+            Some(&[Arg::OutputFormat(OutputFormat::JSONEachRow)]),
+        )
+        .unwrap()
+        .unwrap();
+
+    assert_eq!(result.data_utf8_lossy(), "{\"id\":1,\"msg\":\"test\"}\n");
+}
+
+#[test]
+fn stateless() {
+    let query = format!(
+        "SELECT * FROM file('tests/logs.csv', {})",
+        InputFormat::CSV.as_str()
+    );
+
+    let result = execute(
+        &query,
+        Some(&[Arg::OutputFormat(OutputFormat::JSONEachRow)]),
+    )
+    .unwrap()
+    .unwrap();
+
+    assert_eq!(result.data_utf8_lossy(), "{\"id\":1,\"msg\":\"test\"}\n");
+}

tests/logs.csv

@@ -0,0 +1,2 @@
+id,msg
+1,test