diff --git a/jOOQ/src/main/java/org/jooq/impl/Multiset.java b/jOOQ/src/main/java/org/jooq/impl/Multiset.java index 08e6b09c08..1f4349f726 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Multiset.java +++ b/jOOQ/src/main/java/org/jooq/impl/Multiset.java @@ -60,7 +60,6 @@ import static org.jooq.impl.Names.N_RESULT; import static org.jooq.impl.SQLDataType.VARCHAR; import static org.jooq.impl.Tools.emulateMultiset; import static org.jooq.impl.Tools.fieldName; -import static org.jooq.impl.Tools.fieldNames; import static org.jooq.impl.Tools.map; import static org.jooq.impl.Tools.visitSubquery; import static org.jooq.impl.Tools.BooleanDataKey.DATA_MULTISET_CONDITION; @@ -69,6 +68,7 @@ import java.util.Set; import org.jooq.AggregateFilterStep; import org.jooq.Context; +import org.jooq.Field; import org.jooq.Fields; import org.jooq.JSON; import org.jooq.JSONArrayAggOrderByStep; @@ -82,8 +82,6 @@ import org.jooq.Table; import org.jooq.XML; import org.jooq.XMLAggOrderByStep; -import org.jetbrains.annotations.NotNull; - /** * @author Lukas Eder */ @@ -126,6 +124,8 @@ final class Multiset extends AbstractField> { private final void accept0(Context ctx, boolean multisetCondition) { switch (emulateMultiset(ctx.configuration())) { case JSON: { + Table t = select.asTable("t"); + switch (ctx.family()) { @@ -136,10 +136,7 @@ final class Multiset extends AbstractField> { - default: { - Table t = select.asTable("t"); - JSONArrayAggOrderByStep order; AggregateFilterStep filter; @@ -163,6 +160,8 @@ final class Multiset extends AbstractField> { } case JSONB: { + Table t = select.asTable("t"); + switch (ctx.family()) { @@ -173,10 +172,7 @@ final class Multiset extends AbstractField> { - default: { - Table t = select.asTable("t"); - JSONArrayAggOrderByStep order; AggregateFilterStep filter; @@ -196,6 +192,8 @@ final class Multiset extends AbstractField> { } case XML: { + Table t = select.asTable("t"); + switch (ctx.family()) { @@ -210,9 +208,8 @@ final class Multiset extends AbstractField> { - default: { - Table t = select.asTable("t"); + default: { XMLAggOrderByStep order; AggregateFilterStep filter; diff --git a/jOOQ/src/main/java/org/jooq/impl/Tools.java b/jOOQ/src/main/java/org/jooq/impl/Tools.java index 4888c278ab..0b992fd3fc 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Tools.java +++ b/jOOQ/src/main/java/org/jooq/impl/Tools.java @@ -60,6 +60,7 @@ import static org.jooq.SQLDialect.MARIADB; // ... import static org.jooq.SQLDialect.MYSQL; // ... +// ... import static org.jooq.SQLDialect.POSTGRES; // ... // ... @@ -68,6 +69,7 @@ import static org.jooq.SQLDialect.SQLITE; // ... // ... // ... +// ... import static org.jooq.conf.BackslashEscaping.DEFAULT; import static org.jooq.conf.BackslashEscaping.ON; import static org.jooq.conf.ParamType.INLINED; @@ -5795,6 +5797,16 @@ final class Tools { + + + + + + + + + + default: return NestedCollectionEmulation.NATIVE; }