sqllogictest continue

Author: GE-fighting

src/lib.rs

@@ -14,4 +14,5 @@ pub mod parser;
 pub mod planner;
 pub mod storage;
 pub mod types;
+pub mod util;
 mod execution_v1;

src/util/mod.rs

@@ -1,8 +1,8 @@
-pub mod util;
 
 use arrow::record_batch::RecordBatch;
 use arrow::datatypes::{DataType, Field, Schema, SchemaRef};
 use arrow::error::ArrowError;
+use arrow::util::display::array_value_to_string;
 
 pub fn record_batch_to_string(batch: &RecordBatch) -> Result<String, ArrowError> {
     let mut output = String::new();

tests/slt/csv/csv.slt

@@ -0,0 +1,91 @@
+# Test common insert case
+onlyif sqlrs_v2
+statement ok
+create table t1(v1 varchar, v2 varchar, v3 varchar);
+
+onlyif sqlrs_v2
+statement error
+insert into t1(v3) values ('0','4');
+
+onlyif sqlrs_v2
+statement ok
+insert into t1(v3, v2) values ('0','4'), ('1','5');
+
+onlyif sqlrs_v2
+statement ok
+insert into t1 values ('2','7','9');
+
+onlyif sqlrs_v2
+query III
+select v1, v3, v2 from t1;
+----
+NULL 0 4
+NULL 1 5
+2    9 7
+
+
+# Test insert value cast type
+onlyif sqlrs_v2
+statement ok
+create table t2(v1 int, v2 int, v3 int);
+
+onlyif sqlrs_v2
+statement ok
+insert into t2(v3, v2, v1) values (0, 4, 1), (1, 5, 2);
+
+onlyif sqlrs_v2
+query III
+select v3, v2, v1 from t2;
+----
+0 4 1
+1 5 2
+
+
+# Test insert type cast
+onlyif sqlrs_v2
+statement ok
+create table t3(v1 TINYINT UNSIGNED);
+
+onlyif sqlrs_v2
+statement error
+insert into t3(v1) values (1481);
+
+
+# Test insert null values
+onlyif sqlrs_v2
+statement ok
+create table t4(v1 varchar, v2 smallint unsigned, v3 bigint unsigned);
+
+onlyif sqlrs_v2
+statement ok
+insert into t4 values (NULL, 1, 2), ('', 3, NULL);
+
+onlyif sqlrs_v2
+statement ok
+insert into t4 values (NULL, NULL, NULL);
+
+onlyif sqlrs_v2
+query III
+select v1, v2, v3 from t4;
+----
+NULL 1 2
+(empty) 3 NULL
+NULL NULL NULL
+
+
+# Test insert from select
+onlyif sqlrs_v2
+statement ok
+CREATE TABLE integers(i INTEGER);
+
+onlyif sqlrs_v2
+statement ok
+INSERT INTO integers SELECT 42;
+INSERT INTO integers SELECT null;
+
+onlyif sqlrs_v2
+query I
+SELECT * FROM integers
+----
+42
+NULL

tests/slt/csv/state1.csv

@@ -0,0 +1,51 @@
+skipif sqlrs_v2
+query IIII
+select first_name, state, id, salary from employee;
+----
+Bill CA 1 12000
+Gregg CO 2 10000
+John CO 3 11500
+Von (empty) 4 NULL
+
+# test insert projection with cast expression
+onlyif sqlrs_v2
+statement ok
+create table t2(v1 tinyint);
+insert into t2(v1) values (1), (5);
+
+onlyif sqlrs_v2
+statement ok
+create table t1(v1 int, v2 int, v3 int);
+insert into t1(v3, v2, v1) values (0, 4, 1), (1, 5, 2);
+
+
+onlyif sqlrs_v2
+query III
+select t1.v1, v2 from t1;
+----
+1 4
+2 5
+
+
+onlyif sqlrs_v2
+query III
+select *, t1.* from t1;
+----
+1 4 0 1 4 0
+2 5 1 2 5 1
+
+
+# TODO: use alias function to verify output column names
+onlyif sqlrs_v2
+query III
+select t.v1 as a, v2 as b from t1 as t;
+----
+1 4
+2 5
+
+
+onlyif sqlrs_v2
+query III
+select 1, 2.3, '😇', true, null;
+----
+1 2.3 😇 true NULL

tests/slt/csv/state2.csv

@@ -9,7 +9,7 @@ sqllogictest = "0.6"
 glob = "0.3"
 async-trait = "0.1"
 libtest-mimic = "0.6"
-
+anyhow = { version = "1.0.71", features = ["std"] }
 [[test]]
 name = "sqllogictest"
 harness = false

tests/slt/insert_table.slt

@@ -1,10 +1,10 @@
-
+#![feature(iterator_try_collect)]
 use std::sync::Arc;
 
 use sqllogictest::{AsyncDB, Runner};
 use kip_sql::db::{Database,DatabaseError};
 use kip_sql::util::record_batch_to_string;
-fn init_tables(){
+pub fn test_run(sqlfile: &str){
 
     let db = Arc::new( Database::new_on_mem());
     let mut tester = Runner::new(DatabaseWrapper {db});
@@ -32,8 +32,9 @@ struct DatabaseWrapper {
 impl AsyncDB for DatabaseWrapper {
     type Error = DatabaseError;
     async fn run(&mut self, sql: &str) -> Result<String, Self::Error> {
-        let chunks = self.db.run(sql).await?;
+        let chunks = self.db.run(sql).await.unwrap();
         let output = chunks.iter().map(record_batch_to_string).try_collect();
         Ok(output?)
     }
+    
 }

tests/slt/select.slt

@@ -0,0 +1,35 @@
+use std::path::Path;
+
+use libtest_mimic::{Arguments, Trial};
+use sqllogictest_test::{test_run};
+
+fn main() {
+    let path = Path::new(env!("CARGO_MANIFEST_DIR")).join("..").join("..");
+    std::env::set_current_dir(path).unwrap();
+
+    const SLT_PATTERN: &str = "tests/slt/**/*.slt";
+
+    let args = Arguments::from_args();
+    let mut tests = vec![];
+
+    let slt_files = glob::glob(SLT_PATTERN).expect("failed to find slt files");
+    for slt_file in slt_files {
+        let filepath = slt_file.expect("failed to read slt file");
+        let filename = filepath
+            .file_stem()
+            .expect("failed to get file name")
+            .to_str()
+            .unwrap()
+            .to_string();
+        let filepath = filepath.to_str().unwrap().to_string();
+
+        let test = Trial::test(filename, move || {
+            test_run(filepath.as_str());
+            Ok(())
+        });
+
+        tests.push(test);
+    }
+
+    libtest_mimic::run(&args, tests).exit();
+}