[jOOQ/jOOQ#14849] ROLLUP, CUBE should generate Keyword, not Name

This commit is contained in:
Lukas Eder 2023-03-24 11:45:07 +01:00
parent 314fa82d1a
commit d7ffb56ad6
3 changed files with 6 additions and 3 deletions

View File

@ -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(')');
}
// -------------------------------------------------------------------------

View File

@ -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");

View File

@ -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(')');
}
// -------------------------------------------------------------------------