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

[jOOQ/jOOQ#7863] Fixed regression in boolean PL/SQL function call emulation

Browse Source
This commit is contained in:
Lukas Eder 2021-04-21 16:56:08 +02:00
parent d210d5f35d
commit 0e61b746af
5 changed files with 60 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jOOQ/src/main/java/org/jooq/impl/AbstractStatement.java
View File

@ -42,7 +42,7 @@ import org.jooq.Statement;
/**
* @author Lukas Eder
*/
abstract class AbstractStatement extends AbstractQueryPart implements Statement {
abstract class AbstractStatement extends AbstractQueryPart implements Statement, SeparatedQueryPart {
/**
* Generated UID

68
jOOQ/src/main/java/org/jooq/impl/QueryPartCollectionView.java
View File

@ -39,6 +39,8 @@
package org.jooq.impl;
import static java.lang.Boolean.TRUE;
import static org.jooq.impl.Tools.isRendersSeparator;
import static org.jooq.impl.Tools.last;
import static org.jooq.impl.Tools.BooleanDataKey.DATA_LIST_ALREADY_INDENTED;
import java.util.ArrayList;
@ -53,7 +55,6 @@ import java.util.function.Function;
import org.jooq.Context;
import org.jooq.QueryPart;
import org.jooq.QueryPartInternal;
import org.jooq.Statement;
/**
* A {@link List} view, delegating all calls to a wrapped list, but acting like
@ -61,7 +62,7 @@ import org.jooq.Statement;
*
* @author Lukas Eder
*/
class QueryPartCollectionView<T extends QueryPart> extends AbstractQueryPart implements Collection<T>, SimpleQueryPart {
class QueryPartCollectionView<T extends QueryPart> extends AbstractQueryPart implements Collection<T>, SimpleQueryPart, SeparatedQueryPart {
private static final long serialVersionUID = -2936922742534009564L;
final Collection<T> wrapped;
@ -106,6 +107,14 @@ class QueryPartCollectionView<T extends QueryPart> extends AbstractQueryPart imp
return true;
}
@Override
public boolean rendersSeparator() {
if (isEmpty())
return false;
else
return isRendersSeparator(last(wrapped));
}
@Override
public boolean rendersContent(Context<?> ctx) {
return !isEmpty();
@ -148,38 +157,45 @@ class QueryPartCollectionView<T extends QueryPart> extends AbstractQueryPart imp
else {
int j = 0;
int k = 0;
T prev = null;
for (T part : this) {
if (!rendersContent.get(j++))
continue;
try {
if (!rendersContent.get(j++))
continue;
if (mapper != null)
part = mapper.apply(part);
if (mapper != null)
part = mapper.apply(part);
if (k++ > 0) {
if (k++ > 0) {
// [#3607] Procedures and functions are not separated by comma
if (!(part instanceof Statement))
ctx.sql(separator);
// [#3607] Procedures and functions are not separated by comma
if (!(prev instanceof SeparatedQueryPart && ((SeparatedQueryPart) prev).rendersSeparator()))
ctx.sql(separator);
if (format)
ctx.formatSeparator();
if (format)
ctx.formatSeparator();
else
ctx.sql(' ');
}
else if (indent)
ctx.formatNewLine();
if (indent) {
T t = part;
ctx.data(
DATA_LIST_ALREADY_INDENTED,
t instanceof QueryPartCollectionView && ((QueryPartCollectionView<?>) t).size() > 1,
c -> c.visit(t)
);
}
else
ctx.sql(' ');
acceptElement(ctx, part);
}
else if (indent)
ctx.formatNewLine();
if (indent) {
T t = part;
ctx.data(
DATA_LIST_ALREADY_INDENTED,
t instanceof QueryPartCollectionView && ((QueryPartCollectionView<?>) t).size() > 1,
c -> c.visit(t)
);
finally {
prev = part;
}
else
acceptElement(ctx, part);
}
}

2
jOOQ/src/main/java/org/jooq/impl/ScopeMarker.java
View File

@ -144,7 +144,7 @@ enum ScopeMarker {
}
// Top level CTE are inserted before all other CTEs
else
else if (!Tools.isRendersSeparator(cte))
ctx.sql(',');
ctx.formatSeparator().sql("");

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

@ -2027,6 +2027,17 @@ final class Tools {
return result;
}
static final <T> T last(Collection<T> collection) {
if (collection.isEmpty())
return null;
else if (collection instanceof List)
return ((List<T>) collection).get(collection.size() - 1);
T last = null;
for (Iterator<T> it = collection.iterator(); it.hasNext(); last = it.next());
return last;
}
/**
* Reverse an array.
*/
@ -3127,6 +3138,10 @@ final class Tools {
return part instanceof SimpleQueryPart && ((SimpleQueryPart) part).isSimple();
}
static final boolean isRendersSeparator(QueryPart part) {
return part instanceof SeparatedQueryPart && ((SeparatedQueryPart) part).rendersSeparator();
}
static final boolean isPossiblyNullable(Field<?> f) {
return f instanceof AbstractField && ((AbstractField<?>) f).isPossiblyNullable();
}

2
pom.xml
View File

@ -594,7 +594,7 @@
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
<version>4.4.0</version>
<version>4.4.1</version>
<configuration>
<args>
<arg>-deprecation</arg>