github/jooq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[jOOQ/jOOQ#17074] Fix JSON_OBJECTAGG() window function

Browse Source 
The ARRAY_AGG() window function cannot have an aggregate ORDER BY clause, but we don't really need it when we aggregate entries in a single aggregation, rather than aggregating keys and values separately.
This commit is contained in:
Lukas Eder 2024-08-15 12:23:14 +02:00
parent 44f386e7f3
commit 827f103fa1
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
jOOQ/src/main/java/org/jooq/impl/JSONObjectAgg.java
View File

@ -51,6 +51,7 @@ import static org.jooq.impl.Keywords.K_NESTED;
import static org.jooq.impl.Keywords.K_ORDER_BY;
import static org.jooq.impl.Keywords.K_PATH;
import static org.jooq.impl.Keywords.K_REPLACE;
import static org.jooq.impl.Keywords.K_ROW;
import static org.jooq.impl.Names.N_ARRAY_AGG;
import static org.jooq.impl.Names.N_CAST;
import static org.jooq.impl.Names.N_FIELD;
@ -63,6 +64,7 @@ import static org.jooq.impl.Names.N_JSON_STRIP_NULLS;
import static org.jooq.impl.Names.N_JSON_TRANSFORM;
import static org.jooq.impl.Names.N_MAP;
import static org.jooq.impl.Names.N_MAP_FILTER;
import static org.jooq.impl.Names.N_MAP_FROM_ENTRIES;
import static org.jooq.impl.Names.N_OBJECT_AGG;
import static org.jooq.impl.Names.N_T;
import static org.jooq.impl.Names.N_TO_JSON;
@ -196,26 +198,20 @@ implements
private final void acceptDuckDB(Context<?> ctx) {
ctx.visit(N_TO_JSON).sql('(');
ctx.visit(N_MAP).sql('(');
acceptDuckDBArrayAgg(ctx, entry.key(), entry.value());
ctx.sql(", ");
acceptDuckDBArrayAgg(ctx, entry.value(), entry.value());
ctx.sql(')');
ctx.sql(')');
}
private final void acceptDuckDBArrayAgg(Context<?> ctx, Field<?> f1, Field<?> f2) {
ctx.visit(N_MAP_FROM_ENTRIES).sql('(');
ctx.visit(N_ARRAY_AGG).sql('(');
ctx.visit(jsonCast(ctx, f1));
ctx.sql(' ').visit(K_ORDER_BY).sql(' ').visit(entry.key());
ctx.sql(")");
ctx.visit(K_ROW).sql('(').visit(entry.key()).sql(", ").visit(jsonCast(ctx, entry.value())).sql(')');
ctx.sql(')');
if (onNull == ABSENT_ON_NULL)
acceptFilterClause(ctx, f(f2.isNotNull()));
acceptFilterClause(ctx, f(entry.value().isNotNull()));
else
acceptFilterClause(ctx);
acceptOverClause(ctx);
ctx.sql(')');
ctx.sql(')');
}
private final void acceptTrino(Context<?> ctx) {