MySQL: Support comma-separated CREATE TABLE options

In [MySQL], options for `CREATE TABLE` following the body can be
optionally separated by commas. I'm not aware of any cases where this
affects parsing (e.g. eliminating ambiguity or anything), so we just
optionally eat comma tokens after each option is parsed.

[MySQL]: https://dev.mysql.com/doc/refman/8.4/en/create-table.html

Author: mvzink

src/dialect/generic.rs

@@ -187,4 +187,8 @@ impl Dialect for GenericDialect {
     fn supports_data_type_signed_suffix(&self) -> bool {
         true
     }
+
+    fn supports_comma_separated_create_table_options(&self) -> bool {
+        true
+    }
 }

src/dialect/mod.rs

@@ -590,7 +590,7 @@ pub trait Dialect: Debug + Any {
         false
     }
 
-    /// Returne true if the dialect supports specifying multiple options
+    /// Return true if the dialect supports specifying multiple options
     /// in a `CREATE TABLE` statement for the structure of the new table. For example:
     /// `CREATE TABLE t (a INT, b INT) AS SELECT 1 AS b, 2 AS a`
     fn supports_create_table_multi_schema_info_sources(&self) -> bool {
@@ -1148,6 +1148,21 @@ pub trait Dialect: Debug + Any {
     fn supports_data_type_signed_suffix(&self) -> bool {
         false
     }
+
+    /// Returns true if this dialect allows table-level options for `CREATE TABLE` to be comma
+    /// separated, as does [MySQL].
+    ///
+    /// Example:
+    /// ```sql
+    /// CREATE TABLE t (x INT) ENGINE=InnoDB, AUTO_INCREMENT=100;
+    /// -- equivalent to:
+    /// CREATE TABLE t (x INT) ENGINE=InnoDB AUTO_INCREMENT=100;
+    /// ```
+    ///
+    /// [MySQL]: https://dev.mysql.com/doc/refman/8.4/en/create-table.html
+    fn supports_comma_separated_create_table_options(&self) -> bool {
+        false
+    }
 }
 
 /// This represents the operators for which precedence must be defined

src/dialect/mysql.rs

@@ -158,6 +158,10 @@ impl Dialect for MySqlDialect {
     fn supports_data_type_signed_suffix(&self) -> bool {
         true
     }
+
+    fn supports_comma_separated_create_table_options(&self) -> bool {
+        true
+    }
 }
 
 /// `LOCK TABLES`

src/parser/mod.rs

@@ -7708,6 +7708,9 @@ impl<'a> Parser<'a> {
 
         while let Some(option) = self.parse_plain_option()? {
             options.push(option);
+            if self.dialect.supports_comma_separated_create_table_options() {
+                let _ = self.consume_token(&Token::Comma);
+            }
         }
 
         Ok(options)

tests/sqlparser_mysql.rs

@@ -1361,6 +1361,13 @@ fn parse_create_table_gencol() {
     mysql_and_generic().verified_stmt("CREATE TABLE t1 (a INT, b INT AS (a * 2) STORED)");
 }
 
+#[test]
+fn parse_create_table_options_comma_separated() {
+    let sql = "CREATE TABLE t (x INT) DEFAULT CHARSET = utf8mb4, ENGINE = InnoDB , AUTO_INCREMENT 1 DATA DIRECTORY '/var/lib/mysql/data'";
+    let canonical = "CREATE TABLE t (x INT) DEFAULT CHARSET = utf8mb4 ENGINE = InnoDB AUTO_INCREMENT = 1 DATA DIRECTORY = '/var/lib/mysql/data'";
+    mysql_and_generic().one_statement_parses_to(sql, canonical);
+}
+
 #[test]
 fn parse_quote_identifiers() {
     let sql = "CREATE TABLE `PRIMARY` (`BEGIN` INT PRIMARY KEY)";