test - optimize test cases

Author: GE-fighting

tests/slt/create_table.slt

@@ -1,37 +1,38 @@
-onlyif sqlrs_v2
 statement ok
 create table t1(v1 varchar, v2 varchar, v3 varchar);
-insert into t1 values('a', 'b', 'c');
 
+statement ok
+insert into t1 values('a', 'b', 'c');
 
-onlyif sqlrs_v2
 statement error
 create table t1(v1 int);
 
 
-onlyif sqlrs_v2
 statement ok
 create table t2(v1 boolean, v2 tinyint, v3 smallint, v4 int, v5 bigint, v6 float, v7 double, v8 varchar);
+
+statement ok
 insert into t2 values(true, 1, 2, 3, 4, 5.1, 6.2, '7');
 
 
-onlyif sqlrs_v2
 statement ok
 create table t3(v1 boolean, v2 tinyint unsigned, v3 smallint unsigned, v4 int unsigned, v5 bigint unsigned, v6 float, v7 double, v8 varchar);
+
+statement ok
 insert into t3 values(true, 1, 2, 3, 4, 5.1, 6.2, '7');
 
 
-onlyif sqlrs_v2
 statement ok
 create table t4(v1 int);
+
+statement ok
 select v1 from t4;
 
 
-onlyif sqlrs_v2
 statement ok
 create table read_csv_table as select * from read_csv('tests/csv/t2.csv');
 
-onlyif sqlrs_v2
+
 query I
 select a from read_csv_table limit 1;
 ----

tests/slt/insert_table.slt

@@ -1,21 +1,21 @@
 # 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;
 ----
@@ -25,15 +25,15 @@ NULL 1 5
 
 
 # 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;
 ----
@@ -42,29 +42,29 @@ select v3, v2, v1 from t2;
 
 
 # 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;
 ----
@@ -74,16 +74,18 @@ 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;
+
+statement ok
 INSERT INTO integers SELECT null;
 
-onlyif sqlrs_v2
+
 query I
 SELECT * FROM integers
 ----

tests/slt/select.slt

@@ -1,33 +1,28 @@
-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);
+
+statement ok
 insert into t2(v1) values (1), (5);
 
-onlyif sqlrs_v2
+
 statement ok
 create table t1(v1 int, v2 int, v3 int);
+
+statement ok
 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;
 ----
@@ -36,15 +31,15 @@ select *, t1.* from t1;
 
 
 # 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;
 ----

tests/sqllogictest/src/lib.rs

@@ -9,19 +9,6 @@ pub fn test_run(sqlfile: &str){
     let db = Arc::new( Database::new_on_mem());
     let mut tester = Runner::new(DatabaseWrapper {db});
     tester.run_file(sqlfile).unwrap()
-    // tokio_test::block_on(async move {
-    //     let _ = database.run("create table t1 (a int, b boolean)").await?;
-    //     let _ = database.run("insert into t1 values (1, true), (2, false)").await?;
-    //     let vec_batch = database.run("select * from t1").await?;
-
-    //     let table = database.storage
-    //         .get_catalog()
-    //         .get_table(0).unwrap().clone();
-    //     println!("{:#?}", concat_batches(&table.schema(), &vec_batch));
-
-    //     Ok(())
-    // })
-
 }
 
 struct DatabaseWrapper {