fix(main): Add condition to skip empty user input. import data before looping (#52)

* fix(main): Add condition to skip empty user input. import data before loop

* fix(bug): thiserror

* fix: cannot be compiled on linux

---------

Co-authored-by: Kould <2435992353@qq.com>

Author: loloxwg

.github/workflows/ci.yml

@@ -1,47 +1,28 @@
-name: CI
+name: Rust
 
 on:
   push:
+    branches: [main]
   pull_request:
+    branches: [main]
 
 env:
   CARGO_TERM_COLOR: always
 
 jobs:
-  fmt:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          components: rustfmt, clippy
-      - uses: actions/cache@v3
-        with:
-          path: |
-            ~/.cargo/registry/index/
-            ~/.cargo/registry/cache/
-            ~/.cargo/git/db/
-          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
-      - name: Check code format
-        run: cargo fmt --all -- --check
+  build:
 
-
-
-  test:
     runs-on: ubuntu-latest
+
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions-rs/toolchain@v1
+      - uses: actions/checkout@v2
+      - name: Setup Rust
+        uses: actions-rs/toolchain@v1
         with:
-          profile: minimal
-      - uses: actions/cache@v3
+          toolchain: nightly-2023-04-07
+          override: true
+
+      - name: Run tests
+        uses: actions-rs/cargo@v1
         with:
-          path: |
-            ~/.cargo/registry/index/
-            ~/.cargo/registry/cache/
-            ~/.cargo/git/db/
-          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
-      - uses: taiki-e/install-action@nextest
-      - name: Test
-        run: cargo nextest run --no-fail-fast --all-features
+          command: test

Cargo.toml

@@ -13,7 +13,6 @@ sqlparser = "0.34.0"
 thiserror = "1"
 parking_lot = "0.12.1"
 itertools = "0.10"
-sqllogictest = "0.11.1"
 tracing = "0.1.37"
 chrono = "0.4.26"
 tokio = { version = "1.28.2", features = ["full"] }

src/db.rs

@@ -36,6 +36,10 @@ impl Database {
     pub async fn run(&self, sql: &str) -> Result<Vec<Tuple>, DatabaseError> {
         // parse
         let stmts = parse_sql(sql)?;
+        if stmts.is_empty() {
+            return Ok(vec![]);
+        }
+
         // bind
         let catalog = self.storage.get_catalog();
 
@@ -121,7 +125,6 @@ pub enum DatabaseError {
     StorageError(
         #[source]
         #[from]
-        #[backtrace]
         StorageError,
     ),
     #[error("mapping error: {0}")]

src/main.rs

@@ -41,22 +41,26 @@ async fn main() -> Result<(), Box<dyn Error>> {
 
 async fn server_run() -> Result<(), Box<dyn Error>> {
     let db = Database::new_on_mem();
+    let _ = db.run("create table t1 (a int, b int)").await?;
+    let _ = db.run("create table t2 (c int, d int null)").await?;
+    let _ = db.run("insert into t1 (a, b) values (1, 1), (5, 3), (5, 2)").await?;
+    let _ = db.run("insert into t2 (d, c) values (2, 1), (3, 1), (null, 6)").await?;
+
     loop {
         println!("> type👇 plz");
         let mut input = String::new();
         io::stdin().read_line(&mut input)?;
-
-        if input.to_lowercase()[..4].eq("quit") {
+        if input.to_lowercase().eq("quit\n") {
             println!("{}", BLOOM);
             break
         }
 
         match db.run(&input).await {
             Ok(tuples) => {
                 if tuples.is_empty() {
-                    println!("\nEmpty!");
+                    println!("\nEmpty\n");
                 } else {
-                    println!("\n{}", create_table(&tuples));
+                    println!("\n{}\n", create_table(&tuples));
                 }
             }
             Err(err) => {