databricks: TBLPROPERTIES after COMMENT

Author: lustefaniak

src/parser/mod.rs

@@ -4031,7 +4031,7 @@ impl<'a> Parser<'a> {
         // PostgreSQL supports `WITH ( options )`, before `AS`
         let with_options = self.parse_options(Keyword::WITH)?;
 
-        let table_properties = self.parse_options(Keyword::TBLPROPERTIES)?;
+        let mut table_properties = self.parse_options(Keyword::TBLPROPERTIES)?;
 
         let engine = if self.parse_keyword(Keyword::ENGINE) {
             self.expect_token(&Token::Eq)?;
@@ -4194,6 +4194,9 @@ impl<'a> Parser<'a> {
         let strict = self.parse_keyword(Keyword::STRICT);
 
         let table_options = self.parse_options(Keyword::OPTIONS)?;
+        //Databricks has TBLPROPERTIES after COMMENT
+        let _table_properties = self.parse_options(Keyword::TBLPROPERTIES)?;
+        table_properties.extend(_table_properties);
 
         Ok(CreateTableBuilder::new(table_name)
             .temporary(temporary)

tests/sqlparser_databricks.rs

@@ -78,3 +78,10 @@ fn test_rlike() {
     let sql = r#"SELECT R'%SystemDrive%\Users\John' RLIKE R'%SystemDrive%\\Users.*'"#;
     databricks_unescaped().verified_stmt(sql);
 }
+
+#[test]
+fn test_create_table_comment_tblproperties() {
+    let sql = "CREATE TABLE main.dbt_cloud_lukasz.customers (customer_id BIGINT COMMENT 'Customer Unique identifier', first_name STRING, last_name STRING) USING delta TBLPROPERTIES ('delta.checkpoint.writeStatsAsJson' = 'false') COMMENT 'The ''customers'' table.'";
+
+    databricks_unescaped().verified_stmt(sql);
+}