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

[jOOQ/jOOQ#11074] Replace Param expressions for bind variables in parser

Browse Source
This commit is contained in:
Lukas Eder 2020-12-02 12:08:33 +01:00
parent b28b478d0f
commit 75568de31b
4 changed files with 35 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
jOOQ/src/main/java/org/jooq/TableOptions.java
View File

@ -306,6 +306,13 @@ public final class TableOptions implements Serializable {
return this == VIEW || this == MATERIALIZED_VIEW;
}
/**
* Whether the type is a function.
*/
public final boolean isFunction() {
return this == FUNCTION;
}
/**
* Whether the type is a view.
*/

30
jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
View File

@ -341,6 +341,7 @@ import static org.jooq.impl.Tools.EMPTY_COLLECTION;
import static org.jooq.impl.Tools.EMPTY_COMMON_TABLE_EXPRESSION;
import static org.jooq.impl.Tools.EMPTY_FIELD;
import static org.jooq.impl.Tools.EMPTY_NAME;
import static org.jooq.impl.Tools.EMPTY_OBJECT;
import static org.jooq.impl.Tools.EMPTY_QUERYPART;
import static org.jooq.impl.Tools.EMPTY_ROW;
import static org.jooq.impl.Tools.EMPTY_SORTFIELD;
@ -603,7 +604,7 @@ final class ParserImpl implements Parser {
@Override
public final Queries parse(String sql) {
return parse(sql, new Object[0]);
return parse(sql, EMPTY_OBJECT);
}
@Override
@ -664,7 +665,7 @@ final class ParserImpl implements Parser {
@Override
public final Query parseQuery(String sql) {
return parseQuery(sql, new Object[0]);
return parseQuery(sql, EMPTY_OBJECT);
}
@Override
@ -678,7 +679,7 @@ final class ParserImpl implements Parser {
@Override
public final Statement parseStatement(String sql) {
return parseStatement(sql, new Object[0]);
return parseStatement(sql, EMPTY_OBJECT);
}
@Override
@ -714,7 +715,7 @@ final class ParserImpl implements Parser {
@Override
public final ResultQuery<?> parseResultQuery(String sql) {
return parseResultQuery(sql, new Object[0]);
return parseResultQuery(sql, EMPTY_OBJECT);
}
@Override
@ -728,7 +729,7 @@ final class ParserImpl implements Parser {
@Override
public final Select<?> parseSelect(String sql) {
return parseSelect(sql, new Object[0]);
return parseSelect(sql, EMPTY_OBJECT);
}
@Override
@ -742,7 +743,7 @@ final class ParserImpl implements Parser {
@Override
public final Table<?> parseTable(String sql) {
return parseTable(sql, new Object[0]);
return parseTable(sql, EMPTY_OBJECT);
}
@Override
@ -756,7 +757,7 @@ final class ParserImpl implements Parser {
@Override
public final Field<?> parseField(String sql) {
return parseField(sql, new Object[0]);
return parseField(sql, EMPTY_OBJECT);
}
@Override
@ -770,7 +771,7 @@ final class ParserImpl implements Parser {
@Override
public final Row parseRow(String sql) {
return parseRow(sql, new Object[0]);
return parseRow(sql, EMPTY_OBJECT);
}
@Override
@ -784,7 +785,7 @@ final class ParserImpl implements Parser {
@Override
public final Condition parseCondition(String sql) {
return parseCondition(sql, new Object[0]);
return parseCondition(sql, EMPTY_OBJECT);
}
@Override
@ -798,7 +799,7 @@ final class ParserImpl implements Parser {
@Override
public final Name parseName(String sql) {
return parseName(sql, new Object[0]);
return parseName(sql, EMPTY_OBJECT);
}
@Override
@ -10853,14 +10854,19 @@ final class ParserImpl implements Parser {
}
private static final Param<?> parseBindVariable(ParserContext ctx) {
// [#11074] Bindings can be Param or even Field types
Object binding = ctx.nextBinding();
switch (ctx.character()) {
case '?':
parse(ctx, '?');
return DSL.val(ctx.nextBinding(), Object.class);
return binding instanceof Param ? (Param<?>) binding : DSL.val(binding, Object.class);
case ':':
parse(ctx, ':', false);
return DSL.param(parseIdentifier(ctx).last(), ctx.nextBinding());
Name identifier = parseIdentifier(ctx);
return binding instanceof Param ? (Param<?>) binding : DSL.param(identifier.last(), binding);
default:
throw ctx.exception("Illegal bind variable character");

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

@ -51,6 +51,7 @@ 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.SchemaImpl.DEFAULT_SCHEMA;
import static org.jooq.impl.Tools.EMPTY_OBJECT;
import static org.jooq.impl.Tools.getMappedTable;
import static org.jooq.tools.StringUtils.defaultIfNull;
@ -255,11 +256,15 @@ public class TableImpl<R extends Record> extends AbstractTable<R> {
@Override
public final void accept(Context<?> ctx) {
if (getType().isView() && isSynthetic() && ctx.declareTables()) {
if ((getType().isView() || getType().isFunction()) && isSynthetic() && ctx.declareTables()) {
Select<?> s = getOptions().select();
// TODO: Avoid parsing this every time
ctx.visit(s != null ? s : new DerivedTable<>(ctx.dsl().parser().parseSelect(getOptions().source())).as(getUnqualifiedName()));
ctx.visit(
s != null ? s : new DerivedTable<>(
ctx.dsl().parser().parseSelect(getOptions().source(), parameters == null ? EMPTY_OBJECT : parameters)
).as(getUnqualifiedName())
);
return;
}

7
jOOQ/src/main/java/org/jooq/impl/Tools.java
View File

@ -5938,12 +5938,11 @@ final class Tools {
return result;
}
@SuppressWarnings({ "unchecked", "rawtypes" })
static final <T> DataType<T> anyNotNull(Field<T>... fields) {
static final DataType<?> anyNotNull(Field<?>... fields) {
if (fields == null || fields.length == 0)
return (DataType) OTHER;
return OTHER;
DataType<T> result = fields[0].getDataType();
DataType<?> result = fields[0].getDataType();
if (!result.nullable())
return result;