update parse STRICT tables (apache#903)

Co-authored-by: Andrew Lamb <[email protected]>

Author: 2 people

src/ast/helpers/stmt_create_table.rs

@@ -70,6 +70,7 @@ pub struct CreateTableBuilder {
     pub on_commit: Option<OnCommit>,
     pub on_cluster: Option<String>,
     pub order_by: Option<Vec<Ident>>,
+    pub strict: bool,
 }
 
 impl CreateTableBuilder {
@@ -100,6 +101,7 @@ impl CreateTableBuilder {
             on_commit: None,
             on_cluster: None,
             order_by: None,
+            strict: false,
         }
     }
     pub fn or_replace(mut self, or_replace: bool) -> Self {
@@ -220,6 +222,11 @@ impl CreateTableBuilder {
         self
     }
 
+    pub fn strict(mut self, strict: bool) -> Self {
+        self.strict = strict;
+        self
+    }
+
     pub fn build(self) -> Statement {
         Statement::CreateTable {
             or_replace: self.or_replace,
@@ -247,6 +254,7 @@ impl CreateTableBuilder {
             on_commit: self.on_commit,
             on_cluster: self.on_cluster,
             order_by: self.order_by,
+            strict: self.strict,
         }
     }
 }
@@ -284,6 +292,7 @@ impl TryFrom<Statement> for CreateTableBuilder {
                 on_commit,
                 on_cluster,
                 order_by,
+                strict,
             } => Ok(Self {
                 or_replace,
                 temporary,
@@ -310,6 +319,7 @@ impl TryFrom<Statement> for CreateTableBuilder {
                 on_commit,
                 on_cluster,
                 order_by,
+                strict,
             }),
             _ => Err(ParserError::ParserError(format!(
                 "Expected create table statement, but received: {stmt}"

src/ast/mod.rs

@@ -1412,6 +1412,10 @@ pub enum Statement {
         /// than empty (represented as ()), the latter meaning "no sorting".
         /// <https://clickhouse.com/docs/en/sql-reference/statements/create/table/>
         order_by: Option<Vec<Ident>>,
+        /// SQLite "STRICT" clause.
+        /// if the "STRICT" table-option keyword is added to the end, after the closing ")",
+        /// then strict typing rules apply to that table.
+        strict: bool,
     },
     /// SQLite's `CREATE VIRTUAL TABLE .. USING <module_name> (<module_args>)`
     CreateVirtualTable {
@@ -2409,6 +2413,7 @@ impl fmt::Display for Statement {
                 on_commit,
                 on_cluster,
                 order_by,
+                strict,
             } => {
                 // We want to allow the following options
                 // Empty column list, allowed by PostgreSQL:
@@ -2577,7 +2582,9 @@ impl fmt::Display for Statement {
                     };
                     write!(f, " {on_commit}")?;
                 }
-
+                if *strict {
+                    write!(f, " STRICT")?;
+                }
                 Ok(())
             }
             Statement::CreateVirtualTable {

src/keywords.rs

@@ -563,6 +563,7 @@ define_keywords!(
     STDOUT,
     STORAGE_INTEGRATION,
     STORED,
+    STRICT,
     STRING,
     SUBMULTISET,
     SUBSTRING,

src/parser.rs

@@ -3521,6 +3521,7 @@ impl<'a> Parser<'a> {
                 None
             };
 
+        let strict = self.parse_keyword(Keyword::STRICT);
         Ok(CreateTableBuilder::new(table_name)
             .temporary(temporary)
             .columns(columns)
@@ -3543,6 +3544,7 @@ impl<'a> Parser<'a> {
             .collation(collation)
             .on_commit(on_commit)
             .on_cluster(on_cluster)
+            .strict(strict)
             .build())
     }
 

tests/sqlparser_sqlite.rs

@@ -242,6 +242,15 @@ fn parse_similar_to() {
     chk(true);
 }
 
+#[test]
+fn parse_create_table_with_strict() {
+    let sql = "CREATE TABLE Fruits (id TEXT NOT NULL PRIMARY KEY) STRICT";
+    if let Statement::CreateTable { name, strict, .. } = sqlite().verified_stmt(sql) {
+        assert_eq!(name.to_string(), "Fruits");
+        assert!(strict);
+    }
+}
+
 fn sqlite() -> TestedDialects {
     TestedDialects {
         dialects: vec![Box::new(SQLiteDialect {})],