Merge branch 'main' into feature/uint_data_type

gluesql · panarch · Apr 6, 2023 · Nov 26, 2022 · Nov 26, 2022 · Nov 26, 2022
commit 7387c3103d08bd1a9585a1ec91c2278d001b243f
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -120,6 +120,4 @@ jobs:
           cd ../../../
           cd storages/web-storage
           wasm-pack test --headless --firefox
-          cd ../idb-storage
-          WASM_BINDGEN_TEST_TIMEOUT=60 wasm-pack test --headless --firefox
           cd ../../
diff --git a/Cargo.toml b/Cargo.toml
@@ -22,10 +22,3 @@ default-members = [
 # enable this only for gluesql-js build
 # [profile.release]
 # opt-level = "s"
-
-[workspace.package]
-edition = "2021"
-description = "GlueSQL - Open source SQL database engine fully written in Rust with pure functional execution layer, easily swappable storage and web assembly support!"
-license = "Apache-2.0"
-repository = "https://github.com/gluesql/gluesql"
-documentation = "https://docs.rs/gluesql/"
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
 name = "gluesql-cli"
 version = "0.13.1"
+edition = "2021"
 authors = ["Taehoon Moon <taehoon.moon@outlook.com>"]
-edition.workspace = true
-description.workspace = true
-license.workspace = true
-repository.workspace = true
-documentation.workspace = true
+description = "GlueSQL - Open source SQL database engine fully written in Rust with pure functional execution layer, easily swappable storage and web assembly support!"
+license = "Apache-2.0"
+repository = "https://github.com/gluesql/gluesql"
+documentation = "https://docs.rs/gluesql/"
 
 [dependencies]
 gluesql-core = { path = "../core", version = "0.13.1", features = ["alter-table"] }

diff --git a/cli/src/lib.rs b/cli/src/lib.rs
@@ -44,8 +44,8 @@ pub fn run() -> Result<()> {
         let path = path.as_path().to_str().expect("wrong path");
 
         if let Some(dump_path) = args.dump {
-            let mut storage = SledStorage::new(path).expect("failed to load sled-storage");
-            dump_database(&mut storage, dump_path)?;
+            let storage = SledStorage::new(path).expect("failed to load sled-storage");
+            dump_database(storage, dump_path)?;
 
             return Ok::<_, Error>(());
         }
@@ -78,11 +78,11 @@ pub fn run() -> Result<()> {
     Ok(())
 }
 
-pub fn dump_database(storage: &mut SledStorage, dump_path: PathBuf) -> Result<()> {
+pub fn dump_database(storage: SledStorage, dump_path: PathBuf) -> Result<SledStorage> {
     let file = File::create(dump_path)?;
 
     block_on(async {
-        storage.begin(true).await?;
+        let (storage, _) = storage.begin(true).await.map_err(|(_, error)| error)?;
         let schemas = storage.fetch_all_schemas().await?;
         for schema in schemas {
             writeln!(&file, "{}", schema.clone().to_ddl())?;
@@ -128,6 +128,6 @@ pub fn dump_database(storage: &mut SledStorage, dump_path: PathBuf) -> Result<()
             writeln!(&file)?;
         }
 
-        Ok(())
+        Ok(storage)
     })
 }
diff --git a/cli/tests/dump.rs b/cli/tests/dump.rs
@@ -25,7 +25,6 @@ async fn dump_and_import() {
             uinti8 UINT8,
             text TEXT,
             bytea BYTEA,
-            inet INET,
             date DATE,
             timestamp TIMESTAMP,
             time TIME,
@@ -45,7 +44,6 @@ async fn dump_and_import() {
          6,
          'a',
          X'123456',
-         '::1',
          DATE '2022-11-01',
          TIMESTAMP '2022-11-02',
          TIME '23:59:59',
@@ -68,7 +66,7 @@ async fn dump_and_import() {
         source_glue.execute(sql).unwrap();
     }
 
-    dump_database(&mut source_glue.storage, dump_path.clone()).unwrap();
+    let source_storage = dump_database(source_glue.storage.unwrap(), dump_path.clone()).unwrap();
 
     let data_path = "tmp/target";
     let config = sled::Config::default().path(data_path).temporary(true);
@@ -85,6 +83,8 @@ async fn dump_and_import() {
         target_glue.execute(sql).unwrap();
     }
 
+    let mut source_glue = Glue::new(source_storage);
+
     // schemas should be identical
     let sql = "SELECT OBJECT_TYPE, OBJECT_NAME FROM GLUE_OBJECTS";
     let source_data = source_glue.execute(sql).unwrap();

diff --git a/core/Cargo.toml b/core/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
 name = "gluesql-core"
 version = "0.13.1"
+edition = "2021"
 authors = ["Taehoon Moon <taehoon.moon@outlook.com>"]
-edition.workspace = true
-description.workspace = true
-license.workspace = true
-repository.workspace = true
-documentation.workspace = true
+description = "GlueSQL - Open source SQL database engine fully written in Rust with pure functional execution layer, easily swappable storage and web assembly support!"
+license = "Apache-2.0"
+repository = "https://github.com/gluesql/gluesql"
+documentation = "https://docs.rs/gluesql/"
 
 [dependencies]
 utils = { package = "gluesql-utils", path = "../utils", version = "0.13.0" }
@@ -29,7 +29,6 @@ thiserror = "1.0"
 strum_macros = "0.24"
 bigdecimal = { version = "0.3", features = ["serde", "string-only"] }
 hex = "0.4"
-rand = "0.8"
 
 [target.'cfg(target_arch = "wasm32")'.dependencies.uuid]
 version = "1"

diff --git a/core/src/ast/data_type.rs b/core/src/ast/data_type.rs
@@ -20,7 +20,6 @@ pub enum DataType {
     Float,
     Text,
     Bytea,
-    Inet,
     Date,
     Timestamp,
     Time,

diff --git a/core/src/ast/function.rs b/core/src/ast/function.rs
@@ -46,7 +46,6 @@ pub enum Function {
         expr: Expr,
         then: Expr,
     },
-    Rand(Option<Expr>),
     Round(Expr),
     Floor(Expr),
     Trim {
@@ -196,10 +195,6 @@ impl ToSql for Function {
             Function::IfNull { expr, then } => {
                 format!("IFNULL({}, {})", expr.to_sql(), then.to_sql())
             }
-            Function::Rand(e) => match e {
-                Some(v) => format!("RAND({})", v.to_sql()),
-                None => "RAND()".to_owned(),
-            },
             Function::Round(e) => format!("ROUND({})", e.to_sql()),
             Function::Floor(e) => format!("FLOOR({})", e.to_sql()),
             Function::Trim {
@@ -501,19 +496,6 @@ mod tests {
             .to_sql()
         );
 
-        assert_eq!(
-            "RAND()",
-            &Expr::Function(Box::new(Function::Rand(None))).to_sql()
-        );
-
-        assert_eq!(
-            "RAND(num)",
-            &Expr::Function(Box::new(Function::Rand(Some(Expr::Identifier(
-                "num".to_owned()
-            )))))
-            .to_sql()
-        );
-
         assert_eq!(
             "ROUND(num)",
             &Expr::Function(Box::new(Function::Round(Expr::Identifier(

diff --git a/core/src/ast/mod.rs b/core/src/ast/mod.rs
@@ -60,9 +60,8 @@ pub enum Statement {
         /// Table name
         name: String,
         /// Optional schema
-        columns: Option<Vec<ColumnDef>>,
+        columns: Vec<ColumnDef>,
         source: Option<Box<Query>>,
-        engine: Option<String>,
     },
     /// ALTER TABLE
     #[cfg(feature = "alter-table")]
@@ -168,42 +167,27 @@ impl ToSql for Statement {
                 name,
                 columns,
                 source,
-                engine,
-            } => {
-                let if_not_exists = if_not_exists.then_some("IF NOT EXISTS");
-                let body = match source {
-                    Some(query) => Some(format!("AS {}", query.to_sql())),
-                    None if columns.is_none() => None,
-                    None => {
-                        let columns = columns
-                            .as_ref()
-                            .map(|columns| {
-                                columns
-                                    .iter()
-                                    .map(ToSql::to_sql)
-                                    .collect::<Vec<_>>()
-                                    .join(", ")
-                            })
-                            .unwrap_or_else(|| "".to_owned());
-
-                        Some(format!("({columns})"))
+            } => match source {
+                Some(query) => match if_not_exists {
+                    true => format!("CREATE TABLE IF NOT EXISTS {name} AS {};", query.to_sql()),
+                    false => format!("CREATE TABLE {name} AS {};", query.to_sql()),
+                },
+                None if columns.is_empty() => match if_not_exists {
+                    true => format!("CREATE TABLE IF NOT EXISTS {name};"),
+                    false => format!("CREATE TABLE {name};"),
+                },
+                None => {
+                    let columns = columns
+                        .iter()
+                        .map(ToSql::to_sql)
+                        .collect::<Vec<_>>()
+                        .join(", ");
+                    match if_not_exists {
+                        true => format!("CREATE TABLE IF NOT EXISTS {name} ({columns});"),
+                        false => format!("CREATE TABLE {name} ({columns});"),
                     }
-                };
-                let engine = engine.as_ref().map(|engine| format!("ENGINE = {engine}"));
-                let sql = vec![
-                    Some("CREATE TABLE"),
-                    if_not_exists,
-                    Some(name),
-                    body.as_deref(),
-                    engine.as_deref(),
-                ]
-                .into_iter()
-                .flatten()
-                .collect::<Vec<&str>>()
-                .join(" ");
-
-                format!("{sql};")
-            }
+                }
+            },
             #[cfg(feature = "alter-table")]
             Statement::AlterTable { name, operation } => {
                 format!("ALTER TABLE {name} {};", operation.to_sql())
@@ -375,9 +359,8 @@ mod tests {
             Statement::CreateTable {
                 if_not_exists: true,
                 name: "Foo".into(),
-                columns: None,
+                columns: Vec::new(),
                 source: None,
-                engine: None,
             }
             .to_sql()
         );
@@ -387,9 +370,8 @@ mod tests {
             Statement::CreateTable {
                 if_not_exists: false,
                 name: "Foo".into(),
-                columns: None,
+                columns: Vec::new(),
                 source: None,
-                engine: None,
             }
             .to_sql()
         );
@@ -399,15 +381,14 @@ mod tests {
             Statement::CreateTable {
                 if_not_exists: true,
                 name: "Foo".into(),
-                columns: Some(vec![ColumnDef {
+                columns: vec![ColumnDef {
                     name: "id".to_owned(),
                     data_type: DataType::Boolean,
                     nullable: false,
                     default: None,
                     unique: None,
-                },]),
+                },],
                 source: None,
-                engine: None,
             }
             .to_sql()
         );
@@ -417,7 +398,7 @@ mod tests {
             Statement::CreateTable {
                 if_not_exists: false,
                 name: "Foo".into(),
-                columns: Some(vec![
+                columns: vec![
                     ColumnDef {
                         name: "id".to_owned(),
                         data_type: DataType::Int,
@@ -439,9 +420,8 @@ mod tests {
                         default: None,
                         unique: None,
                     }
-                ]),
-                source: None,
-                engine: None,
+                ],
+                source: None
             }
             .to_sql()
         );
@@ -454,7 +434,7 @@ mod tests {
             Statement::CreateTable {
                 if_not_exists: false,
                 name: "Foo".into(),
-                columns: None,
+                columns: vec![],
                 source: Some(Box::new(Query {
                     body: SetExpr::Select(Box::new(Select {
                         projection: vec![
@@ -482,8 +462,7 @@ mod tests {
                     order_by: vec![],
                     limit: None,
                     offset: None
-                })),
-                engine: None,
+                }))
             }
             .to_sql()
         );
@@ -493,49 +472,15 @@ mod tests {
             Statement::CreateTable {
                 if_not_exists: true,
                 name: "Foo".into(),
-                columns: None,
+                columns: vec![],
                 source: Some(Box::new(Query {
                     body: SetExpr::Values(Values(vec![vec![Expr::Literal(AstLiteral::Boolean(
                         true
                     ))]])),
                     order_by: vec![],
                     limit: None,
                     offset: None
-                })),
-                engine: None,
-            }
-            .to_sql()
-        );
-    }
-
-    #[test]
-    fn to_sql_create_table_with_engine() {
-        assert_eq!(
-            "CREATE TABLE Foo ENGINE = MEMORY;",
-            Statement::CreateTable {
-                if_not_exists: false,
-                name: "Foo".into(),
-                columns: None,
-                source: None,
-                engine: Some("MEMORY".to_owned()),
-            }
-            .to_sql()
-        );
-
-        assert_eq!(
-            "CREATE TABLE Foo (id BOOLEAN NOT NULL) ENGINE = SLED;",
-            Statement::CreateTable {
-                if_not_exists: false,
-                name: "Foo".into(),
-                columns: Some(vec![ColumnDef {
-                    name: "id".to_owned(),
-                    data_type: DataType::Boolean,
-                    nullable: false,
-                    default: None,
-                    unique: None,
-                },]),
-                source: None,
-                engine: Some("SLED".to_owned()),
+                }))
             }
             .to_sql()
         );
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,7 +20,6 @@ pub enum DataType { @@
         Float,
         Text,
         Bytea,
-        Inet,
         Date,
         Timestamp,
         Time,
@@ Expand Down @@