Check CREATE TABLE STRICT with missing or unknown datatype

gwenn · Jan 7, 2024 · 7f31aac · 7f31aac
1 parent d45d03e
commit 7f31aac
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 6 deletions.
diff --git a/src/lexer/sql/test.rs b/src/lexer/sql/test.rs
@@ -177,3 +177,25 @@ fn create_table_without_rowid_missing_pk() {
         panic!("unexpected error type")
     };
 }
+
+#[test]
+fn create_table_strict_missing_datatype() {
+    let mut parser = Parser::new(b"CREATE TABLE tbl (c1) STRICT");
+    let r = parser.next();
+    if let Error::ParserError(ParserError::Custom(ref msg), _) = r.unwrap_err() {
+        assert_eq!(msg, "missing datatype for tbl.c1");
+    } else {
+        panic!("unexpected error type")
+    };
+}
+
+#[test]
+fn create_table_strict_unknown_datatype() {
+    let mut parser = Parser::new(b"CREATE TABLE tbl (c1 BOOL) STRICT");
+    let r = parser.next();
+    if let Error::ParserError(ParserError::Custom(ref msg), _) = r.unwrap_err() {
+        assert_eq!(msg, "unknown datatype for tbl.c1: \"BOOL\"");
+    } else {
+        panic!("unexpected error type")
+    };
+}
diff --git a/src/parser/ast/check.rs b/src/parser/ast/check.rs
@@ -148,15 +148,25 @@ impl CreateTableBody {
             // TODO columns.constraints : check no duplicate names
             // TODO constraints: check no duplicated names, use only valid column names
             if options.contains(TableOptions::STRICT) {
-                // TODO check columns type
-                // Every column definition must specify a datatype for that column. The freedom to specify a column without a datatype is removed.
-                // The datatype must be one of following: INT INTEGER REAL TEXT BLOB ANY
                 for c in columns {
                     match &c.col_type {
-                        Some(Type { name, .. })
-                            if name.eq_ignore_ascii_case("INT")
-                                || name.eq_ignore_ascii_case("INTEGER") => {}
+                        Some(Type { name, .. }) => {
+                            // The datatype must be one of following: INT INTEGER REAL TEXT BLOB ANY
+                            if !(name.eq_ignore_ascii_case("INT")
+                                || name.eq_ignore_ascii_case("INTEGER")
+                                || name.eq_ignore_ascii_case("REAL")
+                                || name.eq_ignore_ascii_case("TEXT")
+                                || name.eq_ignore_ascii_case("BLOB")
+                                || name.eq_ignore_ascii_case("ANY"))
+                            {
+                                return Err(ParserError::Custom(format!(
+                                    "unknown datatype for {}.{}: \"{}\"",
+                                    tbl_name, c.col_name, name
+                                )));
+                            }
+                        }
                         _ => {
+                            // Every column definition must specify a datatype for that column. The freedom to specify a column without a datatype is removed.
                             return Err(ParserError::Custom(format!(
                                 "missing datatype for {}.{}",
                                 tbl_name, c.col_name