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

[jOOQ/jOOQ#15807] Remove JoinHint related API from OSS edition

Browse Source
This commit is contained in:
Lukas Eder 2023-11-09 09:13:11 +01:00
parent 519afc4551
commit 8f32e73a7f
6 changed files with 1697 additions and 1438 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because it is too large Load Diff

24
jOOQ/src/main/java/org/jooq/SelectQuery.java
View File

@ -229,6 +229,9 @@ public interface SelectQuery<R extends Record> extends Select<R>, ConditionProvi
/**
* Joins the existing table product to a new table using a condition,
* connecting them with each other with {@link Operator#AND}.
* <p>
* {@link JoinHint} are a commercial only feature and are ignored in the
* jOOQ Open Source Edition.
*
* @param table The joined table
* @param type The type of join
@ -241,6 +244,9 @@ public interface SelectQuery<R extends Record> extends Select<R>, ConditionProvi
/**
* Joins the existing table product to a new table using a condition,
* connecting them with each other with {@link Operator#AND}.
* <p>
* {@link JoinHint} are a commercial only feature and are ignored in the
* jOOQ Open Source Edition.
*
* @param table The joined table
* @param type The type of join
@ -315,6 +321,12 @@ public interface SelectQuery<R extends Record> extends Select<R>, ConditionProvi
@ -355,6 +367,9 @@ public interface SelectQuery<R extends Record> extends Select<R>, ConditionProvi
* <p>
* If this is not supported by your RDBMS, then jOOQ will try to emulate
* this behaviour using the information provided in this query.
* <p>
* {@link JoinHint} are a commercial only feature and are ignored in the
* jOOQ Open Source Edition.
*
* @param table The joined table
* @param type The type of join
@ -397,6 +412,9 @@ public interface SelectQuery<R extends Record> extends Select<R>, ConditionProvi
/**
* Joins the existing table product to a new table using a foreign key.
* <p>
* {@link JoinHint} are a commercial only feature and are ignored in the
* jOOQ Open Source Edition.
*
* @param table The joined table
* @param type The type of join
@ -413,6 +431,9 @@ public interface SelectQuery<R extends Record> extends Select<R>, ConditionProvi
/**
* Joins the existing table product to a new table using a foreign key.
* <p>
* {@link JoinHint} are a commercial only feature and are ignored in the
* jOOQ Open Source Edition.
*
* @param table The joined table
* @param type The type of join
@ -441,6 +462,9 @@ public interface SelectQuery<R extends Record> extends Select<R>, ConditionProvi
/**
* Joins the existing table product to a new table using a foreign key.
* <p>
* {@link JoinHint} are a commercial only feature and are ignored in the
* jOOQ Open Source Edition.
*
* @param table The joined table
* @param type The type of join

981
jOOQ/src/main/java/org/jooq/Table.java
View File

File diff suppressed because it is too large Load Diff

4
jOOQ/src/main/java/org/jooq/TableOuterJoinStep.java
View File

@ -707,6 +707,10 @@ public interface TableOuterJoinStep<R extends Record> {

482
jOOQ/src/main/java/org/jooq/impl/AbstractTable.java
View File

@ -1419,40 +1419,44 @@ implements
return innerJoin(table);
}
@Override
public final TableOnStep<Record> hashJoin(TableLike<?> table) {
return innerHashJoin(table);
}
@Override
public final TableOnStep<Record> loopJoin(TableLike<?> table) {
return innerLoopJoin(table);
}
@Override
public final TableOnStep<Record> mergeJoin(TableLike<?> table) {
return innerMergeJoin(table);
}
@Override
public final TableOptionalOnStep<Record> join(Path<?> path) {
return innerJoin(path);
}
@Override
public final TableOptionalOnStep<Record> hashJoin(Path<?> path) {
return innerHashJoin(path);
}
@Override
public final TableOptionalOnStep<Record> loopJoin(Path<?> path) {
return innerLoopJoin(path);
}
@Override
public final TableOptionalOnStep<Record> mergeJoin(Path<?> path) {
return innerMergeJoin(path);
}
@Override
public final TableOnStep<Record> join(SQL sql) {
@ -1484,40 +1488,44 @@ implements
return join(table, JOIN);
}
@Override
public final TableOnStep<Record> innerHashJoin(TableLike<?> table) {
return join(table, JOIN, HASH);
}
@Override
public final TableOnStep<Record> innerLoopJoin(TableLike<?> table) {
return join(table, JOIN, LOOP);
}
@Override
public final TableOnStep<Record> innerMergeJoin(TableLike<?> table) {
return join(table, JOIN, MERGE);
}
@Override
public final TableOptionalOnStep<Record> innerJoin(Path<?> path) {
return join(path, JOIN);
}
@Override
public final TableOptionalOnStep<Record> innerHashJoin(Path<?> path) {
return join(path, JOIN, HASH);
}
@Override
public final TableOptionalOnStep<Record> innerLoopJoin(Path<?> path) {
return join(path, JOIN, LOOP);
}
@Override
public final TableOptionalOnStep<Record> innerMergeJoin(Path<?> path) {
return join(path, JOIN, MERGE);
}
@Override
public final TableOnStep<Record> innerJoin(SQL sql) {
@ -1563,40 +1571,44 @@ implements
return leftOuterJoin(table);
}
@Override
public final TablePartitionByStep<Record> leftHashJoin(TableLike<?> table) {
return leftOuterHashJoin(table);
}
@Override
public final TablePartitionByStep<Record> leftLoopJoin(TableLike<?> table) {
return leftOuterLoopJoin(table);
}
@Override
public final TablePartitionByStep<Record> leftMergeJoin(TableLike<?> table) {
return leftOuterMergeJoin(table);
}
@Override
public final TableOptionalOnStep<Record> leftJoin(Path<?> path) {
return leftOuterJoin(path);
}
@Override
public final TableOptionalOnStep<Record> leftHashJoin(Path<?> path) {
return leftOuterHashJoin(path);
}
@Override
public final TableOptionalOnStep<Record> leftLoopJoin(Path<?> path) {
return leftOuterLoopJoin(path);
}
@Override
public final TableOptionalOnStep<Record> leftMergeJoin(Path<?> path) {
return leftOuterMergeJoin(path);
}
@Override
public final TablePartitionByStep<Record> leftJoin(SQL sql) {
@ -1629,43 +1641,47 @@ implements
return (TablePartitionByStep<Record>) join(table, LEFT_OUTER_JOIN);
}
@SuppressWarnings("unchecked")
@Override
public final TablePartitionByStep<Record> leftOuterHashJoin(TableLike<?> table) {
return (TablePartitionByStep<Record>) join(table, LEFT_OUTER_JOIN, HASH);
}
@SuppressWarnings("unchecked")
@Override
public final TablePartitionByStep<Record> leftOuterLoopJoin(TableLike<?> table) {
return (TablePartitionByStep<Record>) join(table, LEFT_OUTER_JOIN, LOOP);
}
@SuppressWarnings("unchecked")
@Override
public final TablePartitionByStep<Record> leftOuterMergeJoin(TableLike<?> table) {
return (TablePartitionByStep<Record>) join(table, LEFT_OUTER_JOIN, MERGE);
}
@Override
public final TableOptionalOnStep<Record> leftOuterJoin(Path<?> path) {
return join(path, LEFT_OUTER_JOIN);
}
@Override
public final TableOptionalOnStep<Record> leftOuterHashJoin(Path<?> path) {
return join(path, LEFT_OUTER_JOIN, HASH);
}
@Override
public final TableOptionalOnStep<Record> leftOuterLoopJoin(Path<?> path) {
return join(path, LEFT_OUTER_JOIN, LOOP);
}
@Override
public final TableOptionalOnStep<Record> leftOuterMergeJoin(Path<?> path) {
return join(path, LEFT_OUTER_JOIN, MERGE);
}
@Override
public final TablePartitionByStep<Record> leftOuterJoin(SQL sql) {
@ -1697,40 +1713,44 @@ implements
return rightOuterJoin(table);
}
@Override
public final TablePartitionByStep<Record> rightHashJoin(TableLike<?> table) {
return rightOuterHashJoin(table);
}
@Override
public final TablePartitionByStep<Record> rightLoopJoin(TableLike<?> table) {
return rightOuterLoopJoin(table);
}
@Override
public final TablePartitionByStep<Record> rightMergeJoin(TableLike<?> table) {
return rightOuterMergeJoin(table);
}
@Override
public final TableOptionalOnStep<Record> rightJoin(Path<?> path) {
return rightOuterJoin(path);
}
@Override
public final TableOptionalOnStep<Record> rightHashJoin(Path<?> path) {
return rightOuterHashJoin(path);
}
@Override
public final TableOptionalOnStep<Record> rightLoopJoin(Path<?> path) {
return rightOuterLoopJoin(path);
}
@Override
public final TableOptionalOnStep<Record> rightMergeJoin(Path<?> path) {
return rightOuterMergeJoin(path);
}
@Override
public final TablePartitionByStep<Record> rightJoin(SQL sql) {
@ -1763,43 +1783,47 @@ implements
return (TablePartitionByStep<Record>) join(table, RIGHT_OUTER_JOIN);
}
@SuppressWarnings("unchecked")
@Override
public final TablePartitionByStep<Record> rightOuterHashJoin(TableLike<?> table) {
return (TablePartitionByStep<Record>) join(table, RIGHT_OUTER_JOIN, HASH);
}
@SuppressWarnings("unchecked")
@Override
public final TablePartitionByStep<Record> rightOuterLoopJoin(TableLike<?> table) {
return (TablePartitionByStep<Record>) join(table, RIGHT_OUTER_JOIN, LOOP);
}
@SuppressWarnings("unchecked")
@Override
public final TablePartitionByStep<Record> rightOuterMergeJoin(TableLike<?> table) {
return (TablePartitionByStep<Record>) join(table, RIGHT_OUTER_JOIN, MERGE);
}
@Override
public final TableOptionalOnStep<Record> rightOuterJoin(Path<?> path) {
return join(path, RIGHT_OUTER_JOIN);
}
@Override
public final TableOptionalOnStep<Record> rightOuterHashJoin(Path<?> path) {
return join(path, RIGHT_OUTER_JOIN, HASH);
}
@Override
public final TableOptionalOnStep<Record> rightOuterLoopJoin(Path<?> path) {
return join(path, RIGHT_OUTER_JOIN, LOOP);
}
@Override
public final TableOptionalOnStep<Record> rightOuterMergeJoin(Path<?> path) {
return join(path, RIGHT_OUTER_JOIN, MERGE);
}
@Override
public final TablePartitionByStep<Record> rightOuterJoin(SQL sql) {
@ -1832,43 +1856,47 @@ implements
return (TablePartitionByStep<Record>) join(table, FULL_OUTER_JOIN);
}
@SuppressWarnings("unchecked")
@Override
public final TablePartitionByStep<Record> fullOuterHashJoin(TableLike<?> table) {
return (TablePartitionByStep<Record>) join(table, FULL_OUTER_JOIN, HASH);
}
@SuppressWarnings("unchecked")
@Override
public final TablePartitionByStep<Record> fullOuterLoopJoin(TableLike<?> table) {
return (TablePartitionByStep<Record>) join(table, FULL_OUTER_JOIN, LOOP);
}
@SuppressWarnings("unchecked")
@Override
public final TablePartitionByStep<Record> fullOuterMergeJoin(TableLike<?> table) {
return (TablePartitionByStep<Record>) join(table, FULL_OUTER_JOIN, MERGE);
}
@Override
public final TableOptionalOnStep<Record> fullOuterJoin(Path<?> path) {
return join(path, FULL_OUTER_JOIN);
}
@Override
public final TableOptionalOnStep<Record> fullOuterHashJoin(Path<?> path) {
return join(path, FULL_OUTER_JOIN, HASH);
}
@Override
public final TableOptionalOnStep<Record> fullOuterLoopJoin(Path<?> path) {
return join(path, FULL_OUTER_JOIN, LOOP);
}
@Override
public final TableOptionalOnStep<Record> fullOuterMergeJoin(Path<?> path) {
return join(path, FULL_OUTER_JOIN, MERGE);
}
@Override
public final TablePartitionByStep<Record> fullOuterJoin(SQL sql) {
@ -1900,40 +1928,44 @@ implements
return fullOuterJoin(table);
}
@Override
public final TablePartitionByStep<Record> fullHashJoin(TableLike<?> table) {
return fullOuterHashJoin(table);
}
@Override
public final TablePartitionByStep<Record> fullLoopJoin(TableLike<?> table) {
return fullOuterLoopJoin(table);
}
@Override
public final TablePartitionByStep<Record> fullMergeJoin(TableLike<?> table) {
return fullOuterMergeJoin(table);
}
@Override
public final TableOptionalOnStep<Record> fullJoin(Path<?> path) {
return fullOuterJoin(path);
}
@Override
public final TableOptionalOnStep<Record> fullHashJoin(Path<?> path) {
return fullOuterHashJoin(path);
}
@Override
public final TableOptionalOnStep<Record> fullLoopJoin(Path<?> path) {
return fullOuterLoopJoin(path);
}
@Override
public final TableOptionalOnStep<Record> fullMergeJoin(Path<?> path) {
return fullOuterMergeJoin(path);
}
@Override
public final TablePartitionByStep<Record> fullJoin(SQL sql) {

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

@ -2301,320 +2301,352 @@ implements
return innerJoin(table);
}
@Override
public final SelectImpl hashJoin(TableLike<?> table) {
return innerHashJoin(table);
}
@Override
public final SelectImpl loopJoin(TableLike<?> table) {
return innerLoopJoin(table);
}
@Override
public final SelectImpl mergeJoin(TableLike<?> table) {
return innerMergeJoin(table);
}
@Override
public final SelectImpl join(Path<?> path) {
return innerJoin(path);
}
@Override
public final SelectImpl hashJoin(Path<?> path) {
return innerHashJoin(path);
}
@Override
public final SelectImpl mergeJoin(Path<?> path) {
return innerMergeJoin(path);
}
@Override
public final SelectImpl loopJoin(Path<?> path) {
return innerLoopJoin(path);
}
@Override
public final SelectImpl innerJoin(TableLike<?> table) {
return join(table, JoinType.JOIN);
}
@Override
public final SelectImpl innerHashJoin(TableLike<?> table) {
return join(table, JoinType.JOIN, HASH);
}
@Override
public final SelectImpl innerLoopJoin(TableLike<?> table) {
return join(table, JoinType.JOIN, LOOP);
}
@Override
public final SelectImpl innerMergeJoin(TableLike<?> table) {
return join(table, JoinType.JOIN, MERGE);
}
@Override
public final SelectImpl innerJoin(Path<?> path) {
return join(path, JoinType.JOIN).on(noCondition());
}
@Override
public final SelectImpl innerHashJoin(Path<?> path) {
return join(path, JoinType.JOIN, HASH).on(noCondition());
}
@Override
public final SelectImpl innerLoopJoin(Path<?> path) {
return join(path, JoinType.JOIN, LOOP).on(noCondition());
}
@Override
public final SelectImpl innerMergeJoin(Path<?> path) {
return join(path, JoinType.JOIN, MERGE).on(noCondition());
}
@Override
public final SelectImpl leftJoin(TableLike<?> table) {
return leftOuterJoin(table);
}
@Override
public final SelectImpl leftHashJoin(TableLike<?> table) {
return leftOuterHashJoin(table);
}
@Override
public final SelectImpl leftLoopJoin(TableLike<?> table) {
return leftOuterLoopJoin(table);
}
@Override
public final SelectImpl leftMergeJoin(TableLike<?> table) {
return leftOuterMergeJoin(table);
}
@Override
public final SelectImpl leftJoin(Path<?> path) {
return leftOuterJoin(path);
}
@Override
public final SelectImpl leftHashJoin(Path<?> path) {
return leftOuterHashJoin(path);
}
@Override
public final SelectImpl leftLoopJoin(Path<?> path) {
return leftOuterLoopJoin(path);
}
@Override
public final SelectImpl leftMergeJoin(Path<?> path) {
return leftOuterMergeJoin(path);
}
@Override
public final SelectImpl leftOuterJoin(TableLike<?> table) {
return join(table, JoinType.LEFT_OUTER_JOIN);
}
@Override
public final SelectImpl leftOuterHashJoin(TableLike<?> table) {
return join(table, JoinType.LEFT_OUTER_JOIN, HASH);
}
@Override
public final SelectImpl leftOuterLoopJoin(TableLike<?> table) {
return join(table, JoinType.LEFT_OUTER_JOIN, LOOP);
}
@Override
public final SelectImpl leftOuterMergeJoin(TableLike<?> table) {
return join(table, JoinType.LEFT_OUTER_JOIN, MERGE);
}
@Override
public final SelectImpl leftOuterJoin(Path<?> path) {
return join(path, JoinType.LEFT_OUTER_JOIN).on(noCondition());
}
@Override
public final SelectImpl leftOuterHashJoin(Path<?> path) {
return join(path, JoinType.LEFT_OUTER_JOIN, HASH).on(noCondition());
}
@Override
public final SelectImpl leftOuterLoopJoin(Path<?> path) {
return join(path, JoinType.LEFT_OUTER_JOIN, LOOP).on(noCondition());
}
@Override
public final SelectImpl leftOuterMergeJoin(Path<?> path) {
return join(path, JoinType.LEFT_OUTER_JOIN, MERGE).on(noCondition());
}
@Override
public final SelectImpl rightJoin(TableLike<?> table) {
return rightOuterJoin(table);
}
@Override
public final SelectImpl rightHashJoin(TableLike<?> table) {
return rightOuterHashJoin(table);
}
@Override
public final SelectImpl rightLoopJoin(TableLike<?> table) {
return rightOuterLoopJoin(table);
}
@Override
public final SelectImpl rightMergeJoin(TableLike<?> table) {
return rightOuterMergeJoin(table);
}
@Override
public final SelectImpl rightJoin(Path<?> path) {
return rightOuterJoin(path);
}
@Override
public final SelectImpl rightHashJoin(Path<?> path) {
return rightOuterHashJoin(path);
}
@Override
public final SelectImpl rightLoopJoin(Path<?> path) {
return rightOuterLoopJoin(path);
}
@Override
public final SelectImpl rightMergeJoin(Path<?> path) {
return rightOuterMergeJoin(path);
}
@Override
public final SelectImpl rightOuterJoin(TableLike<?> table) {
return join(table, JoinType.RIGHT_OUTER_JOIN);
}
@Override
public final SelectImpl rightOuterHashJoin(TableLike<?> table) {
return join(table, JoinType.RIGHT_OUTER_JOIN, HASH);
}
@Override
public final SelectImpl rightOuterLoopJoin(TableLike<?> table) {
return join(table, JoinType.RIGHT_OUTER_JOIN, LOOP);
}
@Override
public final SelectImpl rightOuterMergeJoin(TableLike<?> table) {
return join(table, JoinType.RIGHT_OUTER_JOIN, MERGE);
}
@Override
public final SelectImpl rightOuterJoin(Path<?> path) {
return join(path, JoinType.RIGHT_OUTER_JOIN).on(noCondition());
}
@Override
public final SelectImpl rightOuterHashJoin(Path<?> path) {
return join(path, JoinType.RIGHT_OUTER_JOIN, HASH).on(noCondition());
}
@Override
public final SelectImpl rightOuterLoopJoin(Path<?> path) {
return join(path, JoinType.RIGHT_OUTER_JOIN, LOOP).on(noCondition());
}
@Override
public final SelectImpl rightOuterMergeJoin(Path<?> path) {
return join(path, JoinType.RIGHT_OUTER_JOIN, MERGE).on(noCondition());
}
@Override
public final SelectImpl fullJoin(TableLike<?> table) {
return fullOuterJoin(table);
}
@Override
public final SelectImpl fullHashJoin(TableLike<?> table) {
return fullOuterHashJoin(table);
}
@Override
public final SelectImpl fullLoopJoin(TableLike<?> table) {
return fullOuterLoopJoin(table);
}
@Override
public final SelectImpl fullMergeJoin(TableLike<?> table) {
return fullOuterMergeJoin(table);
}
@Override
public final SelectImpl fullJoin(Path<?> path) {
return fullOuterJoin(path);
}
@Override
public final SelectImpl fullHashJoin(Path<?> path) {
return fullOuterHashJoin(path);
}
@Override
public final SelectImpl fullLoopJoin(Path<?> path) {
return fullOuterLoopJoin(path);
}
@Override
public final SelectImpl fullMergeJoin(Path<?> path) {
return fullOuterMergeJoin(path);
}
@Override
public final SelectImpl fullOuterJoin(TableLike<?> table) {
return join(table, JoinType.FULL_OUTER_JOIN);
}
@Override
public final SelectImpl fullOuterHashJoin(TableLike<?> table) {
return join(table, JoinType.FULL_OUTER_JOIN, HASH);
}
@Override
public final SelectImpl fullOuterLoopJoin(TableLike<?> table) {
return join(table, JoinType.FULL_OUTER_JOIN, LOOP);
}
@Override
public final SelectImpl fullOuterMergeJoin(TableLike<?> table) {
return join(table, JoinType.FULL_OUTER_JOIN, MERGE);
}
@Override
public final SelectImpl fullOuterJoin(Path<?> path) {
return join(path, JoinType.FULL_OUTER_JOIN).on(noCondition());
}
@Override
public final SelectImpl fullOuterHashJoin(Path<?> path) {
return join(path, JoinType.FULL_OUTER_JOIN, HASH).on(noCondition());
}
@Override
public final SelectImpl fullOuterLoopJoin(Path<?> path) {
return join(path, JoinType.FULL_OUTER_JOIN, LOOP).on(noCondition());
}
@Override
public final SelectImpl fullOuterMergeJoin(Path<?> path) {
return join(path, JoinType.FULL_OUTER_JOIN, MERGE).on(noCondition());
}
@Override
public final SelectImpl join(TableLike<?> table, JoinType type) {