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

[jOOQ/jOOQ#12324] Wrong (+) to LEFT JOIN transformation in join tree A⟕B, A⟕C, A⋈D

Browse Source
This commit is contained in:
Lukas Eder 2021-08-18 13:14:51 +02:00
parent 2cd86dfd65
commit 6dd904d3d4
2 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java
View File

@ -2934,6 +2934,17 @@ final class SelectQueryImpl<R extends Record> extends AbstractResultQuery<R> imp

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

@ -260,6 +260,7 @@ import org.jooq.ForeignKey;
import org.jooq.JSON;
import org.jooq.JSONB;
import org.jooq.JSONEntry;
import org.jooq.JoinType;
import org.jooq.Name;
import org.jooq.OrderField;
import org.jooq.Param;
@ -6282,20 +6283,37 @@ final class Tools {
T result,
Predicate<? super T> abort,
BiFunction<? super T, ? super Table<?>, ? extends T> function
) {
return traverseJoins(t, result, abort, null, function);
}
static final <T> T traverseJoins(
Table<?> t,
T result,
Predicate<? super T> abort,
BiFunction<? super T, ? super JoinType, ? extends T> joinTypeFunction,
BiFunction<? super T, ? super Table<?>, ? extends T> tableFunction
) {
if (abort.test(result))
return result;
if (t instanceof JoinTable) {
result = traverseJoins(((JoinTable) t).lhs, result, abort, function);
result = traverseJoins(((JoinTable) t).lhs, result, abort, joinTypeFunction, tableFunction);
if (abort.test(result))
return result;
result = traverseJoins(((JoinTable) t).rhs, result, abort, function);
if (joinTypeFunction != null) {
result = joinTypeFunction.apply(result, ((JoinTable) t).type);
if (abort.test(result))
return result;
}
result = traverseJoins(((JoinTable) t).rhs, result, abort, joinTypeFunction, tableFunction);
}
else
result = function.apply(result, t);
else if (tableFunction != null)
result = tableFunction.apply(result, t);
return result;
}