From d7ffb56ad668d08d5f33bcb2d55708a77f6146cb Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@gmail.com>
Date: Fri, 24 Mar 2023 11:45:07 +0100
Subject: [PATCH] [jOOQ/jOOQ#14849] ROLLUP, CUBE should generate Keyword, not
 Name

---
 jOOQ/src/main/java/org/jooq/impl/Cube.java     | 4 ++--
 jOOQ/src/main/java/org/jooq/impl/Keywords.java | 2 ++
 jOOQ/src/main/java/org/jooq/impl/Rollup.java   | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/jOOQ/src/main/java/org/jooq/impl/Cube.java b/jOOQ/src/main/java/org/jooq/impl/Cube.java
index 9fa439129e..ca4057a7f5 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Cube.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Cube.java
@@ -37,6 +37,7 @@
  */
 package org.jooq.impl;
 
+import static org.jooq.impl.Keywords.K_CUBE;
 import static org.jooq.impl.Names.N_CUBE;
 import static org.jooq.impl.SQLDataType.OTHER;
 import static org.jooq.impl.Tools.EMPTY_FIELD_OR_ROW;
@@ -44,7 +45,6 @@ import static org.jooq.impl.Tools.EMPTY_FIELD_OR_ROW;
 import org.jooq.Context;
 import org.jooq.FieldOrRow;
 import org.jooq.Function1;
-import org.jooq.GroupField;
 import org.jooq.impl.QOM.UnmodifiableList;
 
 /**
@@ -62,7 +62,7 @@ final class Cube extends AbstractField<Object> implements QOM.Cube {
 
     @Override
     public final void accept(Context<?> ctx) {
-        ctx.visit(N_CUBE).sql(" (").visit(arguments).sql(')');
+        ctx.visit(K_CUBE).sql(" (").visit(arguments).sql(')');
     }
 
     // -------------------------------------------------------------------------
diff --git a/jOOQ/src/main/java/org/jooq/impl/Keywords.java b/jOOQ/src/main/java/org/jooq/impl/Keywords.java
index 873757e3da..99f583e066 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Keywords.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Keywords.java
@@ -107,6 +107,7 @@ final class Keywords {
     static final Keyword K_COUNT                    = keyword("count");
     static final Keyword K_CREATE                   = keyword("create");
     static final Keyword K_CROSS_JOIN_LATERAL       = keyword("cross join lateral");
+    static final Keyword K_CUBE                     = keyword("cube");
     static final Keyword K_CURRENT                  = keyword("current");
     static final Keyword K_CURRENT_ROW              = keyword("current row");
     static final Keyword K_CURRENT_SCHEMA           = keyword("current_schema");
@@ -366,6 +367,7 @@ final class Keywords {
     static final Keyword K_REVERSE                  = keyword("reverse");
     static final Keyword K_REVOKE                   = keyword("revoke");
     static final Keyword K_ROLLBACK                 = keyword("rollback");
+    static final Keyword K_ROLLUP                   = keyword("rollup");
     static final Keyword K_ROOT                     = keyword("root");
     static final Keyword K_ROW                      = keyword("row");
     static final Keyword K_ROWCOUNT                 = keyword("rowcount");
diff --git a/jOOQ/src/main/java/org/jooq/impl/Rollup.java b/jOOQ/src/main/java/org/jooq/impl/Rollup.java
index 8221c23aa8..42542b8dd3 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Rollup.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Rollup.java
@@ -41,6 +41,7 @@ package org.jooq.impl;
 import static org.jooq.SQLDialect.CUBRID;
 import static org.jooq.SQLDialect.MARIADB;
 import static org.jooq.SQLDialect.MYSQL;
+import static org.jooq.impl.Keywords.K_ROLLUP;
 import static org.jooq.impl.Keywords.K_WITH_ROLLUP;
 import static org.jooq.impl.Names.N_ROLLUP;
 import static org.jooq.impl.SQLDataType.OTHER;
@@ -78,7 +79,7 @@ final class Rollup extends AbstractField<Object> implements QOM.Rollup {
                .visit(K_WITH_ROLLUP);
         }
         else
-            ctx.visit(N_ROLLUP).sql(" (").visit(arguments).sql(')');
+            ctx.visit(K_ROLLUP).sql(" (").visit(arguments).sql(')');
     }
 
     // -------------------------------------------------------------------------