fix(parser): model common MySQL table options

Author: minleejae

src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt

@@ -1198,7 +1198,8 @@ public class CCJSqlParser extends AbstractJSqlParser<CCJSqlParser> {
 
     private boolean isMySqlTableOptionAhead() {
         int kind = getToken(1).kind;
-        if (kind == K_ENGINE) {
+        if (kind == K_ENGINE || kind == K_COLLATE || kind == K_COMMENT
+                || kind == K_AUTO_INCREMENT) {
             return true;
         }
         if (kind == K_CHARACTER && getToken(2).kind == K_SET
@@ -1212,7 +1213,7 @@ public class CCJSqlParser extends AbstractJSqlParser<CCJSqlParser> {
             return false;
         }
         int secondKind = getToken(2).kind;
-        return secondKind == K_CHARACTER || secondKind == K_CHAR
+        return secondKind == K_CHARACTER || secondKind == K_CHAR || secondKind == K_COLLATE
                 || secondKind == S_IDENTIFIER
                         && "CHARSET".equalsIgnoreCase(getToken(2).image);
     }
@@ -11880,7 +11881,7 @@ TableOption MySqlTableOption(): {
     String value;
     boolean useEquals = false;
     String name = "";
-    TableOption.Kind kind;
+    TableOption.Kind kind = null;
     TableOption option;
 } {
     (
@@ -11902,8 +11903,27 @@ TableOption MySqlTableOption(): {
             }
             |
             tk=<S_IDENTIFIER> { name += tk.image; }
+            |
+            tk=<K_COLLATE> {
+                name += tk.image;
+                kind = TableOption.Kind.COLLATE;
+            }
         )
-        { kind = TableOption.Kind.CHARACTER_SET; }
+        { if (kind == null) { kind = TableOption.Kind.CHARACTER_SET; } }
+        [ "=" { useEquals = true; } ]
+        value=MySqlTableOptionValue()
+        |
+        tk=<K_COMMENT> {
+            name = tk.image;
+            kind = TableOption.Kind.COMMENT;
+        }
+        [ "=" { useEquals = true; } ]
+        value=MySqlTableOptionValue()
+        |
+        tk=<K_AUTO_INCREMENT> {
+            name = tk.image;
+            kind = TableOption.Kind.AUTO_INCREMENT;
+        }
         [ "=" { useEquals = true; } ]
         value=MySqlTableOptionValue()
     )
@@ -11921,6 +11941,9 @@ String MySqlTableOptionValue(): {
         value=RelObjectName()
         | token=<K_CSV> { value = token.image; }
         | token=<K_BINARY> { value = token.image; }
+        | token=<S_CHAR_LITERAL> { value = token.image; }
+        | token=<S_LONG> { value = token.image; }
+        | token=<S_DOUBLE> { value = token.image; }
     )
     { return value; }
 }
@@ -12352,6 +12375,7 @@ CheckConstraint CheckConstraintSpec(String constraintName):
 {
     Expression exp = null;
     Boolean enforced = null;
+    CheckConstraint checkConstraint;
 }
 {
     <K_CHECK> ( LOOKAHEAD(2) "(" exp = Expression() ")" )*
@@ -12360,8 +12384,10 @@ CheckConstraint CheckConstraintSpec(String constraintName):
         <K_ENFORCED> { if (enforced == null) { enforced = true; } }
     ]
     {
-        return new CheckConstraint().withName(constraintName).withExpression(exp)
+        checkConstraint = new CheckConstraint().withName(constraintName).withExpression(exp)
                 .withEnforced(enforced);
+        checkConstraint.setKind(Index.Kind.CHECK);
+        return checkConstraint;
     }
 }
 

src/test/java/net/sf/jsqlparser/statement/create/MySqlTableDefinitionTest.java

@@ -133,6 +133,24 @@ public void testStructuredMySqlTableOptionsAndKeywordColumn() throws JSQLParserE
         assertEquals(TableOption.Kind.CHARACTER_SET, table.getTableOptions().get(1).getKind());
         assertEquals("utf8mb4", table.getTableOptions().get(1).getValue());
         assertReparse(table);
+
+        CreateTable quotedEngine = parseMySql("CREATE TABLE archive_entry (id INT) "
+                + "ENGINE='InnoDB'");
+        assertEquals("'InnoDB'", quotedEngine.getTableOption(TableOption.Kind.ENGINE)
+                .orElseThrow().getValue());
+        assertReparse(quotedEngine);
+
+        CreateTable commonOptions = parseMySql("CREATE TABLE table_options "
+                + "(id BIGINT AUTO_INCREMENT PRIMARY KEY) ENGINE=InnoDB "
+                + "DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin AUTO_INCREMENT=7 "
+                + "COMMENT='archive'");
+        assertEquals("utf8mb4_bin", commonOptions.getTableOption(TableOption.Kind.COLLATE)
+                .orElseThrow().getValue());
+        assertEquals("7", commonOptions.getTableOption(TableOption.Kind.AUTO_INCREMENT)
+                .orElseThrow().getValue());
+        assertEquals("'archive'", commonOptions.getTableOption(TableOption.Kind.COMMENT)
+                .orElseThrow().getValue());
+        assertReparse(commonOptions);
     }
 
     @Test