Fix AS query clause should be after the create table options (apache#1339)

Author: git-hulk

src/ast/dml.rs

@@ -418,9 +418,6 @@ impl Display for CreateTable {
             write!(f, " WITH TAG ({})", display_comma_separated(tag.as_slice()))?;
         }
 
-        if let Some(query) = &self.query {
-            write!(f, " AS {query}")?;
-        }
         if let Some(default_charset) = &self.default_charset {
             write!(f, " DEFAULT CHARSET={default_charset}")?;
         }
@@ -440,6 +437,9 @@ impl Display for CreateTable {
         if self.strict {
             write!(f, " STRICT")?;
         }
+        if let Some(query) = &self.query {
+            write!(f, " AS {query}")?;
+        }
         Ok(())
     }
 }

src/parser/mod.rs

@@ -5432,13 +5432,6 @@ impl<'a> Parser<'a> {
 
         let create_table_config = self.parse_optional_create_table_config()?;
 
-        // Parse optional `AS ( query )`
-        let query = if self.parse_keyword(Keyword::AS) {
-            Some(self.parse_boxed_query()?)
-        } else {
-            None
-        };
-
         let default_charset = if self.parse_keywords(&[Keyword::DEFAULT, Keyword::CHARSET]) {
             self.expect_token(&Token::Eq)?;
             let next_token = self.next_token();
@@ -5491,6 +5484,13 @@ impl<'a> Parser<'a> {
             None
         };
 
+        // Parse optional `AS ( query )`
+        let query = if self.parse_keyword(Keyword::AS) {
+            Some(self.parse_boxed_query()?)
+        } else {
+            None
+        };
+
         Ok(CreateTableBuilder::new(table_name)
             .temporary(temporary)
             .columns(columns)

tests/sqlparser_clickhouse.rs

@@ -802,6 +802,30 @@ fn test_query_with_format_clause() {
     }
 }
 
+#[test]
+fn parse_create_table_on_commit_and_as_query() {
+    let sql = r#"CREATE LOCAL TEMPORARY TABLE test ON COMMIT PRESERVE ROWS AS SELECT 1"#;
+    match clickhouse_and_generic().verified_stmt(sql) {
+        Statement::CreateTable(CreateTable {
+            name,
+            on_commit,
+            query,
+            ..
+        }) => {
+            assert_eq!(name.to_string(), "test");
+            assert_eq!(on_commit, Some(OnCommit::PreserveRows));
+            assert_eq!(
+                query.unwrap().body.as_select().unwrap().projection,
+                vec![UnnamedExpr(Expr::Value(Value::Number(
+                    "1".parse().unwrap(),
+                    false
+                )))]
+            );
+        }
+        _ => unreachable!(),
+    }
+}
+
 fn clickhouse() -> TestedDialects {
     TestedDialects {
         dialects: vec![Box::new(ClickHouseDialect {})],

tests/sqlparser_mysql.rs

@@ -812,6 +812,33 @@ fn parse_create_table_collate() {
     }
 }
 
+#[test]
+fn parse_create_table_both_options_and_as_query() {
+    let sql = "CREATE TABLE foo (id INT(11)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb4_0900_ai_ci AS SELECT 1";
+    match mysql_and_generic().verified_stmt(sql) {
+        Statement::CreateTable(CreateTable {
+            name,
+            collation,
+            query,
+            ..
+        }) => {
+            assert_eq!(name.to_string(), "foo");
+            assert_eq!(collation, Some("utf8mb4_0900_ai_ci".to_string()));
+            assert_eq!(
+                query.unwrap().body.as_select().unwrap().projection,
+                vec![SelectItem::UnnamedExpr(Expr::Value(number("1")))]
+            );
+        }
+        _ => unreachable!(),
+    }
+
+    let sql = r"CREATE TABLE foo (id INT(11)) ENGINE=InnoDB AS SELECT 1 DEFAULT CHARSET=utf8mb3";
+    assert!(matches!(
+        mysql_and_generic().parse_sql_statements(sql),
+        Err(ParserError::ParserError(_))
+    ));
+}
+
 #[test]
 fn parse_create_table_comment_character_set() {
     let sql = "CREATE TABLE foo (s TEXT CHARACTER SET utf8mb4 COMMENT 'comment')";