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

[jOOQ/jOOQ#10015] Use QueryPartListView.wrap instead

Browse Source
This commit is contained in:
Lukas Eder 2020-04-29 10:24:06 +02:00
parent a7777b0bf0
commit efb4979033
13 changed files with 30 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
jOOQ/src/main/java/org/jooq/impl/ArrayAgg.java
View File

@ -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<T> extends DefaultAggregateFunction<T[]> {
@Override
public final void accept(Context<?> ctx) {
ctx.visit(N_ARRAY_AGG).sql('(');
acceptArguments1(ctx, new QueryPartListView<Field<?>>(arguments.get(0)));
acceptArguments1(ctx, wrap(arguments.get(0)));
acceptOrderBy(ctx);
ctx.sql(')');

1
jOOQ/src/main/java/org/jooq/impl/Collect.java
View File

@ -83,5 +83,6 @@ package org.jooq.impl;

9
jOOQ/src/main/java/org/jooq/impl/ConstraintImpl.java
View File

@ -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(')');

3
jOOQ/src/main/java/org/jooq/impl/CreateIndexImpl.java
View File

@ -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(')');
}

3
jOOQ/src/main/java/org/jooq/impl/CreateViewImpl.java
View File

@ -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<R extends Record> extends AbstractRowCountQuery imple
ctx.sql('(')
.qualify(false)
.visit(new QueryPartListView<>(f))
.visit(wrap(f))
.qualify(qualify)
.sql(')');
}

3
jOOQ/src/main/java/org/jooq/impl/EmbeddableTableField.java
View File

@ -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<R extends Record, T extends Record> 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);
}

5
jOOQ/src/main/java/org/jooq/impl/Expression.java
View File

@ -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<T> extends AbstractField<T> {
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<T> extends AbstractField<T> {
case H2:
default:
ctx.visit(new DefaultExpression<>(lhs, operator, new QueryPartListView<>(rhs)));
ctx.visit(new DefaultExpression<>(lhs, operator, wrap(rhs)));
break;
}
}

3
jOOQ/src/main/java/org/jooq/impl/Fields.java
View File

@ -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<R extends Record> extends AbstractQueryPart implements Record
@Override
public final void accept(Context<?> ctx) {
ctx.visit(new QueryPartListView<>(fields));
ctx.visit(wrap(fields));
}
// -------------------------------------------------------------------------

3
jOOQ/src/main/java/org/jooq/impl/JSONArray.java
View File

@ -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<J> extends AbstractField<J> implements JSONArrayNullStep<J
else
jsonNull = new JSONNull(nullType);
ctx.visit(K_JSON_ARRAY).sql('(').visit(new QueryPartListView<>(args, jsonNull).separator("")).sql(')');
ctx.visit(K_JSON_ARRAY).sql('(').visit(wrap(args, jsonNull).separator("")).sql(')');
break;
}
}

3
jOOQ/src/main/java/org/jooq/impl/JSONObject.java
View File

@ -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<J> extends AbstractField<J> 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(')');
}
}

3
jOOQ/src/main/java/org/jooq/impl/ListAgg.java
View File

@ -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<String> {
*/
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)

5
jOOQ/src/main/java/org/jooq/impl/TableImpl.java
View File

@ -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<R extends Record> extends AbstractTable<R> {
// [#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(')');
}

3
jOOQ/src/main/java/org/jooq/impl/Val.java
View File

@ -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<T> extends AbstractParam<T> {
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) {