From 10e7cc3ecdf15e3d578ea406ccbd8e92dd21440a Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Thu, 2 May 2024 14:35:55 +0200 Subject: [PATCH] [jOOQ/jOOQ#7539] Support FILTER () and OVER () with JSON_ARRAYAGG --- jOOQ/src/main/java/org/jooq/impl/JSONArrayAgg.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/jOOQ/src/main/java/org/jooq/impl/JSONArrayAgg.java b/jOOQ/src/main/java/org/jooq/impl/JSONArrayAgg.java index ffecbad239..67da581b8c 100644 --- a/jOOQ/src/main/java/org/jooq/impl/JSONArrayAgg.java +++ b/jOOQ/src/main/java/org/jooq/impl/JSONArrayAgg.java @@ -79,6 +79,7 @@ import static org.jooq.impl.Tools.BooleanDataKey.DATA_FORCE_CASE_ELSE_NULL; import java.util.Collection; import java.util.Set; +import org.jooq.AggregateFilterStep; import org.jooq.Context; import org.jooq.DataType; import org.jooq.Field; @@ -294,11 +295,11 @@ implements ); } - static final Field arrayAggEmulation(boolean distinct, Field field, SortFieldList orderBy) { - return Tools.apply( - distinct ? arrayAggDistinct(field) : arrayAgg(field), - agg -> Tools.isEmpty(orderBy) ? agg : agg.orderBy(orderBy) - ); + final Field arrayAggEmulation(boolean d, Field field, SortFieldList orderBy) { + return fo(Tools.apply( + d ? arrayAggDistinct(field) : arrayAgg(field), + agg -> (AggregateFilterStep) (Tools.isEmpty(orderBy) ? agg : agg.orderBy(orderBy)) + )); }