From efb4979033a32378beb83db7e0d1fd51ef74ad7a Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Wed, 29 Apr 2020 10:24:06 +0200 Subject: [PATCH] [jOOQ/jOOQ#10015] Use QueryPartListView.wrap instead --- jOOQ/src/main/java/org/jooq/impl/ArrayAgg.java | 3 ++- jOOQ/src/main/java/org/jooq/impl/Collect.java | 1 + jOOQ/src/main/java/org/jooq/impl/ConstraintImpl.java | 9 +++++---- jOOQ/src/main/java/org/jooq/impl/CreateIndexImpl.java | 3 ++- jOOQ/src/main/java/org/jooq/impl/CreateViewImpl.java | 3 ++- .../main/java/org/jooq/impl/EmbeddableTableField.java | 3 ++- jOOQ/src/main/java/org/jooq/impl/Expression.java | 5 +++-- jOOQ/src/main/java/org/jooq/impl/Fields.java | 3 ++- jOOQ/src/main/java/org/jooq/impl/JSONArray.java | 3 ++- jOOQ/src/main/java/org/jooq/impl/JSONObject.java | 3 ++- jOOQ/src/main/java/org/jooq/impl/ListAgg.java | 3 ++- jOOQ/src/main/java/org/jooq/impl/TableImpl.java | 5 +++-- jOOQ/src/main/java/org/jooq/impl/Val.java | 3 ++- 13 files changed, 30 insertions(+), 17 deletions(-) diff --git a/jOOQ/src/main/java/org/jooq/impl/ArrayAgg.java b/jOOQ/src/main/java/org/jooq/impl/ArrayAgg.java index 66dacc26d7..bca1a3e7fd 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ArrayAgg.java +++ b/jOOQ/src/main/java/org/jooq/impl/ArrayAgg.java @@ -38,6 +38,7 @@ package org.jooq.impl; import static org.jooq.impl.Names.N_ARRAY_AGG; +import static org.jooq.impl.QueryPartListView.wrap; import org.jooq.Context; import org.jooq.Field; @@ -59,7 +60,7 @@ final class ArrayAgg extends DefaultAggregateFunction { @Override public final void accept(Context ctx) { ctx.visit(N_ARRAY_AGG).sql('('); - acceptArguments1(ctx, new QueryPartListView>(arguments.get(0))); + acceptArguments1(ctx, wrap(arguments.get(0))); acceptOrderBy(ctx); ctx.sql(')'); diff --git a/jOOQ/src/main/java/org/jooq/impl/Collect.java b/jOOQ/src/main/java/org/jooq/impl/Collect.java index bbcf39be63..84a31199a1 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Collect.java +++ b/jOOQ/src/main/java/org/jooq/impl/Collect.java @@ -83,5 +83,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/ConstraintImpl.java b/jOOQ/src/main/java/org/jooq/impl/ConstraintImpl.java index 003f91a424..6293603d0e 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ConstraintImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/ConstraintImpl.java @@ -63,6 +63,7 @@ import static org.jooq.impl.Keywords.K_ON_UPDATE; import static org.jooq.impl.Keywords.K_PRIMARY_KEY; import static org.jooq.impl.Keywords.K_REFERENCES; import static org.jooq.impl.Keywords.K_UNIQUE; +import static org.jooq.impl.QueryPartListView.wrap; import static org.jooq.impl.Tools.EMPTY_FIELD; import static org.jooq.impl.Tools.fieldsByName; import static org.jooq.impl.Tools.BooleanDataKey.DATA_CONSTRAINT_REFERENCE; @@ -219,7 +220,7 @@ implements ctx.visit(K_UNIQUE) .sql(" (") .qualify(false) - .visit(new QueryPartListView<>(unique)) + .visit(wrap(unique)) .qualify(qualify) .sql(')'); @@ -238,7 +239,7 @@ implements ctx.sql(" (") .qualify(false) - .visit(new QueryPartListView<>(primaryKey)) + .visit(wrap(primaryKey)) .qualify(qualify) .sql(')'); @@ -251,7 +252,7 @@ implements ctx.visit(K_FOREIGN_KEY) .sql(" (") .qualify(false) - .visit(new QueryPartListView<>(foreignKey)) + .visit(wrap(foreignKey)) .qualify(qualify) .sql(')') .formatSeparator() @@ -262,7 +263,7 @@ implements if (references.length > 0) ctx.sql(" (") .qualify(false) - .visit(new QueryPartListView<>(references)) + .visit(wrap(references)) .qualify(qualify) .sql(')'); diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateIndexImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateIndexImpl.java index 778b41280e..b19e07dea7 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CreateIndexImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/CreateIndexImpl.java @@ -68,6 +68,7 @@ import static org.jooq.impl.Keywords.K_ON; import static org.jooq.impl.Keywords.K_STORING; import static org.jooq.impl.Keywords.K_UNIQUE; import static org.jooq.impl.Keywords.K_WHERE; +import static org.jooq.impl.QueryPartListView.wrap; import static org.jooq.impl.Tools.EMPTY_FIELD; import static org.jooq.impl.Tools.EMPTY_NAME; import static org.jooq.impl.Tools.EMPTY_ORDERFIELD; @@ -336,7 +337,7 @@ final class CreateIndexImpl extends AbstractRowCountQuery implements .visit(keyword) .sql(" (") .qualify(false) - .visit(new QueryPartListView<>(include)) + .visit(wrap(include)) .qualify(true) .sql(')'); } diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateViewImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateViewImpl.java index a7f47e0c01..6e78bfd548 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CreateViewImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/CreateViewImpl.java @@ -66,6 +66,7 @@ import static org.jooq.impl.Keywords.K_IF_NOT_EXISTS; import static org.jooq.impl.Keywords.K_OR; import static org.jooq.impl.Keywords.K_REPLACE; import static org.jooq.impl.Keywords.K_VIEW; +import static org.jooq.impl.QueryPartListView.wrap; import static org.jooq.impl.Tools.EMPTY_FIELD; import java.util.List; @@ -271,7 +272,7 @@ final class CreateViewImpl extends AbstractRowCountQuery imple ctx.sql('(') .qualify(false) - .visit(new QueryPartListView<>(f)) + .visit(wrap(f)) .qualify(qualify) .sql(')'); } diff --git a/jOOQ/src/main/java/org/jooq/impl/EmbeddableTableField.java b/jOOQ/src/main/java/org/jooq/impl/EmbeddableTableField.java index 666fac231f..3a3dc28dd0 100644 --- a/jOOQ/src/main/java/org/jooq/impl/EmbeddableTableField.java +++ b/jOOQ/src/main/java/org/jooq/impl/EmbeddableTableField.java @@ -37,6 +37,7 @@ */ package org.jooq.impl; +import static org.jooq.impl.QueryPartListView.wrap; import static org.jooq.impl.Tools.BooleanDataKey.DATA_LIST_ALREADY_INDENTED; import org.jooq.Context; @@ -76,7 +77,7 @@ final class EmbeddableTableField extends Abs Object previous = ctx.data(DATA_LIST_ALREADY_INDENTED); ctx.data(DATA_LIST_ALREADY_INDENTED, true); - ctx.visit(new QueryPartListView<>(fields)); + ctx.visit(wrap(fields)); ctx.data(DATA_LIST_ALREADY_INDENTED, previous); } diff --git a/jOOQ/src/main/java/org/jooq/impl/Expression.java b/jOOQ/src/main/java/org/jooq/impl/Expression.java index 7b3674cb27..b0fbdb9f3c 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Expression.java +++ b/jOOQ/src/main/java/org/jooq/impl/Expression.java @@ -88,6 +88,7 @@ import static org.jooq.impl.Names.N_DATEADD; import static org.jooq.impl.Names.N_DATE_ADD; import static org.jooq.impl.Names.N_STRFTIME; import static org.jooq.impl.Names.N_TIMESTAMPADD; +import static org.jooq.impl.QueryPartListView.wrap; import static org.jooq.impl.Tools.castIfNeeded; import java.sql.Timestamp; @@ -573,7 +574,7 @@ final class Expression extends AbstractField { case POSTGRES: default: - ctx.visit(new DefaultExpression<>(lhs, operator, new QueryPartListView<>(rhs))); + ctx.visit(new DefaultExpression<>(lhs, operator, wrap(rhs))); break; } } @@ -711,7 +712,7 @@ final class Expression extends AbstractField { case H2: default: - ctx.visit(new DefaultExpression<>(lhs, operator, new QueryPartListView<>(rhs))); + ctx.visit(new DefaultExpression<>(lhs, operator, wrap(rhs))); break; } } diff --git a/jOOQ/src/main/java/org/jooq/impl/Fields.java b/jOOQ/src/main/java/org/jooq/impl/Fields.java index 8068371ad4..2d9a08586c 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Fields.java +++ b/jOOQ/src/main/java/org/jooq/impl/Fields.java @@ -38,6 +38,7 @@ package org.jooq.impl; +import static org.jooq.impl.QueryPartListView.wrap; import static org.jooq.impl.Tools.EMPTY_FIELD; import static org.jooq.impl.Tools.indexOrFail; @@ -391,7 +392,7 @@ final class Fields extends AbstractQueryPart implements Record @Override public final void accept(Context ctx) { - ctx.visit(new QueryPartListView<>(fields)); + ctx.visit(wrap(fields)); } // ------------------------------------------------------------------------- diff --git a/jOOQ/src/main/java/org/jooq/impl/JSONArray.java b/jOOQ/src/main/java/org/jooq/impl/JSONArray.java index c1d9783ed5..490d29bb38 100644 --- a/jOOQ/src/main/java/org/jooq/impl/JSONArray.java +++ b/jOOQ/src/main/java/org/jooq/impl/JSONArray.java @@ -47,6 +47,7 @@ import static org.jooq.impl.JSONNull.JSONNullType.ABSENT_ON_NULL; import static org.jooq.impl.JSONNull.JSONNullType.NULL_ON_NULL; import static org.jooq.impl.Keywords.K_JSON_ARRAY; import static org.jooq.impl.Names.N_JSON_ARRAY; +import static org.jooq.impl.QueryPartListView.wrap; import java.util.Collection; @@ -135,7 +136,7 @@ final class JSONArray extends AbstractField implements JSONArrayNullStep(args, jsonNull).separator("")).sql(')'); + ctx.visit(K_JSON_ARRAY).sql('(').visit(wrap(args, jsonNull).separator("")).sql(')'); break; } } diff --git a/jOOQ/src/main/java/org/jooq/impl/JSONObject.java b/jOOQ/src/main/java/org/jooq/impl/JSONObject.java index a01ee3925a..fa2c0e9094 100644 --- a/jOOQ/src/main/java/org/jooq/impl/JSONObject.java +++ b/jOOQ/src/main/java/org/jooq/impl/JSONObject.java @@ -52,6 +52,7 @@ import static org.jooq.impl.Keywords.K_JSON_OBJECT; import static org.jooq.impl.Names.N_JSON_MERGE; import static org.jooq.impl.Names.N_JSON_OBJECT; import static org.jooq.impl.Names.N_T; +import static org.jooq.impl.QueryPartListView.wrap; import java.util.Collection; @@ -208,6 +209,6 @@ final class JSONObject extends AbstractField implements JSONObjectNullStep else jsonNull = new JSONNull(nullType); - ctx.visit(K_JSON_OBJECT).sql('(').visit(new QueryPartListView<>(args, jsonNull).separator("")).sql(')'); + ctx.visit(K_JSON_OBJECT).sql('(').visit(wrap(args, jsonNull).separator("")).sql(')'); } } diff --git a/jOOQ/src/main/java/org/jooq/impl/ListAgg.java b/jOOQ/src/main/java/org/jooq/impl/ListAgg.java index dbd76ec2f0..193f189c4c 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ListAgg.java +++ b/jOOQ/src/main/java/org/jooq/impl/ListAgg.java @@ -64,6 +64,7 @@ import static org.jooq.impl.Names.N_SUBSTR; import static org.jooq.impl.Names.N_XMLAGG; import static org.jooq.impl.Names.N_XMLSERIALIZE; import static org.jooq.impl.Names.N_XMLTEXT; +import static org.jooq.impl.QueryPartListView.wrap; import static org.jooq.impl.Tools.castIfNeeded; import java.util.Set; @@ -131,7 +132,7 @@ final class ListAgg extends DefaultAggregateFunction { */ private final void acceptGroupConcat(Context ctx) { ctx.visit(N_GROUP_CONCAT).sql('('); - acceptArguments1(ctx, new QueryPartListView<>(arguments.get(0))); + acceptArguments1(ctx, wrap(arguments.get(0))); acceptOrderBy(ctx); if (arguments.size() > 1) diff --git a/jOOQ/src/main/java/org/jooq/impl/TableImpl.java b/jOOQ/src/main/java/org/jooq/impl/TableImpl.java index 06c673147e..e299c31098 100644 --- a/jOOQ/src/main/java/org/jooq/impl/TableImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/TableImpl.java @@ -48,6 +48,7 @@ import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.POSTGRES; import static org.jooq.impl.Internal.createPathAlias; import static org.jooq.impl.Keywords.K_TABLE; +import static org.jooq.impl.QueryPartListView.wrap; import static org.jooq.impl.Tools.getMappedTable; import java.util.Arrays; @@ -271,10 +272,10 @@ public class TableImpl extends AbstractTable { // [#2925] Some dialects don't like empty parameter lists if (ctx.family() == FIREBIRD && parameters.length == 0) - ctx.visit(new QueryPartListView<>(parameters)); + ctx.visit(wrap(parameters)); else ctx.sql('(') - .visit(new QueryPartListView<>(parameters)) + .visit(wrap(parameters)) .sql(')'); } diff --git a/jOOQ/src/main/java/org/jooq/impl/Val.java b/jOOQ/src/main/java/org/jooq/impl/Val.java index 8967618e0c..8af8f9648d 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Val.java +++ b/jOOQ/src/main/java/org/jooq/impl/Val.java @@ -39,6 +39,7 @@ package org.jooq.impl; import static org.jooq.conf.ParamType.NAMED; import static org.jooq.conf.ParamType.NAMED_OR_INLINED; +import static org.jooq.impl.QueryPartListView.wrap; import static org.jooq.impl.Tools.embeddedFields; import static org.jooq.impl.Tools.BooleanDataKey.DATA_LIST_ALREADY_INDENTED; @@ -77,7 +78,7 @@ final class Val extends AbstractParam { Object previous = ctx.data(DATA_LIST_ALREADY_INDENTED); ctx.data(DATA_LIST_ALREADY_INDENTED, true); - ctx.visit(new QueryPartListView<>(embeddedFields(this))); + ctx.visit(wrap(embeddedFields(this))); ctx.data(DATA_LIST_ALREADY_INDENTED, previous); } else if (ctx instanceof RenderContext) {