From 0e67112dbc348f84dcbe5d25f8507c6d0eaa1176 Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Mon, 20 Feb 2023 09:30:24 +0100 Subject: [PATCH] [jOOQ/jOOQ#14653] Fix regression in MariaDB's JSON_OBJECTAGG --- .../main/java/org/jooq/impl/AbstractAggregateFunction.java | 4 ++-- jOOQ/src/main/java/org/jooq/impl/JSONObjectAgg.java | 5 +++++ jOOQ/src/main/java/org/jooq/impl/ListAgg.java | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractAggregateFunction.java b/jOOQ/src/main/java/org/jooq/impl/AbstractAggregateFunction.java index b2028cabce..07f93619a0 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AbstractAggregateFunction.java +++ b/jOOQ/src/main/java/org/jooq/impl/AbstractAggregateFunction.java @@ -292,10 +292,10 @@ implements else - ctx.visit(wrap(args).map((arg, i) -> applyFilter(arg, i) ? DSL.when(filter, arg == ASTERISK ? one() : arg) : arg).map(fun)); + ctx.visit(wrap(args).map((arg, i) -> applyFilter(ctx, arg, i) ? DSL.when(filter, arg == ASTERISK ? one() : arg) : arg).map(fun)); } - boolean applyFilter(Field arg, int i) { + boolean applyFilter(Context ctx, Field arg, int i) { return true; } diff --git a/jOOQ/src/main/java/org/jooq/impl/JSONObjectAgg.java b/jOOQ/src/main/java/org/jooq/impl/JSONObjectAgg.java index 49c2737e86..354f475029 100644 --- a/jOOQ/src/main/java/org/jooq/impl/JSONObjectAgg.java +++ b/jOOQ/src/main/java/org/jooq/impl/JSONObjectAgg.java @@ -181,6 +181,11 @@ implements + + + + + diff --git a/jOOQ/src/main/java/org/jooq/impl/ListAgg.java b/jOOQ/src/main/java/org/jooq/impl/ListAgg.java index 9860f9434c..ce513bb39f 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ListAgg.java +++ b/jOOQ/src/main/java/org/jooq/impl/ListAgg.java @@ -166,7 +166,7 @@ final class ListAgg extends AbstractAggregateFunction implements UNotYet } @Override - boolean applyFilter(Field arg, int i) { + boolean applyFilter(Context ctx, Field arg, int i) { return i == 0; }