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

[jOOQ/jOOQ#12045] Simplified MULTISET emulation with DISTINCT

Browse Source 
Thanks to [jOOQ/jOOQ#10730], we can now also implement the simplified
MULTISET emulation with subqueries containing the DISTINCT clause
This commit is contained in:
Lukas Eder 2022-09-14 13:00:24 +02:00
parent e913ce8d76
commit 5b4a3b0cb2
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
jOOQ/src/main/java/org/jooq/impl/Multiset.java
View File

@ -188,13 +188,14 @@ final class Multiset<R extends Record> extends AbstractField<Result<R>> implemen
default: {
if (NO_SUPPORT_CORRELATED_DERIVED_TABLE.contains(ctx.dialect()) && isSimple(select)) {
JSONArrayAggReturningStep<JSON> returning =
jsonArrayaggEmulation(ctx, row(map(select.getSelect(), f -> Tools.unalias(f))), true).orderBy(select.$orderBy());
jsonArrayaggEmulation(ctx, row(map(select.getSelect(), f -> Tools.unalias(f))), true, select.$distinct()).orderBy(select.$orderBy());
Select<?> s = select
.$select(Arrays.asList(DSL.coalesce(
returningClob(ctx, returning),
returningClob(ctx, jsonArray())
)))
.$distinct(false)
.$orderBy(Arrays.asList());
visitSubquery(ctx, s);
@ -203,7 +204,7 @@ final class Multiset<R extends Record> extends AbstractField<Result<R>> implemen
JSONArrayAggOrderByStep<JSON> order;
JSONArrayAggReturningStep<JSON> returning;
returning = order = jsonArrayaggEmulation(ctx, t, true);
returning = order = jsonArrayaggEmulation(ctx, t, true, false);
// TODO: Re-apply derived table's ORDER BY clause as aggregate ORDER BY
if (multisetCondition)
@ -254,13 +255,14 @@ final class Multiset<R extends Record> extends AbstractField<Result<R>> implemen
default: {
if (NO_SUPPORT_CORRELATED_DERIVED_TABLE.contains(ctx.dialect()) && isSimple(select)) {
JSONArrayAggReturningStep<JSONB> returning =
jsonbArrayaggEmulation(ctx, row(map(select.getSelect(), f -> Tools.unalias(f))), true).orderBy(select.$orderBy());
jsonbArrayaggEmulation(ctx, row(map(select.getSelect(), f -> Tools.unalias(f))), true, select.$distinct()).orderBy(select.$orderBy());
Select<?> s = select
.$select(Arrays.asList(DSL.coalesce(
returningClob(ctx, returning),
returningClob(ctx, jsonArray())
)))
.$distinct(false)
.$orderBy(Arrays.asList());
visitSubquery(ctx, s);
@ -269,7 +271,7 @@ final class Multiset<R extends Record> extends AbstractField<Result<R>> implemen
JSONArrayAggOrderByStep<JSONB> order;
JSONArrayAggReturningStep<JSONB> returning;
returning = order = jsonbArrayaggEmulation(ctx, t, false);
returning = order = jsonbArrayaggEmulation(ctx, t, false, false);
// TODO: Re-apply derived table's ORDER BY clause as aggregate ORDER BY
if (multisetCondition)
@ -320,7 +322,7 @@ final class Multiset<R extends Record> extends AbstractField<Result<R>> implemen
default: {
if (NO_SUPPORT_CORRELATED_DERIVED_TABLE.contains(ctx.dialect()) && isSimple(select)) {
if (NO_SUPPORT_CORRELATED_DERIVED_TABLE.contains(ctx.dialect()) && isSimple(select) && !select.$distinct()) {
AggregateFilterStep<XML> filter =
xmlaggEmulation(ctx, row(map(select.getSelect(), f -> Tools.unalias(f))), true).orderBy(select.$orderBy());
@ -367,9 +369,6 @@ final class Multiset<R extends Record> extends AbstractField<Result<R>> implemen
&& s.$having() == null
&& s.$window().isEmpty()
&& s.$qualify() == null
// [#10730] [#12045] TODO: This could be supported
&& !s.$distinct()
&& !selectQueryImpl(s).hasUnions()
&& s.$offset() == null
&& s.$limit() == null
@ -448,12 +447,12 @@ final class Multiset<R extends Record> extends AbstractField<Result<R>> implemen
// - It is column name agnostic (supporting ambiguous column names)
// - The JSON never leaks outside of the emulation into user code
static final JSONArrayAggOrderByStep<JSON> jsonArrayaggEmulation(Context<?> ctx, Fields fields, boolean agg) {
return jsonxArrayaggEmulation(ctx, fields, agg, DSL::jsonArrayAgg, DSL::jsonObject, DSL::jsonArray);
static final JSONArrayAggOrderByStep<JSON> jsonArrayaggEmulation(Context<?> ctx, Fields fields, boolean agg, boolean distinct) {
return jsonxArrayaggEmulation(ctx, fields, agg, distinct ? DSL::jsonArrayAggDistinct : DSL::jsonArrayAgg, DSL::jsonObject, DSL::jsonArray);
}
static final JSONArrayAggOrderByStep<JSONB> jsonbArrayaggEmulation(Context<?> ctx, Fields fields, boolean agg) {
return jsonxArrayaggEmulation(ctx, fields, agg, DSL::jsonbArrayAgg, DSL::jsonbObject, DSL::jsonbArray);
static final JSONArrayAggOrderByStep<JSONB> jsonbArrayaggEmulation(Context<?> ctx, Fields fields, boolean agg, boolean distinct) {
return jsonxArrayaggEmulation(ctx, fields, agg, distinct ? DSL::jsonbArrayAggDistinct : DSL::jsonbArrayAgg, DSL::jsonbObject, DSL::jsonbArray);
}
static final <J> JSONArrayAggOrderByStep<J> jsonxArrayaggEmulation(

4
jOOQ/src/main/java/org/jooq/impl/MultisetAgg.java
View File

@ -115,7 +115,7 @@ final class MultisetAgg<R extends Record> extends AbstractAggregateFunction<Resu
private final void accept0(Context<?> ctx, boolean multisetCondition) {
switch (emulateMultiset(ctx.configuration())) {
case JSON: {
JSONArrayAggOrderByStep<JSON> order = jsonArrayaggEmulation(ctx, row, true);
JSONArrayAggOrderByStep<JSON> order = jsonArrayaggEmulation(ctx, row, true, false);
Field<?> f = multisetCondition
? fo((AbstractAggregateFunction<?>) returningClob(ctx, order.orderBy(row.fields())))
@ -130,7 +130,7 @@ final class MultisetAgg<R extends Record> extends AbstractAggregateFunction<Resu
}
case JSONB: {
JSONArrayAggOrderByStep<JSONB> order = jsonbArrayaggEmulation(ctx, row, true);
JSONArrayAggOrderByStep<JSONB> order = jsonbArrayaggEmulation(ctx, row, true, false);
Field<?> f = multisetCondition
? fo((AbstractAggregateFunction<?>) returningClob(ctx, order.orderBy(row.fields())))