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

[jOOQ/jOOQ#14985] Allow additional ON clauses on path joins

Browse Source
This commit is contained in:
Lukas Eder 2023-05-03 15:24:00 +02:00
parent ded3fa5a61
commit d092dc9405
2 changed files with 61 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jOOQ/src/main/java/org/jooq/SelectJoinStep.java
View File

@ -301,7 +301,7 @@ public interface SelectJoinStep<R extends Record> extends SelectWhereStep<R> {
*/
@NotNull @CheckReturnValue
@Support
SelectOnStep<R> innerJoin(Path<?> path);
SelectOptionalOnStep<R> innerJoin(Path<?> path);
/**
* Convenience method to <code>INNER JOIN</code> a table to the last table

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

@ -2127,38 +2127,52 @@ implements
@Override
public final SelectImpl on(Condition conditions) {
conditionStep = ConditionStep.ON;
joinConditions = new ConditionProviderImpl();
joinConditions.addConditions(conditions);
if (joinTable == null) {
joinConditions.addConditions(conditions);
}
else {
joinConditions = new ConditionProviderImpl();
joinConditions.addConditions(conditions);
getQuery().addJoin(joinTable, joinType, joinConditions);
getQuery().addJoin(joinTable, joinType, joinConditions);
joinTable = null;
joinPartitionBy = null;
joinType = null;
}
joinTable = null;
joinPartitionBy = null;
joinType = null;
return this;
}
@Override
public final SelectImpl on(Condition... conditions) {
conditionStep = ConditionStep.ON;
joinConditions = new ConditionProviderImpl();
joinConditions.addConditions(conditions);
if (joinTable == null) {
joinConditions.addConditions(conditions);
}
else {
joinConditions = new ConditionProviderImpl();
joinConditions.addConditions(conditions);
getQuery().addJoin(joinTable, joinType, new Condition[] { joinConditions });
getQuery().addJoin(joinTable, joinType, new Condition[] { joinConditions });
joinTable = null;
joinPartitionBy = null;
joinType = null;
}
joinTable = null;
joinPartitionBy = null;
joinType = null;
return this;
}
@ -2190,38 +2204,49 @@ implements
@Override
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;
if (joinTable != null) {
getQuery().addJoinOnKey(joinTable, joinType);
joinConditions = ((JoinTable) getDelegate().getFrom().get(getDelegate().getFrom().size() - 1)).condition;
joinTable = null;
joinPartitionBy = null;
joinType = null;
}
return this;
}
@Override
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;
if (joinTable != null) {
getQuery().addJoinOnKey(joinTable, joinType, keyFields);
joinConditions = ((JoinTable) getDelegate().getFrom().get(getDelegate().getFrom().size() - 1)).condition;
joinTable = null;
joinPartitionBy = null;
joinType = null;
}
return this;
}
@Override
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;
if (joinTable != null) {
getQuery().addJoinOnKey(joinTable, joinType, key);
joinConditions = ((JoinTable) getDelegate().getFrom().get(getDelegate().getFrom().size() - 1)).condition;
joinTable = null;
joinPartitionBy = null;
joinType = null;
}
return this;
}
@Override
@ -2231,10 +2256,13 @@ implements
@Override
public final SelectImpl using(Collection<? extends Field<?>> fields) {
getQuery().addJoinUsing(joinTable, joinType, fields);
joinTable = null;
joinPartitionBy = null;
joinType = null;
if (joinTable != null) {
getQuery().addJoinUsing(joinTable, joinType, fields);
joinTable = null;
joinPartitionBy = null;
joinType = null;
}
return this;
}