feat: support mysql with rollup (#1923)

jxnu-liguobin · web-flow · commit 77f6fb8c92b3 · 2023-12-19T11:28:13.000+07:00
* feat: support mysql with rollup

* feat: support mysql with rollup
diff --git a/src/main/java/net/sf/jsqlparser/statement/select/GroupByElement.java b/src/main/java/net/sf/jsqlparser/statement/select/GroupByElement.java
@@ -9,21 +9,22 @@
  */
 package net.sf.jsqlparser.statement.select;
 
-import net.sf.jsqlparser.expression.Expression;
-import net.sf.jsqlparser.expression.operators.relational.ExpressionList;
-import net.sf.jsqlparser.expression.operators.relational.ParenthesedExpressionList;
-
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
+import net.sf.jsqlparser.expression.Expression;
+import net.sf.jsqlparser.expression.operators.relational.ExpressionList;
+import net.sf.jsqlparser.expression.operators.relational.ParenthesedExpressionList;
 
 public class GroupByElement implements Serializable {
     private ExpressionList groupByExpressions = new ExpressionList();
     private List<ExpressionList> groupingSets = new ArrayList<>();
+    // postgres rollup is an ExpressionList
+    private boolean mysqlWithRollup = false;
 
     public boolean isUsingBrackets() {
         return groupByExpressions.isUsingBrackets();
@@ -90,6 +91,10 @@ public String toString() {
             b.append(")");
         }
 
+        if (isMysqlWithRollup()) {
+            b.append(" WITH ROLLUP");
+        }
+
         return b.toString();
     }
 
@@ -126,4 +131,13 @@ public GroupByElement addGroupingSets(Collection<? extends Object> groupingSets)
         collection.addAll(groupingSets);
         return this.withGroupingSets(collection);
     }
+
+    public boolean isMysqlWithRollup() {
+        return mysqlWithRollup;
+    }
+
+    public GroupByElement setMysqlWithRollup(boolean mysqlWithRollup) {
+        this.mysqlWithRollup = mysqlWithRollup;
+        return this;
+    }
 }
diff --git a/src/main/java/net/sf/jsqlparser/statement/select/OrderByElement.java b/src/main/java/net/sf/jsqlparser/statement/select/OrderByElement.java
@@ -9,9 +9,8 @@
  */
 package net.sf.jsqlparser.statement.select;
 
-import net.sf.jsqlparser.expression.Expression;
-
 import java.io.Serializable;
+import net.sf.jsqlparser.expression.Expression;
 
 public class OrderByElement implements Serializable {
 
@@ -24,6 +23,8 @@ public static NullOrdering from(String ordering) {
     }
 
     private Expression expression;
+    // postgres rollup is an ExpressionList
+    private boolean mysqlWithRollup = false;
     private boolean asc = true;
     private boolean ascDescPresent = false;
     private NullOrdering nullOrdering;
@@ -79,6 +80,9 @@ public String toString() {
             b.append(' ');
             b.append(nullOrdering == NullOrdering.NULLS_FIRST ? "NULLS FIRST" : "NULLS LAST");
         }
+        if (isMysqlWithRollup()) {
+            b.append(" WITH ROLLUP");
+        }
         return b.toString();
     }
 
@@ -106,4 +110,13 @@ public <E extends Expression> E getExpression(Class<E> type) {
         return type.cast(getExpression());
     }
 
+    public boolean isMysqlWithRollup() {
+        return mysqlWithRollup;
+    }
+
+    public OrderByElement setMysqlWithRollup(boolean mysqlWithRollup) {
+        this.mysqlWithRollup = mysqlWithRollup;
+        return this;
+    }
+
 }
diff --git a/src/main/java/net/sf/jsqlparser/util/deparser/GroupByDeParser.java b/src/main/java/net/sf/jsqlparser/util/deparser/GroupByDeParser.java
@@ -45,5 +45,9 @@ public void deParse(GroupByElement groupBy) {
             }
             buffer.append(")");
         }
+
+        if (groupBy.isMysqlWithRollup()) {
+            buffer.append(" WITH ROLLUP");
+        }
     }
 }
diff --git a/src/main/java/net/sf/jsqlparser/util/deparser/OrderByDeParser.java b/src/main/java/net/sf/jsqlparser/util/deparser/OrderByDeParser.java
@@ -11,7 +11,6 @@
 
 import java.util.Iterator;
 import java.util.List;
-
 import net.sf.jsqlparser.expression.ExpressionVisitor;
 import net.sf.jsqlparser.statement.select.OrderByElement;
 
@@ -58,9 +57,13 @@ public void deParseElement(OrderByElement orderBy) {
         }
         if (orderBy.getNullOrdering() != null) {
             buffer.append(' ');
-            buffer.append(orderBy.getNullOrdering() == OrderByElement.NullOrdering.NULLS_FIRST ? "NULLS FIRST"
+            buffer.append(orderBy.getNullOrdering() == OrderByElement.NullOrdering.NULLS_FIRST
+                    ? "NULLS FIRST"
                     : "NULLS LAST");
         }
+        if (orderBy.isMysqlWithRollup()) {
+            buffer.append(" WITH ROLLUP");
+        }
     }
 
     void setExpressionVisitor(ExpressionVisitor expressionVisitor) {
diff --git a/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt b/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt
@@ -383,6 +383,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */
 |   <K_RETURNING: "RETURNING">
 |   <K_RIGHT:"RIGHT">
 |   <K_ROLLBACK:"ROLLBACK">
+|   <K_ROLLUP:"ROLLUP">
 |   <K_ROOT:"ROOT">
 |   <K_ROW: "ROW">
 |   <K_ROWS: "ROWS">
@@ -1802,7 +1803,7 @@ String RelObjectNameWithoutValue() :
 {    Token tk = null; }
 {
     ( 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="ACTION" | tk="ACTIVE" | tk="ADD" | tk="ADVANCE" | tk="ADVISE" | tk="AGAINST" | tk="ALGORITHM" | tk="ALTER" | tk="ANALYZE" | tk="APPLY" | tk="ARCHIVE" | tk="ARRAY" | tk="ASC" | tk="AT" | tk="AUTHORIZATION" | tk="AUTO" | 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="CS" | tk="CYCLE" | tk="DATA" | tk="DATABASE" | tk="DDL" | tk="DECLARE" | tk="DEFAULT" | 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="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="GUARD" | tk="HASH" | tk="HISTORY" | tk="HOPPING" | tk="INCLUDE" | tk="INCREMENT" | tk="INDEX" | tk="INSERT" | tk="INTERLEAVE" | tk="INTERPRET" | tk="INVALIDATE" | tk="ISNULL" | tk="JSON" | tk="KEEP" | tk="KEY" | tk="KEYS" | tk="LAST" | tk="LEADING" | tk="LINK" | tk="LOCAL" | tk="LOCKED" | tk="LOG" | tk="LOOP" | tk="MATCH" | tk="MATCHED" | tk="MATERIALIZED" | tk="MAXVALUE" | tk="MEMBER" | tk="MERGE" | 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="OVERLAPS" | tk="PARALLEL" | tk="PARENT" | tk="PARTITION" | tk="PATH" | tk="PERCENT" | tk="PLACING" | tk="PRECEDING" | tk="PRECISION" | tk="PRIMARY" | tk="PRIOR" | tk="PURGE" | tk="QUERY" | tk="QUICK" | tk="QUIESCE" | tk="RANGE" | tk="RAW" | tk="READ" | tk="RECYCLEBIN" | tk="REFERENCES" | tk="REFRESH" | tk="REGISTER" | tk="REMOTE" | tk="RENAME" | tk="REPEATABLE" | tk="REPLACE" | tk="RESET" | tk="RESTART" | tk="RESTRICT" | tk="RESTRICTED" | tk="RESUMABLE" | tk="RESUME" | tk="RETURN" | tk="RLIKE" | tk="ROLLBACK" | tk="ROOT" | tk="ROW" | tk="ROWS" | tk="RR" | tk="RS" | tk="SAVEPOINT" | tk="SCHEMA" | 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="SUSPEND" | tk="SWITCH" | tk="SYNONYM" | tk="SYSTEM" | tk="TABLE" | tk="TABLESPACE" | tk="TEMP" | tk="TEMPORARY" | tk="THEN" | tk="TIMEOUT" | tk="TIMESTAMPTZ" | tk="TO" | tk="TRIGGER" | tk="TRUE" | tk="TRUNCATE" | 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="WAIT" | tk="WITHIN" | tk="WITHOUT" | tk="WORK" | tk="XML" | tk="XMLAGG" | tk="XMLDATA" | tk="XMLSCHEMA" | tk="XMLTEXT" | tk="XSINIL" | tk="YAML" | tk="YES" | tk="ZONE" )
+       | tk="ACTION" | tk="ACTIVE" | tk="ADD" | tk="ADVANCE" | tk="ADVISE" | tk="AGAINST" | tk="ALGORITHM" | tk="ALTER" | tk="ANALYZE" | tk="APPLY" | tk="ARCHIVE" | tk="ARRAY" | tk="ASC" | tk="AT" | tk="AUTHORIZATION" | tk="AUTO" | 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="CS" | tk="CYCLE" | tk="DATA" | tk="DATABASE" | tk="DDL" | tk="DECLARE" | tk="DEFAULT" | 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="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="GUARD" | tk="HASH" | tk="HISTORY" | tk="HOPPING" | tk="INCLUDE" | tk="INCREMENT" | tk="INDEX" | tk="INSERT" | tk="INTERLEAVE" | tk="INTERPRET" | tk="INVALIDATE" | tk="ISNULL" | tk="JSON" | tk="KEEP" | tk="KEY" | tk="KEYS" | tk="LAST" | tk="LEADING" | tk="LINK" | tk="LOCAL" | tk="LOCKED" | tk="LOG" | tk="LOOP" | tk="MATCH" | tk="MATCHED" | tk="MATERIALIZED" | tk="MAXVALUE" | tk="MEMBER" | tk="MERGE" | 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="OVERLAPS" | tk="PARALLEL" | tk="PARENT" | tk="PARTITION" | tk="PATH" | tk="PERCENT" | tk="PLACING" | tk="PRECEDING" | tk="PRECISION" | tk="PRIMARY" | tk="PRIOR" | tk="PURGE" | tk="QUERY" | tk="QUICK" | tk="QUIESCE" | tk="RANGE" | tk="RAW" | tk="READ" | tk="RECYCLEBIN" | tk="REFERENCES" | tk="REFRESH" | tk="REGISTER" | tk="REMOTE" | tk="RENAME" | tk="REPEATABLE" | tk="REPLACE" | tk="RESET" | 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="SAVEPOINT" | tk="SCHEMA" | 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="SUSPEND" | tk="SWITCH" | tk="SYNONYM" | tk="SYSTEM" | tk="TABLE" | tk="TABLESPACE" | tk="TEMP" | tk="TEMPORARY" | tk="THEN" | tk="TIMEOUT" | tk="TIMESTAMPTZ" | tk="TO" | tk="TRIGGER" | tk="TRUE" | tk="TRUNCATE" | 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="WAIT" | tk="WITHIN" | tk="WITHOUT" | tk="WORK" | tk="XML" | tk="XMLAGG" | tk="XMLDATA" | tk="XMLSCHEMA" | tk="XMLTEXT" | tk="XSINIL" | tk="YAML" | tk="YES" | tk="ZONE" )
     { return tk.image; }
 }
 
@@ -2984,20 +2985,23 @@ GroupByElement GroupByColumnReferences():
     <K_GROUP> <K_BY>
     (
         LOOKAHEAD(2) (
-            <K_GROUPING> <K_SETS> "("
-            list = GroupingSet() { groupBy.addGroupingSet(list); }
-            (  LOOKAHEAD(2) "," list = GroupingSet() { groupBy.addGroupingSet(list); })*
+            <K_GROUPING> <K_SETS> 
+            "("
+                list = GroupingSet() { groupBy.addGroupingSet(list); }
+                ( LOOKAHEAD(2) "," list = GroupingSet() { groupBy.addGroupingSet(list); })*
             ")"
         )
         |
         (
             list = ExpressionList() { groupBy.setGroupByExpressions(list); }
             (
-                LOOKAHEAD(2) <K_GROUPING> <K_SETS> "("
-                list = GroupingSet() { groupBy.addGroupingSet(list); }
-                (  LOOKAHEAD(2) "," list = GroupingSet() { groupBy.addGroupingSet(list); })*
+                LOOKAHEAD(2) <K_GROUPING> <K_SETS> 
+                "("
+                    list = GroupingSet() { groupBy.addGroupingSet(list); }
+                    ( LOOKAHEAD(2) "," list = GroupingSet() { groupBy.addGroupingSet(list); })*
                 ")"
             )?
+            [ LOOKAHEAD(2) <K_WITH> <K_ROLLUP> { groupBy.setMysqlWithRollup(true); }  ]
         )
     )
     {
@@ -3072,6 +3076,7 @@ OrderByElement OrderByElement():
             )
         ]
     ]
+    [ LOOKAHEAD(2) <K_WITH> <K_ROLLUP> { orderByElement.setMysqlWithRollup(true); } ]
     {
         orderByElement.setExpression(columnReference);
         return orderByElement;
diff --git a/src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java b/src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java
@@ -5795,4 +5795,15 @@ void testBackSlashQuotationIssue1812() throws JSQLParserException {
                 sqlStr, parser -> parser
                         .withBackslashEscapeCharacter(true));
     }
+
+    @Test
+    public void testIssue1907() throws JSQLParserException {
+        String stmt = "SELECT MAX(a, b, c), COUNT(*), D FROM tab1 GROUP BY D WITH ROLLUP";
+        assertSqlCanBeParsedAndDeparsed(stmt);
+
+        // since mysql 8.0.12
+        String stmt2 =
+                "SELECT * FROM (SELECT year, person, SUM(amount) FROM rentals GROUP BY year, person) t1 ORDER BY year DESC WITH ROLLUP";
+        assertSqlCanBeParsedAndDeparsed(stmt2);
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -45,5 +45,9 @@ public void deParse(GroupByElement groupBy) {`
`45`	`45`	`}`
`46`	`46`	`buffer.append(")");`
`47`	`47`	`}`
	`48`	`+`
	`49`	`+ if (groupBy.isMysqlWithRollup()) {`
	`50`	`+ buffer.append(" WITH ROLLUP");`
	`51`	`+ }`
`48`	`52`	`}`
`49`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,6 @@`
`11`	`11`
`12`	`12`	`import java.util.Iterator;`
`13`	`13`	`import java.util.List;`
`14`		`-`
`15`	`14`	`import net.sf.jsqlparser.expression.ExpressionVisitor;`
`16`	`15`	`import net.sf.jsqlparser.statement.select.OrderByElement;`
`17`	`16`
`@@ -58,9 +57,13 @@ public void deParseElement(OrderByElement orderBy) {`
`58`	`57`	`}`
`59`	`58`	`if (orderBy.getNullOrdering() != null) {`
`60`	`59`	`buffer.append(' ');`
`61`		`- buffer.append(orderBy.getNullOrdering() == OrderByElement.NullOrdering.NULLS_FIRST ? "NULLS FIRST"`
	`60`	`+ buffer.append(orderBy.getNullOrdering() == OrderByElement.NullOrdering.NULLS_FIRST`
	`61`	`+ ? "NULLS FIRST"`
`62`	`62`	`: "NULLS LAST");`
`63`	`63`	`}`
	`64`	`+ if (orderBy.isMysqlWithRollup()) {`
	`65`	`+ buffer.append(" WITH ROLLUP");`
	`66`	`+ }`
`64`	`67`	`}`
`65`	`68`
`66`	`69`	`void setExpressionVisitor(ExpressionVisitor expressionVisitor) {`
Original file line number	Diff line number	Diff line change
`@@ -383,6 +383,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */`
`383`	`383`	`\| <K_RETURNING: "RETURNING">`
`384`	`384`	`\| <K_RIGHT:"RIGHT">`
`385`	`385`	`\| <K_ROLLBACK:"ROLLBACK">`
	`386`	`+\| <K_ROLLUP:"ROLLUP">`
`386`	`387`	`\| <K_ROOT:"ROOT">`
`387`	`388`	`\| <K_ROW: "ROW">`
`388`	`389`	`\| <K_ROWS: "ROWS">`
`@@ -1802,7 +1803,7 @@ String RelObjectNameWithoutValue() :`
`1802`	`1803`	`{ Token tk = null; }`
`1803`	`1804`	`{`
`1804`	`1805`	`( 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>`
`1805`		- \| tk="ACTION" \| tk="ACTIVE" \| tk="ADD" \| tk="ADVANCE" \| tk="ADVISE" \| tk="AGAINST" \| tk="ALGORITHM" \| tk="ALTER" \| tk="ANALYZE" \| tk="APPLY" \| tk="ARCHIVE" \| tk="ARRAY" \| tk="ASC" \| tk="AT" \| tk="AUTHORIZATION" \| tk="AUTO" \| 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="CS" \| tk="CYCLE" \| tk="DATA" \| tk="DATABASE" \| tk="DDL" \| tk="DECLARE" \| tk="DEFAULT" \| 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="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="GUARD" \| tk="HASH" \| tk="HISTORY" \| tk="HOPPING" \| tk="INCLUDE" \| tk="INCREMENT" \| tk="INDEX" \| tk="INSERT" \| tk="INTERLEAVE" \| tk="INTERPRET" \| tk="INVALIDATE" \| tk="ISNULL" \| tk="JSON" \| tk="KEEP" \| tk="KEY" \| tk="KEYS" \| tk="LAST" \| tk="LEADING" \| tk="LINK" \| tk="LOCAL" \| tk="LOCKED" \| tk="LOG" \| tk="LOOP" \| tk="MATCH" \| tk="MATCHED" \| tk="MATERIALIZED" \| tk="MAXVALUE" \| tk="MEMBER" \| tk="MERGE" \| 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="OVERLAPS" \| tk="PARALLEL" \| tk="PARENT" \| tk="PARTITION" \| tk="PATH" \| tk="PERCENT" \| tk="PLACING" \| tk="PRECEDING" \| tk="PRECISION" \| tk="PRIMARY" \| tk="PRIOR" \| tk="PURGE" \| tk="QUERY" \| tk="QUICK" \| tk="QUIESCE" \| tk="RANGE" \| tk="RAW" \| tk="READ" \| tk="RECYCLEBIN" \| tk="REFERENCES" \| tk="REFRESH" \| tk="REGISTER" \| tk="REMOTE" \| tk="RENAME" \| tk="REPEATABLE" \| tk="REPLACE" \| tk="RESET" \| tk="RESTART" \| tk="RESTRICT" \| tk="RESTRICTED" \| tk="RESUMABLE" \| tk="RESUME" \| tk="RETURN" \| tk="RLIKE" \| tk="ROLLBACK" \| tk="ROOT" \| tk="ROW" \| tk="ROWS" \| tk="RR" \| tk="RS" \| tk="SAVEPOINT" \| tk="SCHEMA" \| 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="SUSPEND" \| tk="SWITCH" \| tk="SYNONYM" \| tk="SYSTEM" \| tk="TABLE" \| tk="TABLESPACE" \| tk="TEMP" \| tk="TEMPORARY" \| tk="THEN" \| tk="TIMEOUT" \| tk="TIMESTAMPTZ" \| tk="TO" \| tk="TRIGGER" \| tk="TRUE" \| tk="TRUNCATE" \| 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="WAIT" \| tk="WITHIN" \| tk="WITHOUT" \| tk="WORK" \| tk="XML" \| tk="XMLAGG" \| tk="XMLDATA" \| tk="XMLSCHEMA" \| tk="XMLTEXT" \| tk="XSINIL" \| tk="YAML" \| tk="YES" \| tk="ZONE" )
	`1806`	+ \| tk="ACTION" \| tk="ACTIVE" \| tk="ADD" \| tk="ADVANCE" \| tk="ADVISE" \| tk="AGAINST" \| tk="ALGORITHM" \| tk="ALTER" \| tk="ANALYZE" \| tk="APPLY" \| tk="ARCHIVE" \| tk="ARRAY" \| tk="ASC" \| tk="AT" \| tk="AUTHORIZATION" \| tk="AUTO" \| 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="CS" \| tk="CYCLE" \| tk="DATA" \| tk="DATABASE" \| tk="DDL" \| tk="DECLARE" \| tk="DEFAULT" \| 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="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="GUARD" \| tk="HASH" \| tk="HISTORY" \| tk="HOPPING" \| tk="INCLUDE" \| tk="INCREMENT" \| tk="INDEX" \| tk="INSERT" \| tk="INTERLEAVE" \| tk="INTERPRET" \| tk="INVALIDATE" \| tk="ISNULL" \| tk="JSON" \| tk="KEEP" \| tk="KEY" \| tk="KEYS" \| tk="LAST" \| tk="LEADING" \| tk="LINK" \| tk="LOCAL" \| tk="LOCKED" \| tk="LOG" \| tk="LOOP" \| tk="MATCH" \| tk="MATCHED" \| tk="MATERIALIZED" \| tk="MAXVALUE" \| tk="MEMBER" \| tk="MERGE" \| 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="OVERLAPS" \| tk="PARALLEL" \| tk="PARENT" \| tk="PARTITION" \| tk="PATH" \| tk="PERCENT" \| tk="PLACING" \| tk="PRECEDING" \| tk="PRECISION" \| tk="PRIMARY" \| tk="PRIOR" \| tk="PURGE" \| tk="QUERY" \| tk="QUICK" \| tk="QUIESCE" \| tk="RANGE" \| tk="RAW" \| tk="READ" \| tk="RECYCLEBIN" \| tk="REFERENCES" \| tk="REFRESH" \| tk="REGISTER" \| tk="REMOTE" \| tk="RENAME" \| tk="REPEATABLE" \| tk="REPLACE" \| tk="RESET" \| 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="SAVEPOINT" \| tk="SCHEMA" \| 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="SUSPEND" \| tk="SWITCH" \| tk="SYNONYM" \| tk="SYSTEM" \| tk="TABLE" \| tk="TABLESPACE" \| tk="TEMP" \| tk="TEMPORARY" \| tk="THEN" \| tk="TIMEOUT" \| tk="TIMESTAMPTZ" \| tk="TO" \| tk="TRIGGER" \| tk="TRUE" \| tk="TRUNCATE" \| 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="WAIT" \| tk="WITHIN" \| tk="WITHOUT" \| tk="WORK" \| tk="XML" \| tk="XMLAGG" \| tk="XMLDATA" \| tk="XMLSCHEMA" \| tk="XMLTEXT" \| tk="XSINIL" \| tk="YAML" \| tk="YES" \| tk="ZONE" )
`1806`	`1807`	`{ return tk.image; }`
`1807`	`1808`	`}`
`1808`	`1809`
`@@ -2984,20 +2985,23 @@ GroupByElement GroupByColumnReferences():`
`2984`	`2985`	`<K_GROUP> <K_BY>`
`2985`	`2986`	`(`
`2986`	`2987`	`LOOKAHEAD(2) (`
`2987`		`- <K_GROUPING> <K_SETS> "("`
`2988`		`- list = GroupingSet() { groupBy.addGroupingSet(list); }`
`2989`		`- ( LOOKAHEAD(2) "," list = GroupingSet() { groupBy.addGroupingSet(list); })*`
	`2988`	`+ <K_GROUPING> <K_SETS>`
	`2989`	`+ "("`
	`2990`	`+ list = GroupingSet() { groupBy.addGroupingSet(list); }`
	`2991`	`+ ( LOOKAHEAD(2) "," list = GroupingSet() { groupBy.addGroupingSet(list); })*`
`2990`	`2992`	`")"`
`2991`	`2993`	`)`
`2992`	`2994`	`\|`
`2993`	`2995`	`(`
`2994`	`2996`	`list = ExpressionList() { groupBy.setGroupByExpressions(list); }`
`2995`	`2997`	`(`
`2996`		`- LOOKAHEAD(2) <K_GROUPING> <K_SETS> "("`
`2997`		`- list = GroupingSet() { groupBy.addGroupingSet(list); }`
`2998`		`- ( LOOKAHEAD(2) "," list = GroupingSet() { groupBy.addGroupingSet(list); })*`
	`2998`	`+ LOOKAHEAD(2) <K_GROUPING> <K_SETS>`
	`2999`	`+ "("`
	`3000`	`+ list = GroupingSet() { groupBy.addGroupingSet(list); }`
	`3001`	`+ ( LOOKAHEAD(2) "," list = GroupingSet() { groupBy.addGroupingSet(list); })*`
`2999`	`3002`	`")"`
`3000`	`3003`	`)?`
	`3004`	`+ [ LOOKAHEAD(2) <K_WITH> <K_ROLLUP> { groupBy.setMysqlWithRollup(true); } ]`
`3001`	`3005`	`)`
`3002`	`3006`	`)`
`3003`	`3007`	`{`
`@@ -3072,6 +3076,7 @@ OrderByElement OrderByElement():`
`3072`	`3076`	`)`
`3073`	`3077`	`]`
`3074`	`3078`	`]`
	`3079`	`+ [ LOOKAHEAD(2) <K_WITH> <K_ROLLUP> { orderByElement.setMysqlWithRollup(true); } ]`
`3075`	`3080`	`{`
`3076`	`3081`	`orderByElement.setExpression(columnReference);`
`3077`	`3082`	`return orderByElement;`