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

[jOOQ/jOOQ#12200] SelectOnStep::onKey returns wrong type, preventing combinations of join predicates

Browse Source
This commit is contained in:
Lukas Eder 2021-07-15 12:29:55 +02:00
parent 7ee63775f3
commit 8e358aac44
2 changed files with 9 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jOOQ/src/main/java/org/jooq/SelectOnStep.java
View File

@ -208,7 +208,7 @@ public interface SelectOnStep<R extends Record> {
*/
@NotNull @CheckReturnValue
@Support
SelectJoinStep<R> onKey() throws DataAccessException;
SelectOnConditionStep<R> onKey() throws DataAccessException;
/**
* Join the previous table on a non-ambiguous foreign key relationship
@ -222,7 +222,7 @@ public interface SelectOnStep<R extends Record> {
*/
@NotNull @CheckReturnValue
@Support
SelectJoinStep<R> onKey(TableField<?, ?>... keyFields) throws DataAccessException;
SelectOnConditionStep<R> onKey(TableField<?, ?>... keyFields) throws DataAccessException;
/**
* Join the table on a non-ambiguous foreign key relationship between the
@ -234,7 +234,7 @@ public interface SelectOnStep<R extends Record> {
*/
@NotNull @CheckReturnValue
@Support
SelectJoinStep<R> onKey(ForeignKey<?, ?> key);
SelectOnConditionStep<R> onKey(ForeignKey<?, ?> key);
/**
* Join the previous table with the <code>USING(column [, column...])</code>

29
jOOQ/src/main/java/org/jooq/impl/SelectImpl.java
View File

@ -52,7 +52,6 @@ import java.util.List;
import java.util.concurrent.Flow;
import java.util.function.BiFunction;
import java.util.function.Function;
import java.util.stream.Stream;
import org.jooq.BetweenAndStep;
import org.jooq.BetweenAndStepR;
@ -73,28 +72,6 @@ import org.jooq.Param;
import org.jooq.QuantifiedSelect;
import org.jooq.QueryPart;
import org.jooq.Record;
import org.jooq.Record1;
import org.jooq.Record10;
import org.jooq.Record11;
import org.jooq.Record12;
import org.jooq.Record13;
import org.jooq.Record14;
import org.jooq.Record15;
import org.jooq.Record16;
import org.jooq.Record17;
import org.jooq.Record18;
import org.jooq.Record19;
import org.jooq.Record2;
import org.jooq.Record20;
import org.jooq.Record21;
import org.jooq.Record22;
import org.jooq.Record3;
import org.jooq.Record4;
import org.jooq.Record5;
import org.jooq.Record6;
import org.jooq.Record7;
import org.jooq.Record8;
import org.jooq.Record9;
import org.jooq.Result;
import org.jooq.ResultQuery;
import org.jooq.Results;
@ -2199,6 +2176,8 @@ implements
public final SelectImpl onKey() {
conditionStep = ConditionStep.ON;
getQuery().addJoinOnKey(joinTable, joinType);
joinConditions = ((JoinTable) getDelegate().getFrom().get(getDelegate().getFrom().size() - 1)).condition;
joinTable = null;
joinPartitionBy = null;
joinType = null;
@ -2209,6 +2188,8 @@ implements
public final SelectImpl onKey(TableField<?, ?>... keyFields) {
conditionStep = ConditionStep.ON;
getQuery().addJoinOnKey(joinTable, joinType, keyFields);
joinConditions = ((JoinTable) getDelegate().getFrom().get(getDelegate().getFrom().size() - 1)).condition;
joinTable = null;
joinPartitionBy = null;
joinType = null;
@ -2219,6 +2200,8 @@ implements
public final SelectImpl onKey(ForeignKey<?, ?> key) {
conditionStep = ConditionStep.ON;
getQuery().addJoinOnKey(joinTable, joinType, key);
joinConditions = ((JoinTable) getDelegate().getFrom().get(getDelegate().getFrom().size() - 1)).condition;
joinTable = null;
joinPartitionBy = null;
joinType = null;