From 7e88f67c7c9fefcaea46c4d3bedbf528f2e667df Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Mon, 6 Feb 2023 09:04:01 +0100 Subject: [PATCH] [jOOQ/jOOQ#9085] Generate FILTER clause by default --- .../java/org/jooq/impl/AbstractAggregateFunction.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractAggregateFunction.java b/jOOQ/src/main/java/org/jooq/impl/AbstractAggregateFunction.java index d98e161454..b2028cabce 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AbstractAggregateFunction.java +++ b/jOOQ/src/main/java/org/jooq/impl/AbstractAggregateFunction.java @@ -42,7 +42,7 @@ import static java.util.function.Function.identity; // ... // ... // ... -// ... +import static org.jooq.SQLDialect.*; import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; @@ -112,7 +112,7 @@ implements - static final Set SUPPORT_FILTER = SQLDialect.supportedBy(FIREBIRD, H2, HSQLDB, POSTGRES, SQLITE, YUGABYTEDB); + static final Set NO_SUPPORT_FILTER = SQLDialect.supportedUntil(CUBRID, DERBY, IGNITE, MARIADB, MYSQL); static final Set SUPPORT_DISTINCT_RVE = SQLDialect.supportedBy(H2, POSTGRES); static final Field ASTERISK = DSL.field(DSL.raw("*"), Integer.class); @@ -285,7 +285,7 @@ implements } final void acceptArguments3(Context ctx, QueryPartCollectionView> args, Function, ? extends Field> fun) { - if (!filter.hasWhere() || SUPPORT_FILTER.contains(ctx.dialect())) + if (!filter.hasWhere() || !NO_SUPPORT_FILTER.contains(ctx.dialect())) ctx.visit(wrap(args).map(fun)); @@ -326,7 +326,7 @@ implements default: - if (SUPPORT_FILTER.contains(ctx.dialect())) + if (!NO_SUPPORT_FILTER.contains(ctx.dialect())) ctx.sql(' ') .visit(K_FILTER) .sql(" (")