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

[jOOQ/jOOQ#3884] MULTISET via SQL/JSON emulation must use RETURNING CLOB

Browse Source
This commit is contained in:
Lukas Eder 2021-07-01 12:56:31 +02:00
parent 1cd01abeec
commit 6cf495cefa
2 changed files with 74 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -59,6 +59,7 @@ import static org.jooq.impl.Keywords.K_MULTISET;
import static org.jooq.impl.Names.N_MULTISET;
import static org.jooq.impl.Names.N_RECORD;
import static org.jooq.impl.Names.N_RESULT;
import static org.jooq.impl.SQLDataType.CLOB;
import static org.jooq.impl.SQLDataType.VARCHAR;
import static org.jooq.impl.Tools.emulateMultiset;
import static org.jooq.impl.Tools.fieldName;
@ -74,11 +75,15 @@ import org.jooq.Field;
import org.jooq.Fields;
import org.jooq.JSON;
import org.jooq.JSONArrayAggOrderByStep;
import org.jooq.JSONArrayAggReturningStep;
import org.jooq.JSONArrayReturningStep;
import org.jooq.JSONB;
import org.jooq.JSONObjectReturningStep;
import org.jooq.Record;
import org.jooq.Record1;
import org.jooq.Result;
import org.jooq.SQLDialect;
import org.jooq.Scope;
import org.jooq.Select;
import org.jooq.Table;
import org.jooq.XML;
@ -140,17 +145,20 @@ final class Multiset<R extends Record> extends AbstractField<Result<R>> {
default: {
JSONArrayAggOrderByStep<JSON> order;
AggregateFilterStep<JSON> filter;
JSONArrayAggReturningStep<JSON> returning;
filter = order = jsonArrayaggEmulation(t, multisetCondition);
returning = order = jsonArrayaggEmulation(ctx, t, multisetCondition);
// TODO: Re-apply derived table's ORDER BY clause as aggregate ORDER BY
if (multisetCondition)
filter = order.orderBy(t.fields());
returning = order.orderBy(t.fields());
Select<Record1<JSON>> s = patchOracleArrayAggBug(
ctx.configuration(),
select(DSL.coalesce(filter, jsonArray())).from(t)
select(DSL.coalesce(
returningClob(ctx, returning),
returningClob(ctx, jsonArray())
)).from(t)
);
if (multisetCondition && NO_SUPPORT_JSON_COMPARE.contains(ctx.dialect()))
@ -180,17 +188,20 @@ final class Multiset<R extends Record> extends AbstractField<Result<R>> {
default: {
JSONArrayAggOrderByStep<JSONB> order;
AggregateFilterStep<JSONB> filter;
JSONArrayAggReturningStep<JSONB> returning;
filter = order = jsonbArrayaggEmulation(t, multisetCondition);
returning = order = jsonbArrayaggEmulation(ctx, t, multisetCondition);
// TODO: Re-apply derived table's ORDER BY clause as aggregate ORDER BY
if (multisetCondition)
filter = order.orderBy(t.fields());
returning = order.orderBy(t.fields());
Select<Record1<JSONB>> s = patchOracleArrayAggBug(
ctx.configuration(),
select(DSL.coalesce(filter, jsonbArray())).from(t)
select(DSL.coalesce(
returningClob(ctx, returning),
returningClob(ctx, jsonbArray())
)).from(t)
);
visitSubquery(ctx, s, true);
@ -249,12 +260,56 @@ final class Multiset<R extends Record> extends AbstractField<Result<R>> {
}
}
static final JSONArrayAggOrderByStep<JSON> jsonArrayaggEmulation(Fields fields, boolean multisetCondition) {
return jsonArrayAgg(jsonObject(map(fields.fields(), (f, i) -> jsonEntry(multisetCondition ? Tools.fieldNameString(i) : f.getName(), f))));
static final <J> Field<J> returningClob(Scope ctx, JSONObjectReturningStep<J> jsonObject) {
switch (ctx.family()) {
default:
return jsonObject;
}
}
static final JSONArrayAggOrderByStep<JSONB> jsonbArrayaggEmulation(Fields fields, boolean multisetCondition) {
return jsonbArrayAgg(jsonbObject(map(fields.fields(), (f, i) -> jsonEntry(multisetCondition ? Tools.fieldNameString(i) : f.getName(), f))));
static final <J> Field<J> returningClob(Scope ctx, JSONArrayReturningStep<J> jsonArray) {
switch (ctx.family()) {
default:
return jsonArray;
}
}
static final <J> Field<J> returningClob(Scope ctx, JSONArrayAggReturningStep<J> jsonArrayagg) {
switch (ctx.family()) {
default:
return jsonArrayagg;
}
}
static final JSONArrayAggOrderByStep<JSON> jsonArrayaggEmulation(Scope ctx, Fields fields, boolean multisetCondition) {
return jsonArrayAgg(
returningClob(ctx, jsonObject(
map(fields.fields(), (f, i) -> jsonEntry(multisetCondition ? Tools.fieldNameString(i) : f.getName(), f))
))
);
}
static final JSONArrayAggOrderByStep<JSONB> jsonbArrayaggEmulation(Scope ctx, Fields fields, boolean multisetCondition) {
return jsonbArrayAgg(
returningClob(ctx, jsonbObject(
map(fields.fields(), (f, i) -> jsonEntry(multisetCondition ? Tools.fieldNameString(i) : f.getName(), f))
))
);
}
static final XMLAggOrderByStep<XML> xmlaggEmulation(Fields fields, boolean multisetCondition) {

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

@ -49,6 +49,7 @@ import static org.jooq.impl.Multiset.NO_SUPPORT_JSON_COMPARE;
import static org.jooq.impl.Multiset.NO_SUPPORT_XML_COMPARE;
import static org.jooq.impl.Multiset.jsonArrayaggEmulation;
import static org.jooq.impl.Multiset.jsonbArrayaggEmulation;
import static org.jooq.impl.Multiset.returningClob;
import static org.jooq.impl.Multiset.xmlaggEmulation;
import static org.jooq.impl.Names.N_MULTISET_AGG;
import static org.jooq.impl.Names.N_RECORD;
@ -112,12 +113,11 @@ final class MultisetAgg<R extends Record> extends DefaultAggregateFunction<Resul
private final void accept0(Context<?> ctx, boolean multisetCondition) {
switch (emulateMultiset(ctx.configuration())) {
case JSON: {
JSONArrayAggOrderByStep<JSON> order = jsonArrayaggEmulation(row, multisetCondition);
JSONArrayAggOrderByStep<JSON> order = jsonArrayaggEmulation(ctx, row, multisetCondition);
Field<?> f = multisetCondition
? fo((AbstractAggregateFunction<?>) order.orderBy(row.fields()))
: ofo((AbstractAggregateFunction<?>) order);
? fo((AbstractAggregateFunction<?>) returningClob(ctx, order.orderBy(row.fields())))
: ofo((AbstractAggregateFunction<?>) returningClob(ctx, order));
if (multisetCondition && NO_SUPPORT_JSON_COMPARE.contains(ctx.dialect()))
ctx.visit(f.cast(VARCHAR));
@ -128,11 +128,11 @@ final class MultisetAgg<R extends Record> extends DefaultAggregateFunction<Resul
}
case JSONB: {
JSONArrayAggOrderByStep<JSONB> order = jsonbArrayaggEmulation(row, multisetCondition);
JSONArrayAggOrderByStep<JSONB> order = jsonbArrayaggEmulation(ctx, row, multisetCondition);
Field<?> f = multisetCondition
? fo((AbstractAggregateFunction<?>) order.orderBy(row.fields()))
: ofo((AbstractAggregateFunction<?>) order);
? fo((AbstractAggregateFunction<?>) returningClob(ctx, order.orderBy(row.fields())))
: ofo((AbstractAggregateFunction<?>) returningClob(ctx, order));
ctx.visit(f);
break;