From dc2554caed2e703425141bd5888d81e8e3f69c20 Mon Sep 17 00:00:00 2001 From: Knut Wannheden Date: Thu, 27 Feb 2020 14:21:17 +0100 Subject: [PATCH] [jOOQ/jOOQ#9894] DB2: Support more standard aggregate functions --- jOOQ/src/main/java/org/jooq/impl/Function.java | 8 +++++--- jOOQ/src/main/java/org/jooq/impl/Term.java | 5 ----- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/jOOQ/src/main/java/org/jooq/impl/Function.java b/jOOQ/src/main/java/org/jooq/impl/Function.java index f1e6d23078..3e5512bfd8 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Function.java +++ b/jOOQ/src/main/java/org/jooq/impl/Function.java @@ -171,6 +171,8 @@ class Function extends AbstractField implements + + static final Field ASTERISK = DSL.field("*", Integer.class); // Mutually exclusive attributes: super.getName(), this.name, this.term @@ -240,15 +242,15 @@ class Function extends AbstractField implements @Override public /* final */ void accept(Context ctx) { - if (term == ARRAY_AGG && SUPPORT_ARRAY_AGG.contains(ctx.family())) { + if (term == ARRAY_AGG && SUPPORT_ARRAY_AGG.contains(ctx.dialect())) { toSQLGroupConcat(ctx); toSQLFilterClause(ctx); toSQLOverClause(ctx); } - else if (term == LIST_AGG && SUPPORT_GROUP_CONCAT.contains(ctx.family())) { + else if (term == LIST_AGG && SUPPORT_GROUP_CONCAT.contains(ctx.dialect())) { toSQLGroupConcat(ctx); } - else if (term == LIST_AGG && SUPPORT_STRING_AGG .contains(ctx.family())) { + else if (term == LIST_AGG && SUPPORT_STRING_AGG .contains(ctx.dialect())) { toSQLStringAgg(ctx); toSQLFilterClause(ctx); toSQLOverClause(ctx); diff --git a/jOOQ/src/main/java/org/jooq/impl/Term.java b/jOOQ/src/main/java/org/jooq/impl/Term.java index ffe7c05afa..f3e038de23 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Term.java +++ b/jOOQ/src/main/java/org/jooq/impl/Term.java @@ -146,11 +146,6 @@ enum Term { - - - - - case CUBRID: case H2: case HSQLDB: