Fix parsing ALTER TABLE ... ADD COLUMNS (...)

njaremko · njaremko · commit 84ed566c5bda · 2024-10-15T15:34:09.000-04:00
The current behaviour fails when it encounters `ADD COLUMNS` and merges
everything in the `()` into one string with no whitespace.

So `ALTER TABLE catalog.table.name ADD COLUMNS (apples int)` becomes
`ALTER TABLE catalog.table.name ADD COLUMNS (applesint)`.

This commit adds an understanding of how `ADD COLUMNS` to the grammar.
diff --git a/src/main/java/net/sf/jsqlparser/statement/alter/AlterExpression.java b/src/main/java/net/sf/jsqlparser/statement/alter/AlterExpression.java
@@ -60,6 +60,7 @@ public class AlterExpression implements Serializable {
     private String commentText;
 
     private boolean hasColumn = false;
+    private boolean hasColumns = false;
 
 
     private boolean useBrackets = false;
@@ -80,6 +81,10 @@ public boolean hasColumn() {
         return hasColumn;
     }
 
+    public boolean hasColumns() {
+        return hasColumns;
+    }
+
     public boolean useBrackets() {
         return useBrackets;
     }
@@ -92,6 +97,10 @@ public void hasColumn(boolean hasColumn) {
         this.hasColumn = hasColumn;
     }
 
+    public void hasColumns(boolean hasColumns) {
+        this.hasColumns = hasColumns;
+    }
+
     public String getFkSourceSchema() {
         return fkSourceSchema;
     }
@@ -503,6 +512,8 @@ public String toString() {
                 } else {
                     if (hasColumn) {
                         b.append("COLUMN ");
+                    } else if (hasColumns) {
+                        b.append("COLUMNS ");
                     }
                     if (useIfNotExists
                             && operation == AlterOperation.ADD) {
diff --git a/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt b/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt
@@ -1187,7 +1187,7 @@ DescribeStatement Describe(): {
     DescribeStatement stmt = new DescribeStatement();
     Token tk = null;
 } {
-    (tk=<K_DESCRIBE> | tk=<K_DESC>) 
+    (tk=<K_DESCRIBE> | tk=<K_DESC>)
     table = Table() { stmt.setDescribeType(tk.image).setTable(table); }
     {
         return stmt;
@@ -1388,13 +1388,13 @@ Statement RefreshMaterializedView(): {
 }
 {
     <K_REFRESH> <K_MATERIALIZED> <K_VIEW>
-    [ LOOKAHEAD(2) <K_CONCURRENTLY>  { concurrently = true; } ]    
+    [ LOOKAHEAD(2) <K_CONCURRENTLY>  { concurrently = true; } ]
     view = Table()
     [
         <K_WITH> { refreshMode = RefreshMode.WITH_DATA; }
-        [ 
+        [
             <K_NO> { refreshMode = RefreshMode.WITH_NO_DATA; }
-        ] 
+        ]
         <K_DATA>
     ]
     captureRest = captureRest()
@@ -2017,7 +2017,7 @@ The following tokens are allowed as Names for Schema, Table, Column and Aliases
 String RelObjectNameWithoutValue() :
 {    Token tk = null; }
 {
-    ( tk=<DATA_TYPE> | tk=<S_IDENTIFIER> | tk=<S_QUOTED_IDENTIFIER> |  tk=<K_DATE_LITERAL> | tk=<K_DATETIMELITERAL> | tk=<K_STRING_FUNCTION_NAME> | tk=<K_ISOLATION> | tk=<K_TIME_KEY_EXPR> | tk=<K_TEXT_LITERAL> 
+    ( tk=<DATA_TYPE> | tk=<S_IDENTIFIER> | tk=<S_QUOTED_IDENTIFIER> |  tk=<K_DATE_LITERAL> | tk=<K_DATETIMELITERAL> | tk=<K_STRING_FUNCTION_NAME> | tk=<K_ISOLATION> | tk=<K_TIME_KEY_EXPR> | tk=<K_TEXT_LITERAL>
        | tk="ACTION" | tk="ACTIVE" | tk="ADD" | tk="ADVANCE" | tk="ADVISE" | tk="AGAINST" | tk="ALGORITHM" | tk="ALTER" | tk="ANALYZE" | tk="APPLY" | tk="APPROXIMATE" | tk="ARCHIVE" | tk="ARRAY" | tk="ASC" | tk="AT" | tk="AUTHORIZATION" | tk="AUTO" | tk="BASE64" | tk="BEGIN" | tk="BERNOULLI" | tk="BINARY" | tk="BIT" | tk="BLOCK" | tk="BROWSE" | tk="BUFFERS" | tk="BY" | tk="BYTE" | tk="BYTES" | tk="CACHE" | tk="CALL" | tk="CASCADE" | tk="CASE" | tk="CAST" | tk="CHANGE" | tk="CHANGES" | tk="CHAR" | tk="CHARACTER" | tk="CHECKPOINT" | tk="CLOSE" | tk="COLLATE" | tk="COLUMN" | tk="COLUMNS" | tk="COMMENT" | tk="COMMIT" | tk="CONCURRENTLY" | tk="CONFLICT" | tk="CONSTRAINTS" | tk="CONVERT" | tk="COSTS" | tk="COUNT" | tk="CS" | tk="CYCLE" | tk="DATA" | tk="DATABASE" | tk="DATETIME" | tk="DBA_RECYCLEBIN" | tk="DDL" | tk="DECLARE" | tk="DEFERRABLE" | tk="DELAYED" | tk="DELETE" | tk="DESC" | tk="DESCRIBE" | tk="DISABLE" | tk="DISCONNECT" | tk="DIV" | tk="DML" | tk="DO" | tk="DOMAIN" | tk="DROP" | tk="DUMP" | tk="DUPLICATE" | tk="ELEMENTS" | tk="EMIT" | tk="ENABLE" | tk="END" | tk="ERROR" | tk="ESCAPE" | tk="EXCLUDE" | tk="EXEC" | tk="EXECUTE" | tk="EXPLAIN" | tk="EXPLICIT" | tk="EXTENDED" | tk="EXTRACT" | tk="FALSE" | tk="FILTER" | tk="FIRST" | tk="FLUSH" | tk="FN" | tk="FOLLOWING" | tk="FORMAT" | tk="FULLTEXT" | tk="FUNCTION" | tk="GRANT" | tk="GROUP_CONCAT" | tk="GUARD" | tk="HASH" | tk="HIGH_PRIORITY" | tk="HISTORY" | tk="HOPPING" | tk="INCLUDE" | tk="INCLUDE_NULL_VALUES" | tk="INCREMENT" | tk="INDEX" | tk="INSERT" | tk="INTERLEAVE" | tk="INTERPRET" | tk="INVALIDATE" | tk="ISNULL" | tk="JSON" | tk="JSON_ARRAY" | tk="JSON_ARRAYAGG" | tk="JSON_OBJECT" | tk="JSON_OBJECTAGG" | tk="KEEP" | tk="KEY" | tk="KEYS" | tk="LAST" | tk="LEADING" | tk="LINK" | tk="LOCAL" | tk="LOCKED" | tk="LOG" | tk="LONGTEXT" | tk="LOOP" | tk="LOW_PRIORITY" | tk="MATCH" | tk="MATCHED" | tk="MATERIALIZED" | tk="MAX" | tk="MAXVALUE" | tk="MEDIUMTEXT" | tk="MEMBER" | tk="MERGE" | tk="MIN" | tk="MINVALUE" | tk="MODIFY" | tk="MOVEMENT" | tk="NEXT" | tk="NO" | tk="NOCACHE" | tk="NOKEEP" | tk="NOLOCK" | tk="NOMAXVALUE" | tk="NOMINVALUE" | tk="NOORDER" | tk="NOTHING" | tk="NOTNULL" | tk="NOVALIDATE" | tk="NOWAIT" | tk="NULLS" | tk="OF" | tk="OFF" | tk="OPEN" | tk="OVER" | tk="OVERFLOW" | tk="OVERLAPS" | tk="PARALLEL" | tk="PARENT" | tk="PARTITION" | tk="PATH" | tk="PERCENT" | tk="PLACING" | tk="PLAN" | tk="PRECEDING" | tk="PRIMARY" | tk="PURGE" | tk="QUERY" | tk="QUICK" | tk="QUIESCE" | tk="RANGE" | tk="RAW" | tk="READ" | tk="RECURSIVE" | tk="RECYCLEBIN" | tk="REFERENCES" | tk="REFRESH" | tk="REGEXP" | tk="REGEXP_LIKE" | tk="REGISTER" | tk="REMOTE" | tk="RENAME" | tk="REPEATABLE" | tk="REPLACE" | tk="RESET" | tk="RESPECT" | tk="RESTART" | tk="RESTRICT" | tk="RESTRICTED" | tk="RESUMABLE" | tk="RESUME" | tk="RETURN" | tk="RLIKE" | tk="ROLLBACK" | tk="ROLLUP" | tk="ROOT" | tk="ROW" | tk="ROWS" | tk="RR" | tk="RS" | tk="SAFE_CAST" | tk="SAVEPOINT" | tk="SCHEMA" | tk="SECURE" | tk="SEED" | tk="SEPARATOR" | tk="SEQUENCE" | tk="SESSION" | tk="SETS" | tk="SHARE" | tk="SHOW" | tk="SHUTDOWN" | tk="SIBLINGS" | tk="SIGNED" | tk="SIMILAR" | tk="SIZE" | tk="SKIP" | tk="STORED" | tk="STRING" | tk="STRUCT" | tk="SUMMARIZE" | tk="SUSPEND" | tk="SWITCH" | tk="SYNONYM" | tk="SYSTEM" | tk="TABLE" | tk="TABLESPACE" | tk="TEMP" | tk="TEMPORARY" | tk="TEXT" | tk="THEN" | tk="TIMEOUT" | tk="TIMESTAMPTZ" | tk="TIMEZONE" | tk="TINYTEXT" | tk="TO" | tk="TRIGGER" | tk="TRUE" | tk="TRUNCATE" | tk="TRY_CAST" | tk="TUMBLING" | tk="TYPE" | tk="UNLOGGED" | tk="UNQIESCE" | tk="UNSIGNED" | tk="UPDATE" | tk="UPSERT" | tk="UR" | tk="USER" | tk="VALIDATE" | tk="VERBOSE" | tk="VIEW" | tk="VOLATILE" | tk="WAIT" | tk="WITHIN" | tk="WITHOUT" | tk="WITHOUT_ARRAY_WRAPPER" | tk="WORK" | tk="XML" | tk="XMLAGG" | tk="XMLDATA" | tk="XMLSCHEMA" | tk="XMLTEXT" | tk="XSINIL" | tk="YAML" | tk="YES" | tk="ZONE" )
     { return tk.image; }
 }
@@ -2227,7 +2227,7 @@ TableStatement TableStatement():
     List<OrderByElement> orderByElements = null;
     Limit limit = null;
     Offset offset = null;
-    TableStatement tableStatement = new TableStatement(); 
+    TableStatement tableStatement = new TableStatement();
 }{
     <K_TABLE>
     table = Table()
@@ -2560,12 +2560,12 @@ PlainSelect PlainSelect() #PlainSelect:
 	[ LOOKAHEAD(<K_LIMIT>, { limit==null }) limit = LimitWithOffset() { plainSelect.setLimit(limit);    } ]
     [ LOOKAHEAD(<K_FETCH>) fetch = Fetch() { plainSelect.setFetch(fetch);    } ]
     [ LOOKAHEAD(<K_WITH> <K_ISOLATION>) withIsolation = WithIsolation() { plainSelect.setIsolation(withIsolation); } ]
-    [ LOOKAHEAD(2) 
-        <K_FOR> 
+    [ LOOKAHEAD(2)
+        <K_FOR>
             (
-            <K_UPDATE> { plainSelect.setForMode(ForMode.UPDATE); } 
-            | <K_SHARE> { plainSelect.setForMode(ForMode.SHARE); } 
-            | (<K_NO> <K_KEY> <K_UPDATE> { plainSelect.setForMode(ForMode.NO_KEY_UPDATE); }) 
+            <K_UPDATE> { plainSelect.setForMode(ForMode.UPDATE); }
+            | <K_SHARE> { plainSelect.setForMode(ForMode.SHARE); }
+            | (<K_NO> <K_KEY> <K_UPDATE> { plainSelect.setForMode(ForMode.NO_KEY_UPDATE); })
             | (<K_KEY> <K_SHARE> { plainSelect.setForMode(ForMode.KEY_SHARE); })
             )
         [ LOOKAHEAD(2) <K_OF> updateTable = Table() { plainSelect.setForUpdateTable(updateTable); } ]
@@ -3480,7 +3480,7 @@ GroupByElement GroupByColumnReferences():
     <K_GROUP> <K_BY>
     (
         LOOKAHEAD(2) (
-            <K_GROUPING> <K_SETS> 
+            <K_GROUPING> <K_SETS>
             "("
                 list = GroupingSet() { groupBy.addGroupingSet(list); }
                 ( LOOKAHEAD(2) "," list = GroupingSet() { groupBy.addGroupingSet(list); })*
@@ -3490,7 +3490,7 @@ GroupByElement GroupByColumnReferences():
         (
             list = ExpressionList() { groupBy.setGroupByExpressions(list); }
             (
-                LOOKAHEAD(2) <K_GROUPING> <K_SETS> 
+                LOOKAHEAD(2) <K_GROUPING> <K_SETS>
                 "("
                     list = GroupingSet() { groupBy.addGroupingSet(list); }
                     ( LOOKAHEAD(2) "," list = GroupingSet() { groupBy.addGroupingSet(list); })*
@@ -6064,10 +6064,10 @@ CreateIndex CreateIndex():
         )
         |
         (
-            [ <K_USING> using=<S_IDENTIFIER> { 
+            [ <K_USING> using=<S_IDENTIFIER> {
                     index.setUsing(using.image);
                     createIndex.setIndexTypeBeforeOn(true);
-                } 
+                }
             ]
             <K_ON> table=Table()
         )
@@ -6605,8 +6605,8 @@ List<String> CreateViewTailComment():
          if (op != null) {
              result.add(op);
          }
-         result.add(tk2.image);   
-    }  
+         result.add(tk2.image);
+    }
     { return result;}
 }
 
@@ -7071,11 +7071,15 @@ AlterExpression AlterExpression():
                 )
                 |
                 LOOKAHEAD(3) (
-                    ( LOOKAHEAD(2) <K_COLUMN> { alterExp.hasColumn(true); } )?
+                    (
+                        <K_COLUMN> { alterExp.hasColumn(true); }
+                        |
+                        <K_COLUMNS> { alterExp.hasColumns(true); }
+                    )?
                     [ <K_IF> <K_NOT> <K_EXISTS> { alterExp.setUseIfNotExists(true); } ]
                     (
                         LOOKAHEAD(4) (
-                            "(" 
+                            "("
                                 { alterExp.useBrackets(true);}
                                 alterExpressionColumnDataType = AlterExpressionColumnDataType() {
                                     alterExp.addColDataType(alterExpressionColumnDataType);
@@ -7089,22 +7093,22 @@ AlterExpression AlterExpression():
                             ")"
                         )
                         |
-                        LOOKAHEAD(2) alterExpressionColumnDataType = AlterExpressionColumnDataType() 
+                        LOOKAHEAD(2) alterExpressionColumnDataType = AlterExpressionColumnDataType()
                             { alterExp.addColDataType(alterExpressionColumnDataType); }
                         |
-                        LOOKAHEAD(3) alterExpressionColumnDropNotNull = AlterExpressionColumnDropNotNull() 
+                        LOOKAHEAD(3) alterExpressionColumnDropNotNull = AlterExpressionColumnDropNotNull()
                             { alterExp.addColDropNotNull( alterExpressionColumnDropNotNull);}
                         |
-                        alterExpressionColumnDropDefault = AlterExpressionColumnDropDefault() 
+                        alterExpressionColumnDropDefault = AlterExpressionColumnDropDefault()
                             { alterExp.addColDropDefault( alterExpressionColumnDropDefault); }
                     )
                 )
                 |
                 (
                     "(" alterExpressionColumnDataType = AlterExpressionColumnDataType() { alterExp.addColDataType(alterExpressionColumnDataType); }
-                        ("," 
-                            alterExpressionColumnDataType = AlterExpressionColumnDataType() { alterExp.addColDataType(alterExpressionColumnDataType); } 
-                        )* 
+                        (","
+                            alterExpressionColumnDataType = AlterExpressionColumnDataType() { alterExp.addColDataType(alterExpressionColumnDataType); }
+                        )*
                     ")"
                 )
                 |
@@ -7156,7 +7160,7 @@ AlterExpression AlterExpression():
                         [LOOKAHEAD(2) (<K_ON> (tk=<K_DELETE> | tk=<K_UPDATE>) action = Action()
                             {  fkIndex.setReferentialAction(ReferentialAction.Type.from(tk.image), action); }
                         )]
-                        [LOOKAHEAD(2) (<K_ON> (tk=<K_DELETE> | tk=<K_UPDATE>) action = Action() 
+                        [LOOKAHEAD(2) (<K_ON> (tk=<K_DELETE> | tk=<K_UPDATE>) action = Action()
                             { fkIndex.setReferentialAction(ReferentialAction.Type.from(tk.image), action); }
                         )]
                         constraints=AlterExpressionConstraintState() { alterExp.setConstraints(constraints); }
@@ -7310,18 +7314,18 @@ AlterExpression AlterExpression():
       )
       |
       LOOKAHEAD(2)
-           (<K_RENAME> ((<K_INDEX> {alterExp.setOperation(AlterOperation.RENAME_INDEX);} 
-                    | <K_KEY> {alterExp.setOperation(AlterOperation.RENAME_KEY);}) 
+           (<K_RENAME> ((<K_INDEX> {alterExp.setOperation(AlterOperation.RENAME_INDEX);}
+                    | <K_KEY> {alterExp.setOperation(AlterOperation.RENAME_KEY);})
                     | <K_CONSTRAINT> { alterExp.setOperation(AlterOperation.RENAME_CONSTRAINT); }
-           ) 
+           )
            (tk=<S_IDENTIFIER> | tk=<S_QUOTED_IDENTIFIER>){
               alterExp.setOldIndex(new Index().withName(tk.image));
-           } 
+           }
            <K_TO>
            (tk2=<S_IDENTIFIER> | tk2=<S_QUOTED_IDENTIFIER>){
               index = new Index().withName(tk2.image);
               alterExp.setIndex(index);
-           } 
+           }
           )
       |
       LOOKAHEAD(2) <K_TRUNCATE> <K_PARTITION> { alterExp.setOperation(AlterOperation.TRUNCATE_PARTITION); } truncatePartitionName = RelObjectName() { alterExp.setTruncatePartitionName(truncatePartitionName); }
diff --git a/src/test/java/net/sf/jsqlparser/statement/alter/AlterTest.java b/src/test/java/net/sf/jsqlparser/statement/alter/AlterTest.java
@@ -54,6 +54,22 @@ public void testAlterTableAddColumn() throws JSQLParserException {
         assertEquals("varchar (255)", colDataTypes.get(0).getColDataType().toString());
     }
 
+    @Test
+    public void testAlterTableAddColumnsWhitespace() throws JSQLParserException {
+        Statement stmt =
+                CCJSqlParserUtil.parse("ALTER TABLE test_catalog.test20241014.tt ADD COLUMNS (apples string, bees int)");
+        assertTrue(stmt instanceof Alter);
+        Alter alter = (Alter) stmt;
+        assertEquals("test_catalog.test20241014.tt", alter.getTable().getFullyQualifiedName());
+        AlterExpression alterExp = alter.getAlterExpressions().get(0);
+        assertNotNull(alterExp);
+        List<ColumnDataType> colDataTypes = alterExp.getColDataTypeList();
+        assertEquals("apples", colDataTypes.get(0).getColumnName());
+        assertEquals("string", colDataTypes.get(0).getColDataType().toString());
+        assertEquals("bees", colDataTypes.get(1).getColumnName());
+        assertEquals("int", colDataTypes.get(1).getColDataType().toString());
+    }
+
     @Test
     public void testAlterTableAddColumn_ColumnKeyWordImplicit() throws JSQLParserException {
         Statement stmt = CCJSqlParserUtil.parse("ALTER TABLE mytable ADD mycolumn varchar (255)");

Original file line number	Diff line number	Diff line change
`@@ -1187,7 +1187,7 @@ DescribeStatement Describe(): {`
`1187`	`1187`	`DescribeStatement stmt = new DescribeStatement();`
`1188`	`1188`	`Token tk = null;`
`1189`	`1189`	`} {`
`1190`		`- (tk=<K_DESCRIBE> \| tk=<K_DESC>)`
	`1190`	`+ (tk=<K_DESCRIBE> \| tk=<K_DESC>)`
`1191`	`1191`	`table = Table() { stmt.setDescribeType(tk.image).setTable(table); }`
`1192`	`1192`	`{`
`1193`	`1193`	`return stmt;`
`@@ -1388,13 +1388,13 @@ Statement RefreshMaterializedView(): {`
`1388`	`1388`	`}`
`1389`	`1389`	`{`
`1390`	`1390`	`<K_REFRESH> <K_MATERIALIZED> <K_VIEW>`
`1391`		`- [ LOOKAHEAD(2) <K_CONCURRENTLY> { concurrently = true; } ]`
	`1391`	`+ [ LOOKAHEAD(2) <K_CONCURRENTLY> { concurrently = true; } ]`
`1392`	`1392`	`view = Table()`
`1393`	`1393`	`[`
`1394`	`1394`	`<K_WITH> { refreshMode = RefreshMode.WITH_DATA; }`
`1395`		`- [`
	`1395`	`+ [`
`1396`	`1396`	`<K_NO> { refreshMode = RefreshMode.WITH_NO_DATA; }`
`1397`		`- ]`
	`1397`	`+ ]`
`1398`	`1398`	`<K_DATA>`
`1399`	`1399`	`]`
`1400`	`1400`	`captureRest = captureRest()`
`@@ -2017,7 +2017,7 @@ The following tokens are allowed as Names for Schema, Table, Column and Aliases`
`2017`	`2017`	`String RelObjectNameWithoutValue() :`
`2018`	`2018`	`{ Token tk = null; }`
`2019`	`2019`	`{`
`2020`		`- ( tk=<DATA_TYPE> \| tk=<S_IDENTIFIER> \| tk=<S_QUOTED_IDENTIFIER> \| tk=<K_DATE_LITERAL> \| tk=<K_DATETIMELITERAL> \| tk=<K_STRING_FUNCTION_NAME> \| tk=<K_ISOLATION> \| tk=<K_TIME_KEY_EXPR> \| tk=<K_TEXT_LITERAL>`
	`2020`	`+ ( tk=<DATA_TYPE> \| tk=<S_IDENTIFIER> \| tk=<S_QUOTED_IDENTIFIER> \| tk=<K_DATE_LITERAL> \| tk=<K_DATETIMELITERAL> \| tk=<K_STRING_FUNCTION_NAME> \| tk=<K_ISOLATION> \| tk=<K_TIME_KEY_EXPR> \| tk=<K_TEXT_LITERAL>`
`2021`	`2021`	\| tk="ACTION" \| tk="ACTIVE" \| tk="ADD" \| tk="ADVANCE" \| tk="ADVISE" \| tk="AGAINST" \| tk="ALGORITHM" \| tk="ALTER" \| tk="ANALYZE" \| tk="APPLY" \| tk="APPROXIMATE" \| tk="ARCHIVE" \| tk="ARRAY" \| tk="ASC" \| tk="AT" \| tk="AUTHORIZATION" \| tk="AUTO" \| tk="BASE64" \| tk="BEGIN" \| tk="BERNOULLI" \| tk="BINARY" \| tk="BIT" \| tk="BLOCK" \| tk="BROWSE" \| tk="BUFFERS" \| tk="BY" \| tk="BYTE" \| tk="BYTES" \| tk="CACHE" \| tk="CALL" \| tk="CASCADE" \| tk="CASE" \| tk="CAST" \| tk="CHANGE" \| tk="CHANGES" \| tk="CHAR" \| tk="CHARACTER" \| tk="CHECKPOINT" \| tk="CLOSE" \| tk="COLLATE" \| tk="COLUMN" \| tk="COLUMNS" \| tk="COMMENT" \| tk="COMMIT" \| tk="CONCURRENTLY" \| tk="CONFLICT" \| tk="CONSTRAINTS" \| tk="CONVERT" \| tk="COSTS" \| tk="COUNT" \| tk="CS" \| tk="CYCLE" \| tk="DATA" \| tk="DATABASE" \| tk="DATETIME" \| tk="DBA_RECYCLEBIN" \| tk="DDL" \| tk="DECLARE" \| tk="DEFERRABLE" \| tk="DELAYED" \| tk="DELETE" \| tk="DESC" \| tk="DESCRIBE" \| tk="DISABLE" \| tk="DISCONNECT" \| tk="DIV" \| tk="DML" \| tk="DO" \| tk="DOMAIN" \| tk="DROP" \| tk="DUMP" \| tk="DUPLICATE" \| tk="ELEMENTS" \| tk="EMIT" \| tk="ENABLE" \| tk="END" \| tk="ERROR" \| tk="ESCAPE" \| tk="EXCLUDE" \| tk="EXEC" \| tk="EXECUTE" \| tk="EXPLAIN" \| tk="EXPLICIT" \| tk="EXTENDED" \| tk="EXTRACT" \| tk="FALSE" \| tk="FILTER" \| tk="FIRST" \| tk="FLUSH" \| tk="FN" \| tk="FOLLOWING" \| tk="FORMAT" \| tk="FULLTEXT" \| tk="FUNCTION" \| tk="GRANT" \| tk="GROUP_CONCAT" \| tk="GUARD" \| tk="HASH" \| tk="HIGH_PRIORITY" \| tk="HISTORY" \| tk="HOPPING" \| tk="INCLUDE" \| tk="INCLUDE_NULL_VALUES" \| tk="INCREMENT" \| tk="INDEX" \| tk="INSERT" \| tk="INTERLEAVE" \| tk="INTERPRET" \| tk="INVALIDATE" \| tk="ISNULL" \| tk="JSON" \| tk="JSON_ARRAY" \| tk="JSON_ARRAYAGG" \| tk="JSON_OBJECT" \| tk="JSON_OBJECTAGG" \| tk="KEEP" \| tk="KEY" \| tk="KEYS" \| tk="LAST" \| tk="LEADING" \| tk="LINK" \| tk="LOCAL" \| tk="LOCKED" \| tk="LOG" \| tk="LONGTEXT" \| tk="LOOP" \| tk="LOW_PRIORITY" \| tk="MATCH" \| tk="MATCHED" \| tk="MATERIALIZED" \| tk="MAX" \| tk="MAXVALUE" \| tk="MEDIUMTEXT" \| tk="MEMBER" \| tk="MERGE" \| tk="MIN" \| tk="MINVALUE" \| tk="MODIFY" \| tk="MOVEMENT" \| tk="NEXT" \| tk="NO" \| tk="NOCACHE" \| tk="NOKEEP" \| tk="NOLOCK" \| tk="NOMAXVALUE" \| tk="NOMINVALUE" \| tk="NOORDER" \| tk="NOTHING" \| tk="NOTNULL" \| tk="NOVALIDATE" \| tk="NOWAIT" \| tk="NULLS" \| tk="OF" \| tk="OFF" \| tk="OPEN" \| tk="OVER" \| tk="OVERFLOW" \| tk="OVERLAPS" \| tk="PARALLEL" \| tk="PARENT" \| tk="PARTITION" \| tk="PATH" \| tk="PERCENT" \| tk="PLACING" \| tk="PLAN" \| tk="PRECEDING" \| tk="PRIMARY" \| tk="PURGE" \| tk="QUERY" \| tk="QUICK" \| tk="QUIESCE" \| tk="RANGE" \| tk="RAW" \| tk="READ" \| tk="RECURSIVE" \| tk="RECYCLEBIN" \| tk="REFERENCES" \| tk="REFRESH" \| tk="REGEXP" \| tk="REGEXP_LIKE" \| tk="REGISTER" \| tk="REMOTE" \| tk="RENAME" \| tk="REPEATABLE" \| tk="REPLACE" \| tk="RESET" \| tk="RESPECT" \| tk="RESTART" \| tk="RESTRICT" \| tk="RESTRICTED" \| tk="RESUMABLE" \| tk="RESUME" \| tk="RETURN" \| tk="RLIKE" \| tk="ROLLBACK" \| tk="ROLLUP" \| tk="ROOT" \| tk="ROW" \| tk="ROWS" \| tk="RR" \| tk="RS" \| tk="SAFE_CAST" \| tk="SAVEPOINT" \| tk="SCHEMA" \| tk="SECURE" \| tk="SEED" \| tk="SEPARATOR" \| tk="SEQUENCE" \| tk="SESSION" \| tk="SETS" \| tk="SHARE" \| tk="SHOW" \| tk="SHUTDOWN" \| tk="SIBLINGS" \| tk="SIGNED" \| tk="SIMILAR" \| tk="SIZE" \| tk="SKIP" \| tk="STORED" \| tk="STRING" \| tk="STRUCT" \| tk="SUMMARIZE" \| tk="SUSPEND" \| tk="SWITCH" \| tk="SYNONYM" \| tk="SYSTEM" \| tk="TABLE" \| tk="TABLESPACE" \| tk="TEMP" \| tk="TEMPORARY" \| tk="TEXT" \| tk="THEN" \| tk="TIMEOUT" \| tk="TIMESTAMPTZ" \| tk="TIMEZONE" \| tk="TINYTEXT" \| tk="TO" \| tk="TRIGGER" \| tk="TRUE" \| tk="TRUNCATE" \| tk="TRY_CAST" \| tk="TUMBLING" \| tk="TYPE" \| tk="UNLOGGED" \| tk="UNQIESCE" \| tk="UNSIGNED" \| tk="UPDATE" \| tk="UPSERT" \| tk="UR" \| tk="USER" \| tk="VALIDATE" \| tk="VERBOSE" \| tk="VIEW" \| tk="VOLATILE" \| tk="WAIT" \| tk="WITHIN" \| tk="WITHOUT" \| tk="WITHOUT_ARRAY_WRAPPER" \| tk="WORK" \| tk="XML" \| tk="XMLAGG" \| tk="XMLDATA" \| tk="XMLSCHEMA" \| tk="XMLTEXT" \| tk="XSINIL" \| tk="YAML" \| tk="YES" \| tk="ZONE" )
`2022`	`2022`	`{ return tk.image; }`
`2023`	`2023`	`}`
`@@ -2227,7 +2227,7 @@ TableStatement TableStatement():`
`2227`	`2227`	`List<OrderByElement> orderByElements = null;`
`2228`	`2228`	`Limit limit = null;`
`2229`	`2229`	`Offset offset = null;`
`2230`		`- TableStatement tableStatement = new TableStatement();`
	`2230`	`+ TableStatement tableStatement = new TableStatement();`
`2231`	`2231`	`}{`
`2232`	`2232`	`<K_TABLE>`
`2233`	`2233`	`table = Table()`
`@@ -2560,12 +2560,12 @@ PlainSelect PlainSelect() #PlainSelect:`
`2560`	`2560`	`[ LOOKAHEAD(<K_LIMIT>, { limit==null }) limit = LimitWithOffset() { plainSelect.setLimit(limit); } ]`
`2561`	`2561`	`[ LOOKAHEAD(<K_FETCH>) fetch = Fetch() { plainSelect.setFetch(fetch); } ]`
`2562`	`2562`	`[ LOOKAHEAD(<K_WITH> <K_ISOLATION>) withIsolation = WithIsolation() { plainSelect.setIsolation(withIsolation); } ]`
`2563`		`- [ LOOKAHEAD(2)`
`2564`		`- <K_FOR>`
	`2563`	`+ [ LOOKAHEAD(2)`
	`2564`	`+ <K_FOR>`
`2565`	`2565`	`(`
`2566`		`- <K_UPDATE> { plainSelect.setForMode(ForMode.UPDATE); }`
`2567`		`- \| <K_SHARE> { plainSelect.setForMode(ForMode.SHARE); }`
`2568`		`- \| (<K_NO> <K_KEY> <K_UPDATE> { plainSelect.setForMode(ForMode.NO_KEY_UPDATE); })`
	`2566`	`+ <K_UPDATE> { plainSelect.setForMode(ForMode.UPDATE); }`
	`2567`	`+ \| <K_SHARE> { plainSelect.setForMode(ForMode.SHARE); }`
	`2568`	`+ \| (<K_NO> <K_KEY> <K_UPDATE> { plainSelect.setForMode(ForMode.NO_KEY_UPDATE); })`
`2569`	`2569`	`\| (<K_KEY> <K_SHARE> { plainSelect.setForMode(ForMode.KEY_SHARE); })`
`2570`	`2570`	`)`
`2571`	`2571`	`[ LOOKAHEAD(2) <K_OF> updateTable = Table() { plainSelect.setForUpdateTable(updateTable); } ]`
`@@ -3480,7 +3480,7 @@ GroupByElement GroupByColumnReferences():`
`3480`	`3480`	`<K_GROUP> <K_BY>`
`3481`	`3481`	`(`
`3482`	`3482`	`LOOKAHEAD(2) (`
`3483`		`- <K_GROUPING> <K_SETS>`
	`3483`	`+ <K_GROUPING> <K_SETS>`
`3484`	`3484`	`"("`
`3485`	`3485`	`list = GroupingSet() { groupBy.addGroupingSet(list); }`
`3486`	`3486`	`( LOOKAHEAD(2) "," list = GroupingSet() { groupBy.addGroupingSet(list); })*`
`@@ -3490,7 +3490,7 @@ GroupByElement GroupByColumnReferences():`
`3490`	`3490`	`(`
`3491`	`3491`	`list = ExpressionList() { groupBy.setGroupByExpressions(list); }`
`3492`	`3492`	`(`
`3493`		`- LOOKAHEAD(2) <K_GROUPING> <K_SETS>`
	`3493`	`+ LOOKAHEAD(2) <K_GROUPING> <K_SETS>`
`3494`	`3494`	`"("`
`3495`	`3495`	`list = GroupingSet() { groupBy.addGroupingSet(list); }`
`3496`	`3496`	`( LOOKAHEAD(2) "," list = GroupingSet() { groupBy.addGroupingSet(list); })*`
`@@ -6064,10 +6064,10 @@ CreateIndex CreateIndex():`
`6064`	`6064`	`)`
`6065`	`6065`	`\|`
`6066`	`6066`	`(`
`6067`		`- [ <K_USING> using=<S_IDENTIFIER> {`
	`6067`	`+ [ <K_USING> using=<S_IDENTIFIER> {`
`6068`	`6068`	`index.setUsing(using.image);`
`6069`	`6069`	`createIndex.setIndexTypeBeforeOn(true);`
`6070`		`- }`
	`6070`	`+ }`
`6071`	`6071`	`]`
`6072`	`6072`	`<K_ON> table=Table()`
`6073`	`6073`	`)`
`@@ -6605,8 +6605,8 @@ List<String> CreateViewTailComment():`
`6605`	`6605`	`if (op != null) {`
`6606`	`6606`	`result.add(op);`
`6607`	`6607`	`}`
`6608`		`- result.add(tk2.image);`
`6609`		`- }`
	`6608`	`+ result.add(tk2.image);`
	`6609`	`+ }`
`6610`	`6610`	`{ return result;}`
`6611`	`6611`	`}`
`6612`	`6612`
`@@ -7071,11 +7071,15 @@ AlterExpression AlterExpression():`
`7071`	`7071`	`)`
`7072`	`7072`	`\|`
`7073`	`7073`	`LOOKAHEAD(3) (`
`7074`		`- ( LOOKAHEAD(2) <K_COLUMN> { alterExp.hasColumn(true); } )?`
	`7074`	`+ (`
	`7075`	`+ <K_COLUMN> { alterExp.hasColumn(true); }`
	`7076`	`+ \|`
	`7077`	`+ <K_COLUMNS> { alterExp.hasColumns(true); }`
	`7078`	`+ )?`
`7075`	`7079`	`[ <K_IF> <K_NOT> <K_EXISTS> { alterExp.setUseIfNotExists(true); } ]`
`7076`	`7080`	`(`
`7077`	`7081`	`LOOKAHEAD(4) (`
`7078`		`- "("`
	`7082`	`+ "("`
`7079`	`7083`	`{ alterExp.useBrackets(true);}`
`7080`	`7084`	`alterExpressionColumnDataType = AlterExpressionColumnDataType() {`
`7081`	`7085`	`alterExp.addColDataType(alterExpressionColumnDataType);`
`@@ -7089,22 +7093,22 @@ AlterExpression AlterExpression():`
`7089`	`7093`	`")"`
`7090`	`7094`	`)`
`7091`	`7095`	`\|`
`7092`		`- LOOKAHEAD(2) alterExpressionColumnDataType = AlterExpressionColumnDataType()`
	`7096`	`+ LOOKAHEAD(2) alterExpressionColumnDataType = AlterExpressionColumnDataType()`
`7093`	`7097`	`{ alterExp.addColDataType(alterExpressionColumnDataType); }`
`7094`	`7098`	`\|`
`7095`		`- LOOKAHEAD(3) alterExpressionColumnDropNotNull = AlterExpressionColumnDropNotNull()`
	`7099`	`+ LOOKAHEAD(3) alterExpressionColumnDropNotNull = AlterExpressionColumnDropNotNull()`
`7096`	`7100`	`{ alterExp.addColDropNotNull( alterExpressionColumnDropNotNull);}`
`7097`	`7101`	`\|`
`7098`		`- alterExpressionColumnDropDefault = AlterExpressionColumnDropDefault()`
	`7102`	`+ alterExpressionColumnDropDefault = AlterExpressionColumnDropDefault()`
`7099`	`7103`	`{ alterExp.addColDropDefault( alterExpressionColumnDropDefault); }`
`7100`	`7104`	`)`
`7101`	`7105`	`)`
`7102`	`7106`	`\|`
`7103`	`7107`	`(`
`7104`	`7108`	`"(" alterExpressionColumnDataType = AlterExpressionColumnDataType() { alterExp.addColDataType(alterExpressionColumnDataType); }`
`7105`		`- (","`
`7106`		`- alterExpressionColumnDataType = AlterExpressionColumnDataType() { alterExp.addColDataType(alterExpressionColumnDataType); }`
`7107`		`- )*`
	`7109`	`+ (","`
	`7110`	`+ alterExpressionColumnDataType = AlterExpressionColumnDataType() { alterExp.addColDataType(alterExpressionColumnDataType); }`
	`7111`	`+ )*`
`7108`	`7112`	`")"`
`7109`	`7113`	`)`
`7110`	`7114`	`\|`
`@@ -7156,7 +7160,7 @@ AlterExpression AlterExpression():`
`7156`	`7160`	`[LOOKAHEAD(2) (<K_ON> (tk=<K_DELETE> \| tk=<K_UPDATE>) action = Action()`
`7157`	`7161`	`{ fkIndex.setReferentialAction(ReferentialAction.Type.from(tk.image), action); }`
`7158`	`7162`	`)]`
`7159`		`- [LOOKAHEAD(2) (<K_ON> (tk=<K_DELETE> \| tk=<K_UPDATE>) action = Action()`
	`7163`	`+ [LOOKAHEAD(2) (<K_ON> (tk=<K_DELETE> \| tk=<K_UPDATE>) action = Action()`
`7160`	`7164`	`{ fkIndex.setReferentialAction(ReferentialAction.Type.from(tk.image), action); }`
`7161`	`7165`	`)]`
`7162`	`7166`	`constraints=AlterExpressionConstraintState() { alterExp.setConstraints(constraints); }`
`@@ -7310,18 +7314,18 @@ AlterExpression AlterExpression():`
`7310`	`7314`	`)`
`7311`	`7315`	`\|`
`7312`	`7316`	`LOOKAHEAD(2)`
`7313`		`- (<K_RENAME> ((<K_INDEX> {alterExp.setOperation(AlterOperation.RENAME_INDEX);}`
`7314`		`- \| <K_KEY> {alterExp.setOperation(AlterOperation.RENAME_KEY);})`
	`7317`	`+ (<K_RENAME> ((<K_INDEX> {alterExp.setOperation(AlterOperation.RENAME_INDEX);}`
	`7318`	`+ \| <K_KEY> {alterExp.setOperation(AlterOperation.RENAME_KEY);})`
`7315`	`7319`	`\| <K_CONSTRAINT> { alterExp.setOperation(AlterOperation.RENAME_CONSTRAINT); }`
`7316`		`- )`
	`7320`	`+ )`
`7317`	`7321`	`(tk=<S_IDENTIFIER> \| tk=<S_QUOTED_IDENTIFIER>){`
`7318`	`7322`	`alterExp.setOldIndex(new Index().withName(tk.image));`
`7319`		`- }`
	`7323`	`+ }`
`7320`	`7324`	`<K_TO>`
`7321`	`7325`	`(tk2=<S_IDENTIFIER> \| tk2=<S_QUOTED_IDENTIFIER>){`
`7322`	`7326`	`index = new Index().withName(tk2.image);`
`7323`	`7327`	`alterExp.setIndex(index);`
`7324`		`- }`
	`7328`	`+ }`
`7325`	`7329`	`)`
`7326`	`7330`	`\|`
`7327`	`7331`	`LOOKAHEAD(2) <K_TRUNCATE> <K_PARTITION> { alterExp.setOperation(AlterOperation.TRUNCATE_PARTITION); } truncatePartitionName = RelObjectName() { alterExp.setTruncatePartitionName(truncatePartitionName); }`