From 8f32e73a7fd05253368d2d27f788f386cf1f5875 Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Thu, 9 Nov 2023 09:13:11 +0100 Subject: [PATCH] [jOOQ/jOOQ#15807] Remove JoinHint related API from OSS edition --- .../main/java/org/jooq/SelectJoinStep.java | 1180 +++++++++-------- jOOQ/src/main/java/org/jooq/SelectQuery.java | 24 + jOOQ/src/main/java/org/jooq/Table.java | 981 +++++++------- .../java/org/jooq/TableOuterJoinStep.java | 4 + .../java/org/jooq/impl/AbstractTable.java | 482 +++---- .../main/java/org/jooq/impl/SelectImpl.java | 464 ++++--- 6 files changed, 1697 insertions(+), 1438 deletions(-) diff --git a/jOOQ/src/main/java/org/jooq/SelectJoinStep.java b/jOOQ/src/main/java/org/jooq/SelectJoinStep.java index 8c847efbdd..54dc8a6fb8 100644 --- a/jOOQ/src/main/java/org/jooq/SelectJoinStep.java +++ b/jOOQ/src/main/java/org/jooq/SelectJoinStep.java @@ -156,12 +156,16 @@ public interface SelectJoinStep extends SelectWhereStep { /** * Convenience method to join a table to the last table added to the - * FROM clause using {@link Table#join(TableLike, JoinType, JoinHint)} + * FROM clause using + * {@link Table#join(TableLike, JoinType, JoinHint)} *

* Depending on the JoinType, a subsequent * {@link SelectOnStep#on(Condition)} or * {@link SelectOnStep#using(Field...)} clause is required. If it is - * required but omitted, the JOIN clause will be ignored + * required but omitted, the JOIN clause will be ignored. + *

+ * {@link JoinHint} are a commercial only feature and are ignored in the + * jOOQ Open Source Edition. */ @NotNull @CheckReturnValue @Support @@ -180,45 +184,6 @@ public interface SelectJoinStep extends SelectWhereStep { @Support SelectOnStep join(TableLike table); - /** - * Convenience method to INNER JOIN a table to the last table - * added to the FROM clause using {@link Table#hashJoin(TableLike)}. - *

- * A synonym for {@link #innerHashJoin(TableLike)}. - * - * @see Table#hashJoin(TableLike) - * @see #innerHashJoin(TableLike) - */ - @NotNull @CheckReturnValue - @Support - SelectOnStep hashJoin(TableLike table); - - /** - * Convenience method to INNER JOIN a table to the last table - * added to the FROM clause using {@link Table#loopJoin(TableLike)}. - *

- * A synonym for {@link #innerLoopJoin(TableLike)}. - * - * @see Table#loopJoin(TableLike) - * @see #innerLoopJoin(TableLike) - */ - @NotNull @CheckReturnValue - @Support - SelectOnStep loopJoin(TableLike table); - - /** - * Convenience method to INNER JOIN a table to the last table - * added to the FROM clause using {@link Table#mergeJoin(TableLike)}. - *

- * A synonym for {@link #innerMergeJoin(TableLike)}. - * - * @see Table#mergeJoin(TableLike) - * @see #innerMergeJoin(TableLike) - */ - @NotNull @CheckReturnValue - @Support - SelectOnStep mergeJoin(TableLike table); - /** * Convenience method to INNER JOIN a path to the last table * added to the FROM clause using {@link Table#join(Path)}. @@ -232,44 +197,93 @@ public interface SelectJoinStep extends SelectWhereStep { @Support SelectOptionalOnStep join(Path path); - /** - * Convenience method to INNER JOIN a path to the last table - * added to the FROM clause using {@link Table#hashJoin(Path)}. - *

- * A synonym for {@link #innerHashJoin(Path)}. - * - * @see Table#hashJoin(Path) - * @see #innerHashJoin(Path) - */ - @NotNull @CheckReturnValue - @Support - SelectOptionalOnStep hashJoin(Path path); - /** - * Convenience method to INNER JOIN a path to the last table - * added to the FROM clause using {@link Table#loopJoin(Path)}. - *

- * A synonym for {@link #innerLoopJoin(Path)}. - * - * @see Table#loopJoin(Path) - * @see #innerLoopJoin(Path) - */ - @NotNull @CheckReturnValue - @Support - SelectOptionalOnStep loopJoin(Path path); - /** - * Convenience method to INNER JOIN a path to the last table - * added to the FROM clause using {@link Table#mergeJoin(Path)}. - *

- * A synonym for {@link #innerMergeJoin(Path)}. - * - * @see Table#mergeJoin(Path) - * @see #innerMergeJoin(Path) - */ - @NotNull @CheckReturnValue - @Support - SelectOptionalOnStep mergeJoin(Path path); + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + /** * Convenience method to INNER JOIN a table to the last table @@ -385,36 +399,6 @@ public interface SelectJoinStep extends SelectWhereStep { @Support SelectOnStep innerJoin(TableLike table); - /** - * Convenience method to INNER JOIN a table to the last table - * added to the FROM clause using {@link Table#innerHashJoin(TableLike)}. - * - * @see Table#innerHashJoin(TableLike) - */ - @NotNull @CheckReturnValue - @Support - SelectOnStep innerHashJoin(TableLike table); - - /** - * Convenience method to INNER JOIN a table to the last table - * added to the FROM clause using {@link Table#innerLoopJoin(TableLike)}. - * - * @see Table#innerLoopJoin(TableLike) - */ - @NotNull @CheckReturnValue - @Support - SelectOnStep innerLoopJoin(TableLike table); - - /** - * Convenience method to INNER JOIN a table to the last table - * added to the FROM clause using {@link Table#innerMergeJoin(TableLike)}. - * - * @see Table#innerMergeJoin(TableLike) - */ - @NotNull @CheckReturnValue - @Support - SelectOnStep innerMergeJoin(TableLike table); - /** * Convenience method to INNER JOIN a path to the last table * added to the FROM clause using {@link Table#join(Path)}. @@ -425,35 +409,75 @@ public interface SelectJoinStep extends SelectWhereStep { @Support SelectOptionalOnStep innerJoin(Path path); - /** - * Convenience method to INNER JOIN a path to the last table - * added to the FROM clause using {@link Table#innerHashJoin(Path)}. - * - * @see Table#innerHashJoin(Path) - */ - @NotNull @CheckReturnValue - @Support - SelectOptionalOnStep innerHashJoin(Path path); - /** - * Convenience method to INNER JOIN a path to the last table - * added to the FROM clause using {@link Table#innerLoopJoin(Path)}. - * - * @see Table#innerLoopJoin(Path) - */ - @NotNull @CheckReturnValue - @Support - SelectOptionalOnStep innerLoopJoin(Path path); - /** - * Convenience method to INNER JOIN a path to the last table - * added to the FROM clause using {@link Table#innerMergeJoin(Path)}. - * - * @see Table#innerMergeJoin(Path) - */ - @NotNull @CheckReturnValue - @Support - SelectOptionalOnStep innerMergeJoin(Path path); + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + /** * Convenience method to INNER JOIN a table to the last table @@ -700,48 +724,6 @@ public interface SelectJoinStep extends SelectWhereStep { @Support SelectJoinPartitionByStep leftJoin(TableLike table); - /** - * Convenience method to LEFT OUTER JOIN a table to the last - * table added to the FROM clause using - * {@link Table#leftOuterHashJoin(TableLike)}. - *

- * A synonym for {@link #leftOuterHashJoin(TableLike)}. - * - * @see Table#leftOuterHashJoin(TableLike) - * @see #leftOuterHashJoin(TableLike) - */ - @NotNull @CheckReturnValue - @Support - SelectJoinPartitionByStep leftHashJoin(TableLike table); - - /** - * Convenience method to LEFT OUTER JOIN a table to the last - * table added to the FROM clause using - * {@link Table#leftOuterLoopJoin(TableLike)}. - *

- * A synonym for {@link #leftOuterLoopJoin(TableLike)}. - * - * @see Table#leftOuterLoopJoin(TableLike) - * @see #leftOuterLoopJoin(TableLike) - */ - @NotNull @CheckReturnValue - @Support - SelectJoinPartitionByStep leftLoopJoin(TableLike table); - - /** - * Convenience method to LEFT OUTER JOIN a table to the last - * table added to the FROM clause using - * {@link Table#leftOuterMergeJoin(TableLike)}. - *

- * A synonym for {@link #leftOuterMergeJoin(TableLike)}. - * - * @see Table#leftOuterMergeJoin(TableLike) - * @see #leftOuterMergeJoin(TableLike) - */ - @NotNull @CheckReturnValue - @Support - SelectJoinPartitionByStep leftMergeJoin(TableLike table); - /** * Convenience method to LEFT OUTER JOIN a path to the last * table added to the FROM clause using @@ -756,47 +738,99 @@ public interface SelectJoinStep extends SelectWhereStep { @Support SelectOptionalOnStep leftJoin(Path table); - /** - * Convenience method to LEFT OUTER JOIN a path to the last - * table added to the FROM clause using - * {@link Table#leftOuterHashJoin(Path)}. - *

- * A synonym for {@link #leftOuterHashJoin(Path)}. - * - * @see Table#leftOuterHashJoin(Path) - * @see #leftOuterHashJoin(Path) - */ - @NotNull @CheckReturnValue - @Support - SelectOptionalOnStep leftHashJoin(Path table); - /** - * Convenience method to LEFT OUTER JOIN a path to the last - * table added to the FROM clause using - * {@link Table#leftOuterLoopJoin(Path)}. - *

- * A synonym for {@link #leftOuterLoopJoin(Path)}. - * - * @see Table#leftOuterLoopJoin(Path) - * @see #leftOuterLoopJoin(Path) - */ - @NotNull @CheckReturnValue - @Support - SelectOptionalOnStep leftLoopJoin(Path table); - /** - * Convenience method to LEFT OUTER JOIN a path to the last - * table added to the FROM clause using - * {@link Table#leftOuterMergeJoin(Path)}. - *

- * A synonym for {@link #leftOuterMergeJoin(Path)}. - * - * @see Table#leftOuterMergeJoin(Path) - * @see #leftOuterMergeJoin(Path) - */ - @NotNull @CheckReturnValue - @Support - SelectOptionalOnStep leftMergeJoin(Path table); + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + /** * Convenience method to LEFT OUTER JOIN a table to the last @@ -914,39 +948,6 @@ public interface SelectJoinStep extends SelectWhereStep { @Support SelectJoinPartitionByStep leftOuterJoin(TableLike table); - /** - * Convenience method to LEFT OUTER JOIN a table to the last - * table added to the FROM clause using - * {@link Table#leftOuterHashJoin(TableLike)} - * - * @see Table#leftOuterHashJoin(TableLike) - */ - @NotNull @CheckReturnValue - @Support - SelectJoinPartitionByStep leftOuterHashJoin(TableLike table); - - /** - * Convenience method to LEFT OUTER JOIN a table to the last - * table added to the FROM clause using - * {@link Table#leftOuterLoopJoin(TableLike)} - * - * @see Table#leftOuterLoopJoin(TableLike) - */ - @NotNull @CheckReturnValue - @Support - SelectJoinPartitionByStep leftOuterLoopJoin(TableLike table); - - /** - * Convenience method to LEFT OUTER JOIN a table to the last - * table added to the FROM clause using - * {@link Table#leftOuterMergeJoin(TableLike)} - * - * @see Table#leftOuterMergeJoin(TableLike) - */ - @NotNull @CheckReturnValue - @Support - SelectJoinPartitionByStep leftOuterMergeJoin(TableLike table); - /** * Convenience method to LEFT OUTER JOIN a path to the last * table added to the FROM clause using @@ -958,38 +959,81 @@ public interface SelectJoinStep extends SelectWhereStep { @Support SelectOptionalOnStep leftOuterJoin(Path path); - /** - * Convenience method to LEFT OUTER JOIN a path to the last - * table added to the FROM clause using - * {@link Table#leftOuterHashJoin(Path)} - * - * @see Table#leftOuterHashJoin(Path) - */ - @NotNull @CheckReturnValue - @Support - SelectOptionalOnStep leftOuterHashJoin(Path path); - /** - * Convenience method to LEFT OUTER JOIN a path to the last - * table added to the FROM clause using - * {@link Table#leftOuterLoopJoin(Path)} - * - * @see Table#leftOuterLoopJoin(Path) - */ - @NotNull @CheckReturnValue - @Support - SelectOptionalOnStep leftOuterLoopJoin(Path path); - /** - * Convenience method to LEFT OUTER JOIN a path to the last - * table added to the FROM clause using - * {@link Table#leftOuterMergeJoin(Path)} - * - * @see Table#leftOuterMergeJoin(Path) - */ - @NotNull @CheckReturnValue - @Support - SelectOptionalOnStep leftOuterMergeJoin(Path path); + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + /** * Convenience method to LEFT OUTER JOIN a table to the last @@ -1095,48 +1139,6 @@ public interface SelectJoinStep extends SelectWhereStep { @Support SelectJoinPartitionByStep rightJoin(TableLike table); - /** - * Convenience method to RIGHT OUTER JOIN a table to the last - * table added to the FROM clause using - * {@link Table#rightOuterHashJoin(TableLike)}. - *

- * A synonym for {@link #rightOuterHashJoin(TableLike)}. - * - * @see Table#rightOuterHashJoin(TableLike) - * @see #rightOuterHashJoin(TableLike) - */ - @NotNull @CheckReturnValue - @Support - SelectJoinPartitionByStep rightHashJoin(TableLike table); - - /** - * Convenience method to RIGHT OUTER JOIN a table to the last - * table added to the FROM clause using - * {@link Table#rightOuterLoopJoin(TableLike)}. - *

- * A synonym for {@link #rightOuterLoopJoin(TableLike)}. - * - * @see Table#rightOuterLoopJoin(TableLike) - * @see #rightOuterLoopJoin(TableLike) - */ - @NotNull @CheckReturnValue - @Support - SelectJoinPartitionByStep rightLoopJoin(TableLike table); - - /** - * Convenience method to RIGHT OUTER JOIN a table to the last - * table added to the FROM clause using - * {@link Table#rightOuterMergeJoin(TableLike)}. - *

- * A synonym for {@link #rightOuterMergeJoin(TableLike)}. - * - * @see Table#rightOuterMergeJoin(TableLike) - * @see #rightOuterMergeJoin(TableLike) - */ - @NotNull @CheckReturnValue - @Support - SelectJoinPartitionByStep rightMergeJoin(TableLike table); - /** * Convenience method to RIGHT OUTER JOIN a path to the last * table added to the FROM clause using @@ -1151,47 +1153,99 @@ public interface SelectJoinStep extends SelectWhereStep { @Support SelectOptionalOnStep rightJoin(Path path); - /** - * Convenience method to RIGHT OUTER JOIN a path to the last - * table added to the FROM clause using - * {@link Table#rightOuterHashJoin(Path)}. - *

- * A synonym for {@link #rightOuterHashJoin(Path)}. - * - * @see Table#rightOuterHashJoin(Path) - * @see #rightOuterHashJoin(Path) - */ - @NotNull @CheckReturnValue - @Support - SelectOptionalOnStep rightHashJoin(Path path); - /** - * Convenience method to RIGHT OUTER JOIN a path to the last - * table added to the FROM clause using - * {@link Table#rightOuterLoopJoin(Path)}. - *

- * A synonym for {@link #rightOuterLoopJoin(Path)}. - * - * @see Table#rightOuterLoopJoin(Path) - * @see #rightOuterLoopJoin(Path) - */ - @NotNull @CheckReturnValue - @Support - SelectOptionalOnStep rightLoopJoin(Path path); - /** - * Convenience method to RIGHT OUTER JOIN a path to the last - * table added to the FROM clause using - * {@link Table#rightOuterMergeJoin(Path)}. - *

- * A synonym for {@link #rightOuterMergeJoin(Path)}. - * - * @see Table#rightOuterMergeJoin(Path) - * @see #rightOuterMergeJoin(Path) - */ - @NotNull @CheckReturnValue - @Support - SelectOptionalOnStep rightMergeJoin(Path path); + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + /** * Convenience method to RIGHT OUTER JOIN a table to the last @@ -1309,39 +1363,6 @@ public interface SelectJoinStep extends SelectWhereStep { @Support SelectJoinPartitionByStep rightOuterJoin(TableLike table); - /** - * Convenience method to RIGHT OUTER JOIN a table to the last - * table added to the FROM clause using - * {@link Table#rightOuterHashJoin(TableLike)} - * - * @see Table#rightOuterHashJoin(TableLike) - */ - @NotNull @CheckReturnValue - @Support - SelectJoinPartitionByStep rightOuterHashJoin(TableLike table); - - /** - * Convenience method to RIGHT OUTER JOIN a table to the last - * table added to the FROM clause using - * {@link Table#rightOuterLoopJoin(TableLike)} - * - * @see Table#rightOuterLoopJoin(TableLike) - */ - @NotNull @CheckReturnValue - @Support - SelectJoinPartitionByStep rightOuterLoopJoin(TableLike table); - - /** - * Convenience method to RIGHT OUTER JOIN a table to the last - * table added to the FROM clause using - * {@link Table#rightOuterMergeJoin(TableLike)} - * - * @see Table#rightOuterMergeJoin(TableLike) - */ - @NotNull @CheckReturnValue - @Support - SelectJoinPartitionByStep rightOuterMergeJoin(TableLike table); - /** * Convenience method to RIGHT OUTER JOIN a path to the last * table added to the FROM clause using @@ -1353,38 +1374,81 @@ public interface SelectJoinStep extends SelectWhereStep { @Support SelectOptionalOnStep rightOuterJoin(Path path); - /** - * Convenience method to RIGHT OUTER JOIN a path to the last - * table added to the FROM clause using - * {@link Table#rightOuterHashJoin(Path)} - * - * @see Table#rightOuterHashJoin(Path) - */ - @NotNull @CheckReturnValue - @Support - SelectOptionalOnStep rightOuterHashJoin(Path path); - /** - * Convenience method to RIGHT OUTER JOIN a path to the last - * table added to the FROM clause using - * {@link Table#rightOuterLoopJoin(Path)} - * - * @see Table#rightOuterLoopJoin(Path) - */ - @NotNull @CheckReturnValue - @Support - SelectOptionalOnStep rightOuterLoopJoin(Path path); - /** - * Convenience method to RIGHT OUTER JOIN a path to the last - * table added to the FROM clause using - * {@link Table#rightOuterMergeJoin(Path)} - * - * @see Table#rightOuterMergeJoin(Path) - */ - @NotNull @CheckReturnValue - @Support - SelectOptionalOnStep rightOuterMergeJoin(Path path); + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + /** * Convenience method to RIGHT OUTER JOIN a table to the last @@ -1487,39 +1551,6 @@ public interface SelectJoinStep extends SelectWhereStep { @Support({ FIREBIRD, HSQLDB, POSTGRES, SQLITE, TRINO, YUGABYTEDB }) SelectOnStep fullJoin(TableLike table); - /** - * Convenience method to FULL OUTER JOIN a table to the last - * table added to the FROM clause using - * {@link Table#fullOuterHashJoin(TableLike)}. - *

- * A synonym for {@link #fullOuterHashJoin(TableLike)}. - */ - @NotNull @CheckReturnValue - @Support({ FIREBIRD, HSQLDB, POSTGRES, SQLITE, TRINO, YUGABYTEDB }) - SelectOnStep fullHashJoin(TableLike table); - - /** - * Convenience method to FULL OUTER JOIN a table to the last - * table added to the FROM clause using - * {@link Table#fullOuterLoopJoin(TableLike)}. - *

- * A synonym for {@link #fullOuterLoopJoin(TableLike)}. - */ - @NotNull @CheckReturnValue - @Support({ FIREBIRD, HSQLDB, POSTGRES, SQLITE, TRINO, YUGABYTEDB }) - SelectOnStep fullLoopJoin(TableLike table); - - /** - * Convenience method to FULL OUTER JOIN a table to the last - * table added to the FROM clause using - * {@link Table#fullOuterMergeJoin(TableLike)}. - *

- * A synonym for {@link #fullOuterMergeJoin(TableLike)}. - */ - @NotNull @CheckReturnValue - @Support({ FIREBIRD, HSQLDB, POSTGRES, SQLITE, TRINO, YUGABYTEDB }) - SelectOnStep fullMergeJoin(TableLike table); - /** * Convenience method to FULL OUTER JOIN a path to the last * table added to the FROM clause using @@ -1531,38 +1562,81 @@ public interface SelectJoinStep extends SelectWhereStep { @Support({ FIREBIRD, HSQLDB, POSTGRES, SQLITE, TRINO, YUGABYTEDB }) SelectOptionalOnStep fullJoin(Path table); - /** - * Convenience method to FULL OUTER JOIN a path to the last - * table added to the FROM clause using - * {@link Table#fullOuterHashJoin(Path)}. - *

- * A synonym for {@link #fullOuterHashJoin(Path)}. - */ - @NotNull @CheckReturnValue - @Support({ FIREBIRD, HSQLDB, POSTGRES, SQLITE, TRINO, YUGABYTEDB }) - SelectOptionalOnStep fullHashJoin(Path table); - /** - * Convenience method to FULL OUTER JOIN a path to the last - * table added to the FROM clause using - * {@link Table#fullOuterLoopJoin(Path)}. - *

- * A synonym for {@link #fullOuterLoopJoin(Path)}. - */ - @NotNull @CheckReturnValue - @Support({ FIREBIRD, HSQLDB, POSTGRES, SQLITE, TRINO, YUGABYTEDB }) - SelectOptionalOnStep fullLoopJoin(Path table); - /** - * Convenience method to FULL OUTER JOIN a path to the last - * table added to the FROM clause using - * {@link Table#fullOuterMergeJoin(Path)}. - *

- * A synonym for {@link #fullOuterMergeJoin(Path)}. - */ - @NotNull @CheckReturnValue - @Support({ FIREBIRD, HSQLDB, POSTGRES, SQLITE, TRINO, YUGABYTEDB }) - SelectOptionalOnStep fullMergeJoin(Path table); + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + /** * Convenience method to FULL OUTER JOIN a table to the last @@ -1654,39 +1728,6 @@ public interface SelectJoinStep extends SelectWhereStep { @Support({ FIREBIRD, HSQLDB, POSTGRES, SQLITE, TRINO, YUGABYTEDB }) SelectOnStep fullOuterJoin(TableLike table); - /** - * Convenience method to FULL OUTER JOIN a table to the last - * table added to the FROM clause using - * {@link Table#fullOuterHashJoin(TableLike)} - * - * @see Table#fullOuterHashJoin(TableLike) - */ - @NotNull @CheckReturnValue - @Support({ FIREBIRD, HSQLDB, POSTGRES, SQLITE, TRINO, YUGABYTEDB }) - SelectOnStep fullOuterHashJoin(TableLike table); - - /** - * Convenience method to FULL OUTER JOIN a table to the last - * table added to the FROM clause using - * {@link Table#fullOuterLoopJoin(TableLike)} - * - * @see Table#fullOuterLoopJoin(TableLike) - */ - @NotNull @CheckReturnValue - @Support({ FIREBIRD, HSQLDB, POSTGRES, SQLITE, TRINO, YUGABYTEDB }) - SelectOnStep fullOuterLoopJoin(TableLike table); - - /** - * Convenience method to FULL OUTER JOIN a table to the last - * table added to the FROM clause using - * {@link Table#fullOuterMergeJoin(TableLike)} - * - * @see Table#fullOuterMergeJoin(TableLike) - */ - @NotNull @CheckReturnValue - @Support({ FIREBIRD, HSQLDB, POSTGRES, SQLITE, TRINO, YUGABYTEDB }) - SelectOnStep fullOuterMergeJoin(TableLike table); - /** * Convenience method to FULL OUTER JOIN a path to the last * table added to the FROM clause using @@ -1698,38 +1739,81 @@ public interface SelectJoinStep extends SelectWhereStep { @Support({ FIREBIRD, HSQLDB, POSTGRES, SQLITE, TRINO, YUGABYTEDB }) SelectOptionalOnStep fullOuterJoin(Path table); - /** - * Convenience method to FULL OUTER JOIN a path to the last - * table added to the FROM clause using - * {@link Table#fullOuterHashJoin(Path)} - * - * @see Table#fullOuterHashJoin(Path) - */ - @NotNull @CheckReturnValue - @Support({ FIREBIRD, HSQLDB, POSTGRES, SQLITE, TRINO, YUGABYTEDB }) - SelectOptionalOnStep fullOuterHashJoin(Path table); - /** - * Convenience method to FULL OUTER JOIN a path to the last - * table added to the FROM clause using - * {@link Table#fullOuterLoopJoin(Path)} - * - * @see Table#fullOuterLoopJoin(Path) - */ - @NotNull @CheckReturnValue - @Support({ FIREBIRD, HSQLDB, POSTGRES, SQLITE, TRINO, YUGABYTEDB }) - SelectOptionalOnStep fullOuterLoopJoin(Path table); - /** - * Convenience method to FULL OUTER JOIN a path to the last - * table added to the FROM clause using - * {@link Table#fullOuterMergeJoin(Path)} - * - * @see Table#fullOuterMergeJoin(Path) - */ - @NotNull @CheckReturnValue - @Support({ FIREBIRD, HSQLDB, POSTGRES, SQLITE, TRINO, YUGABYTEDB }) - SelectOptionalOnStep fullOuterMergeJoin(Path table); + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + /** * Convenience method to FULL OUTER JOIN a table to the last diff --git a/jOOQ/src/main/java/org/jooq/SelectQuery.java b/jOOQ/src/main/java/org/jooq/SelectQuery.java index 8dbfd622e5..59221b7aa4 100644 --- a/jOOQ/src/main/java/org/jooq/SelectQuery.java +++ b/jOOQ/src/main/java/org/jooq/SelectQuery.java @@ -229,6 +229,9 @@ public interface SelectQuery extends Select, ConditionProvi /** * Joins the existing table product to a new table using a condition, * connecting them with each other with {@link Operator#AND}. + *

+ * {@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 extends Select, ConditionProvi /** * Joins the existing table product to a new table using a condition, * connecting them with each other with {@link Operator#AND}. + *

+ * {@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 extends Select, ConditionProvi + + + + + + @@ -355,6 +367,9 @@ public interface SelectQuery extends Select, ConditionProvi *

* If this is not supported by your RDBMS, then jOOQ will try to emulate * this behaviour using the information provided in this query. + *

+ * {@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 extends Select, ConditionProvi /** * Joins the existing table product to a new table using a foreign key. + *

+ * {@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 extends Select, ConditionProvi /** * Joins the existing table product to a new table using a foreign key. + *

+ * {@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 extends Select, ConditionProvi /** * Joins the existing table product to a new table using a foreign key. + *

+ * {@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 diff --git a/jOOQ/src/main/java/org/jooq/Table.java b/jOOQ/src/main/java/org/jooq/Table.java index eb15659031..738466907f 100644 --- a/jOOQ/src/main/java/org/jooq/Table.java +++ b/jOOQ/src/main/java/org/jooq/Table.java @@ -1027,10 +1027,13 @@ extends * Join a table to this table using a {@link JoinType} and {@link JoinHint}. *

* Depending on the JoinType, a subsequent - * {@link TableOnStep#on(Condition)} or - * {@link TableOnStep#using(Field...)} clause is required. If it is required - * but omitted, a {@link DSL#trueCondition()}, i.e. 1 = 1 - * condition will be rendered + * {@link TableOnStep#on(Condition)} or {@link TableOnStep#using(Field...)} + * clause is required. If it is required but omitted, a + * {@link DSL#trueCondition()}, i.e. 1 = 1 condition will be + * rendered. + *

+ * {@link JoinHint} are a commercial only feature and are ignored in the + * jOOQ Open Source Edition. */ @NotNull @Support @@ -1047,42 +1050,6 @@ extends @Support TableOnStep join(TableLike table); - /** - * INNER JOIN a table to this table with a - * {@link JoinHint#HASH} hint. - *

- * A synonym for {@link #innerHashJoin(TableLike)}. - * - * @see #innerHashJoin(TableLike) - */ - @NotNull - @Support - TableOnStep hashJoin(TableLike table); - - /** - * INNER JOIN a table to this table with a - * {@link JoinHint#LOOP} hint. - *

- * A synonym for {@link #innerLoopJoin(TableLike)}. - * - * @see #innerLoopJoin(TableLike) - */ - @NotNull - @Support - TableOnStep loopJoin(TableLike table); - - /** - * INNER JOIN a table to this table with a - * {@link JoinHint#MERGE} hint. - *

- * A synonym for {@link #innerMergeJoin(TableLike)}. - * - * @see #innerMergeJoin(TableLike) - */ - @NotNull - @Support - TableOnStep mergeJoin(TableLike table); - /** * INNER JOIN a path to this table. *

@@ -1092,35 +1059,80 @@ extends @Support TableOptionalOnStep join(Path path); - /** - * INNER JOIN a path to this table with a - * {@link JoinHint#HASH} hint. - *

- * A synonym for {@link #innerHashJoin(Path)}. - */ - @NotNull - @Support - TableOptionalOnStep hashJoin(Path path); - /** - * INNER JOIN a path to this table with a - * {@link JoinHint#LOOP} hint. - *

- * A synonym for {@link #innerLoopJoin(Path)}. - */ - @NotNull - @Support - TableOptionalOnStep loopJoin(Path path); - /** - * INNER JOIN a path to this table with a - * {@link JoinHint#MERGE} hint. - *

- * A synonym for {@link #innerMergeJoin(Path)}. - */ - @NotNull - @Support - TableOptionalOnStep mergeJoin(Path path); + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + /** * INNER JOIN a table to this table. @@ -1220,30 +1232,6 @@ extends @Support TableOnStep innerJoin(TableLike table); - /** - * INNER JOIN a table to this table with a - * {@link JoinHint#HASH} hint. - */ - @NotNull - @Support - TableOnStep innerHashJoin(TableLike table); - - /** - * INNER JOIN a table to this table with a - * {@link JoinHint#LOOP} hint. - */ - @NotNull - @Support - TableOnStep innerLoopJoin(TableLike table); - - /** - * INNER JOIN a table to this table with a - * {@link JoinHint#MERGE} hint. - */ - @NotNull - @Support - TableOnStep innerMergeJoin(TableLike table); - /** * INNER JOIN a path to this table. */ @@ -1251,29 +1239,63 @@ extends @Support TableOptionalOnStep innerJoin(Path path); - /** - * INNER JOIN a path to this table with a - * {@link JoinHint#HASH} hint. - */ - @NotNull - @Support - TableOptionalOnStep innerHashJoin(Path path); - /** - * INNER JOIN a path to this table with a - * {@link JoinHint#LOOP} hint. - */ - @NotNull - @Support - TableOptionalOnStep innerLoopJoin(Path path); - /** - * INNER JOIN a path to this table with a - * {@link JoinHint#MERGE} hint. - */ - @NotNull - @Support - TableOptionalOnStep innerMergeJoin(Path path); + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + /** * INNER JOIN a table to this table. @@ -1381,88 +1403,99 @@ extends @Support TablePartitionByStep leftJoin(TableLike table); - /** - * LEFT OUTER JOIN a table to this table with a - * {@link JoinHint#HASH} hint. - *

- * A synonym for {@link #leftOuterHashJoin(TableLike)}. - * - * @see #leftOuterHashJoin(TableLike) - */ - @NotNull - @Support - TablePartitionByStep leftHashJoin(TableLike table); - /** - * LEFT OUTER JOIN a table to this table with a - * {@link JoinHint#LOOP} hint. - *

- * A synonym for {@link #leftOuterLoopJoin(TableLike)}. - * - * @see #leftOuterLoopJoin(TableLike) - */ - @NotNull - @Support - TablePartitionByStep leftLoopJoin(TableLike table); - /** - * LEFT OUTER JOIN a table to this table with a - * {@link JoinHint#MERGE} hint. - *

- * A synonym for {@link #leftOuterMergeJoin(TableLike)}. - * - * @see #leftOuterMergeJoin(TableLike) - */ - @NotNull - @Support - TablePartitionByStep leftMergeJoin(TableLike table); - /** - * LEFT OUTER JOIN a path to this table. - *

- * A synonym for {@link #leftOuterJoin(Path)}. - * - * @see #leftOuterJoin(Path) - */ - @NotNull - @Support - TableOptionalOnStep leftJoin(Path path); - /** - * LEFT OUTER JOIN a path to this table with a - * {@link JoinHint#HASH} hint. - *

- * A synonym for {@link #leftOuterHashJoin(Path)}. - * - * @see #leftOuterHashJoin(Path) - */ - @NotNull - @Support - TableOptionalOnStep leftHashJoin(Path path); - /** - * LEFT OUTER JOIN a path to this table with a - * {@link JoinHint#LOOP} hint. - *

- * A synonym for {@link #leftOuterLoopJoin(Path)}. - * - * @see #leftOuterLoopJoin(Path) - */ - @NotNull - @Support - TableOptionalOnStep leftLoopJoin(Path path); - /** - * LEFT OUTER JOIN a path to this table with a - * {@link JoinHint#MERGE} hint. - *

- * A synonym for {@link #leftOuterMergeJoin(Path)}. - * - * @see #leftOuterMergeJoin(Path) - */ - @NotNull - @Support - TableOptionalOnStep leftMergeJoin(Path path); + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + /** * LEFT OUTER JOIN a table to this table. @@ -1561,30 +1594,6 @@ extends @Support TablePartitionByStep leftOuterJoin(TableLike table); - /** - * LEFT OUTER JOIN a table to this table with a - * {@link JoinHint#HASH} hint. - */ - @NotNull - @Support - TablePartitionByStep leftOuterHashJoin(TableLike table); - - /** - * LEFT OUTER JOIN a table to this table with a - * {@link JoinHint#LOOP} hint. - */ - @NotNull - @Support - TablePartitionByStep leftOuterLoopJoin(TableLike table); - - /** - * LEFT OUTER JOIN a table to this table with a - * {@link JoinHint#MERGE} hint. - */ - @NotNull - @Support - TablePartitionByStep leftOuterMergeJoin(TableLike table); - /** * LEFT OUTER JOIN a path to this table. */ @@ -1592,29 +1601,63 @@ extends @Support TableOptionalOnStep leftOuterJoin(Path path); - /** - * LEFT OUTER JOIN a path to this table with a - * {@link JoinHint#HASH} hint. - */ - @NotNull - @Support - TableOptionalOnStep leftOuterHashJoin(Path path); - /** - * LEFT OUTER JOIN a path to this table with a - * {@link JoinHint#LOOP} hint. - */ - @NotNull - @Support - TableOptionalOnStep leftOuterLoopJoin(Path path); - /** - * LEFT OUTER JOIN a path to this table with a - * {@link JoinHint#MERGE} hint. - */ - @NotNull - @Support - TableOptionalOnStep leftOuterMergeJoin(Path path); + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + /** * LEFT OUTER JOIN a table to this table. @@ -1703,42 +1746,6 @@ extends @Support TablePartitionByStep rightJoin(TableLike table); - /** - * RIGHT OUTER JOIN a table to this table with a - * {@link JoinHint#HASH} hint. - *

- * A synonym for {@link #rightOuterHashJoin(TableLike)}. - * - * @see #rightOuterHashJoin(TableLike) - */ - @NotNull - @Support - TablePartitionByStep rightHashJoin(TableLike table); - - /** - * RIGHT OUTER JOIN a table to this table with a - * {@link JoinHint#LOOP} hint. - *

- * A synonym for {@link #rightOuterLoopJoin(TableLike)}. - * - * @see #rightOuterLoopJoin(TableLike) - */ - @NotNull - @Support - TablePartitionByStep rightLoopJoin(TableLike table); - - /** - * RIGHT OUTER JOIN a table to this table with a - * {@link JoinHint#MERGE} hint. - *

- * A synonym for {@link #rightOuterMergeJoin(TableLike)}. - * - * @see #rightOuterMergeJoin(TableLike) - */ - @NotNull - @Support - TablePartitionByStep rightMergeJoin(TableLike table); - /** * RIGHT OUTER JOIN a path to this table. *

@@ -1750,41 +1757,87 @@ extends @Support TableOptionalOnStep rightJoin(Path path); - /** - * RIGHT OUTER JOIN a path to this table with a - * {@link JoinHint#HASH} hint. - *

- * A synonym for {@link #rightOuterHashJoin(Path)}. - * - * @see #rightOuterHashJoin(Path) - */ - @NotNull - @Support - TableOptionalOnStep rightHashJoin(Path path); - /** - * RIGHT OUTER JOIN a path to this table with a - * {@link JoinHint#LOOP} hint. - *

- * A synonym for {@link #rightOuterLoopJoin(Path)}. - * - * @see #rightOuterLoopJoin(Path) - */ - @NotNull - @Support - TableOptionalOnStep rightLoopJoin(Path path); - /** - * RIGHT OUTER JOIN a path to this table with a - * {@link JoinHint#MERGE} hint. - *

- * A synonym for {@link #rightOuterMergeJoin(Path)}. - * - * @see #rightOuterMergeJoin(Path) - */ - @NotNull - @Support - TableOptionalOnStep rightMergeJoin(Path path); + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + /** * RIGHT OUTER JOIN a table to this table. @@ -1883,30 +1936,6 @@ extends @Support TablePartitionByStep rightOuterJoin(TableLike table); - /** - * RIGHT OUTER JOIN a table to this table with a - * {@link JoinHint#HASH} hint. - */ - @NotNull - @Support - TablePartitionByStep rightOuterHashJoin(TableLike table); - - /** - * RIGHT OUTER JOIN a table to this table with a - * {@link JoinHint#LOOP} hint. - */ - @NotNull - @Support - TablePartitionByStep rightOuterLoopJoin(TableLike table); - - /** - * RIGHT OUTER JOIN a table to this table with a - * {@link JoinHint#MERGE} hint. - */ - @NotNull - @Support - TablePartitionByStep rightOuterMergeJoin(TableLike table); - /** * RIGHT OUTER JOIN a path to this table. */ @@ -1914,29 +1943,63 @@ extends @Support TableOptionalOnStep rightOuterJoin(Path path); - /** - * RIGHT OUTER JOIN a path to this table with a - * {@link JoinHint#HASH} hint. - */ - @NotNull - @Support - TableOptionalOnStep rightOuterHashJoin(Path path); - /** - * RIGHT OUTER JOIN a path to this table with a - * {@link JoinHint#LOOP} hint. - */ - @NotNull - @Support - TableOptionalOnStep rightOuterLoopJoin(Path path); - /** - * RIGHT OUTER JOIN a path to this table with a - * {@link JoinHint#MERGE} hint. - */ - @NotNull - @Support - TableOptionalOnStep rightOuterMergeJoin(Path path); + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + /** * RIGHT OUTER JOIN a table to this table. @@ -2022,36 +2085,6 @@ extends @Support({ FIREBIRD, HSQLDB, POSTGRES, SQLITE, TRINO, YUGABYTEDB }) TablePartitionByStep fullJoin(TableLike table); - /** - * FULL OUTER JOIN a table to this table with a - * {@link JoinHint#HASH} hint. - *

- * A synonym for {@link #fullOuterHashJoin(TableLike)}. - */ - @NotNull - @Support({ FIREBIRD, HSQLDB, POSTGRES, SQLITE, TRINO, YUGABYTEDB }) - TablePartitionByStep fullHashJoin(TableLike table); - - /** - * FULL OUTER JOIN a table to this table with a - * {@link JoinHint#LOOP} hint. - *

- * A synonym for {@link #fullOuterLoopJoin(TableLike)}. - */ - @NotNull - @Support({ FIREBIRD, HSQLDB, POSTGRES, SQLITE, TRINO, YUGABYTEDB }) - TablePartitionByStep fullLoopJoin(TableLike table); - - /** - * FULL OUTER JOIN a table to this table with a - * {@link JoinHint#MERGE} hint. - *

- * A synonym for {@link #fullOuterMergeJoin(TableLike)}. - */ - @NotNull - @Support({ FIREBIRD, HSQLDB, POSTGRES, SQLITE, TRINO, YUGABYTEDB }) - TablePartitionByStep fullMergeJoin(TableLike table); - /** * FULL OUTER JOIN a path to this table. *

@@ -2061,35 +2094,75 @@ extends @Support({ FIREBIRD, HSQLDB, POSTGRES, SQLITE, TRINO, YUGABYTEDB }) TableOptionalOnStep fullJoin(Path path); - /** - * FULL OUTER JOIN a path to this table with a - * {@link JoinHint#HASH} hint. - *

- * A synonym for {@link #fullOuterHashJoin(Path)}. - */ - @NotNull - @Support({ FIREBIRD, HSQLDB, POSTGRES, SQLITE, TRINO, YUGABYTEDB }) - TableOptionalOnStep fullHashJoin(Path path); - /** - * FULL OUTER JOIN a path to this table with a - * {@link JoinHint#LOOP} hint. - *

- * A synonym for {@link #fullOuterLoopJoin(Path)}. - */ - @NotNull - @Support({ FIREBIRD, HSQLDB, POSTGRES, SQLITE, TRINO, YUGABYTEDB }) - TableOptionalOnStep fullLoopJoin(Path path); - /** - * FULL OUTER JOIN a path to this table with a - * {@link JoinHint#MERGE} hint. - *

- * A synonym for {@link #fullOuterMergeJoin(Path)}. - */ - @NotNull - @Support({ FIREBIRD, HSQLDB, POSTGRES, SQLITE, TRINO, YUGABYTEDB }) - TableOptionalOnStep fullMergeJoin(Path path); + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + /** * FULL OUTER JOIN a table to this table. @@ -2167,30 +2240,6 @@ extends @Support({ FIREBIRD, HSQLDB, POSTGRES, SQLITE, TRINO, YUGABYTEDB }) TablePartitionByStep fullOuterJoin(TableLike table); - /** - * FULL OUTER JOIN a table to this table with a - * {@link JoinHint#HASH} hint. - */ - @NotNull - @Support({ FIREBIRD, HSQLDB, POSTGRES, SQLITE, TRINO, YUGABYTEDB }) - TablePartitionByStep fullOuterHashJoin(TableLike table); - - /** - * FULL OUTER JOIN a table to this table with a - * {@link JoinHint#LOOP} hint. - */ - @NotNull - @Support({ FIREBIRD, HSQLDB, POSTGRES, SQLITE, TRINO, YUGABYTEDB }) - TablePartitionByStep fullOuterLoopJoin(TableLike table); - - /** - * FULL OUTER JOIN a table to this table with a - * {@link JoinHint#MERGE} hint. - */ - @NotNull - @Support({ FIREBIRD, HSQLDB, POSTGRES, SQLITE, TRINO, YUGABYTEDB }) - TablePartitionByStep fullOuterMergeJoin(TableLike table); - /** * FULL OUTER JOIN a path to this table. */ @@ -2198,29 +2247,63 @@ extends @Support({ FIREBIRD, HSQLDB, POSTGRES, SQLITE, TRINO, YUGABYTEDB }) TableOptionalOnStep fullOuterJoin(Path path); - /** - * FULL OUTER JOIN a path to this table with a - * {@link JoinHint#HASH} hint. - */ - @NotNull - @Support({ FIREBIRD, HSQLDB, POSTGRES, SQLITE, TRINO, YUGABYTEDB }) - TableOptionalOnStep fullOuterHashJoin(Path path); - /** - * FULL OUTER JOIN a path to this table with a - * {@link JoinHint#LOOP} hint. - */ - @NotNull - @Support({ FIREBIRD, HSQLDB, POSTGRES, SQLITE, TRINO, YUGABYTEDB }) - TableOptionalOnStep fullOuterLoopJoin(Path path); - /** - * FULL OUTER JOIN a path to this table with a - * {@link JoinHint#MERGE} hint. - */ - @NotNull - @Support({ FIREBIRD, HSQLDB, POSTGRES, SQLITE, TRINO, YUGABYTEDB }) - TableOptionalOnStep fullOuterMergeJoin(Path path); + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + /** * FULL OUTER JOIN a table to this table. diff --git a/jOOQ/src/main/java/org/jooq/TableOuterJoinStep.java b/jOOQ/src/main/java/org/jooq/TableOuterJoinStep.java index 21bca1b0e7..715fa6175f 100644 --- a/jOOQ/src/main/java/org/jooq/TableOuterJoinStep.java +++ b/jOOQ/src/main/java/org/jooq/TableOuterJoinStep.java @@ -707,6 +707,10 @@ public interface TableOuterJoinStep { + + + + diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractTable.java b/jOOQ/src/main/java/org/jooq/impl/AbstractTable.java index 561026c397..dd379e6173 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AbstractTable.java +++ b/jOOQ/src/main/java/org/jooq/impl/AbstractTable.java @@ -1419,40 +1419,44 @@ implements return innerJoin(table); } - @Override - public final TableOnStep hashJoin(TableLike table) { - return innerHashJoin(table); - } - - @Override - public final TableOnStep loopJoin(TableLike table) { - return innerLoopJoin(table); - } - - @Override - public final TableOnStep mergeJoin(TableLike table) { - return innerMergeJoin(table); - } - @Override public final TableOptionalOnStep join(Path path) { return innerJoin(path); } - @Override - public final TableOptionalOnStep hashJoin(Path path) { - return innerHashJoin(path); - } - @Override - public final TableOptionalOnStep loopJoin(Path path) { - return innerLoopJoin(path); - } - @Override - public final TableOptionalOnStep mergeJoin(Path path) { - return innerMergeJoin(path); - } + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @Override public final TableOnStep join(SQL sql) { @@ -1484,40 +1488,44 @@ implements return join(table, JOIN); } - @Override - public final TableOnStep innerHashJoin(TableLike table) { - return join(table, JOIN, HASH); - } - - @Override - public final TableOnStep innerLoopJoin(TableLike table) { - return join(table, JOIN, LOOP); - } - - @Override - public final TableOnStep innerMergeJoin(TableLike table) { - return join(table, JOIN, MERGE); - } - @Override public final TableOptionalOnStep innerJoin(Path path) { return join(path, JOIN); } - @Override - public final TableOptionalOnStep innerHashJoin(Path path) { - return join(path, JOIN, HASH); - } - @Override - public final TableOptionalOnStep innerLoopJoin(Path path) { - return join(path, JOIN, LOOP); - } - @Override - public final TableOptionalOnStep innerMergeJoin(Path path) { - return join(path, JOIN, MERGE); - } + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @Override public final TableOnStep innerJoin(SQL sql) { @@ -1563,40 +1571,44 @@ implements return leftOuterJoin(table); } - @Override - public final TablePartitionByStep leftHashJoin(TableLike table) { - return leftOuterHashJoin(table); - } - - @Override - public final TablePartitionByStep leftLoopJoin(TableLike table) { - return leftOuterLoopJoin(table); - } - - @Override - public final TablePartitionByStep leftMergeJoin(TableLike table) { - return leftOuterMergeJoin(table); - } - @Override public final TableOptionalOnStep leftJoin(Path path) { return leftOuterJoin(path); } - @Override - public final TableOptionalOnStep leftHashJoin(Path path) { - return leftOuterHashJoin(path); - } - @Override - public final TableOptionalOnStep leftLoopJoin(Path path) { - return leftOuterLoopJoin(path); - } - @Override - public final TableOptionalOnStep leftMergeJoin(Path path) { - return leftOuterMergeJoin(path); - } + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @Override public final TablePartitionByStep leftJoin(SQL sql) { @@ -1629,43 +1641,47 @@ implements return (TablePartitionByStep) join(table, LEFT_OUTER_JOIN); } - @SuppressWarnings("unchecked") - @Override - public final TablePartitionByStep leftOuterHashJoin(TableLike table) { - return (TablePartitionByStep) join(table, LEFT_OUTER_JOIN, HASH); - } - - @SuppressWarnings("unchecked") - @Override - public final TablePartitionByStep leftOuterLoopJoin(TableLike table) { - return (TablePartitionByStep) join(table, LEFT_OUTER_JOIN, LOOP); - } - - @SuppressWarnings("unchecked") - @Override - public final TablePartitionByStep leftOuterMergeJoin(TableLike table) { - return (TablePartitionByStep) join(table, LEFT_OUTER_JOIN, MERGE); - } - @Override public final TableOptionalOnStep leftOuterJoin(Path path) { return join(path, LEFT_OUTER_JOIN); } - @Override - public final TableOptionalOnStep leftOuterHashJoin(Path path) { - return join(path, LEFT_OUTER_JOIN, HASH); - } - @Override - public final TableOptionalOnStep leftOuterLoopJoin(Path path) { - return join(path, LEFT_OUTER_JOIN, LOOP); - } - @Override - public final TableOptionalOnStep leftOuterMergeJoin(Path path) { - return join(path, LEFT_OUTER_JOIN, MERGE); - } + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @Override public final TablePartitionByStep leftOuterJoin(SQL sql) { @@ -1697,40 +1713,44 @@ implements return rightOuterJoin(table); } - @Override - public final TablePartitionByStep rightHashJoin(TableLike table) { - return rightOuterHashJoin(table); - } - - @Override - public final TablePartitionByStep rightLoopJoin(TableLike table) { - return rightOuterLoopJoin(table); - } - - @Override - public final TablePartitionByStep rightMergeJoin(TableLike table) { - return rightOuterMergeJoin(table); - } - @Override public final TableOptionalOnStep rightJoin(Path path) { return rightOuterJoin(path); } - @Override - public final TableOptionalOnStep rightHashJoin(Path path) { - return rightOuterHashJoin(path); - } - @Override - public final TableOptionalOnStep rightLoopJoin(Path path) { - return rightOuterLoopJoin(path); - } - @Override - public final TableOptionalOnStep rightMergeJoin(Path path) { - return rightOuterMergeJoin(path); - } + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @Override public final TablePartitionByStep rightJoin(SQL sql) { @@ -1763,43 +1783,47 @@ implements return (TablePartitionByStep) join(table, RIGHT_OUTER_JOIN); } - @SuppressWarnings("unchecked") - @Override - public final TablePartitionByStep rightOuterHashJoin(TableLike table) { - return (TablePartitionByStep) join(table, RIGHT_OUTER_JOIN, HASH); - } - - @SuppressWarnings("unchecked") - @Override - public final TablePartitionByStep rightOuterLoopJoin(TableLike table) { - return (TablePartitionByStep) join(table, RIGHT_OUTER_JOIN, LOOP); - } - - @SuppressWarnings("unchecked") - @Override - public final TablePartitionByStep rightOuterMergeJoin(TableLike table) { - return (TablePartitionByStep) join(table, RIGHT_OUTER_JOIN, MERGE); - } - @Override public final TableOptionalOnStep rightOuterJoin(Path path) { return join(path, RIGHT_OUTER_JOIN); } - @Override - public final TableOptionalOnStep rightOuterHashJoin(Path path) { - return join(path, RIGHT_OUTER_JOIN, HASH); - } - @Override - public final TableOptionalOnStep rightOuterLoopJoin(Path path) { - return join(path, RIGHT_OUTER_JOIN, LOOP); - } - @Override - public final TableOptionalOnStep rightOuterMergeJoin(Path path) { - return join(path, RIGHT_OUTER_JOIN, MERGE); - } + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @Override public final TablePartitionByStep rightOuterJoin(SQL sql) { @@ -1832,43 +1856,47 @@ implements return (TablePartitionByStep) join(table, FULL_OUTER_JOIN); } - @SuppressWarnings("unchecked") - @Override - public final TablePartitionByStep fullOuterHashJoin(TableLike table) { - return (TablePartitionByStep) join(table, FULL_OUTER_JOIN, HASH); - } - - @SuppressWarnings("unchecked") - @Override - public final TablePartitionByStep fullOuterLoopJoin(TableLike table) { - return (TablePartitionByStep) join(table, FULL_OUTER_JOIN, LOOP); - } - - @SuppressWarnings("unchecked") - @Override - public final TablePartitionByStep fullOuterMergeJoin(TableLike table) { - return (TablePartitionByStep) join(table, FULL_OUTER_JOIN, MERGE); - } - @Override public final TableOptionalOnStep fullOuterJoin(Path path) { return join(path, FULL_OUTER_JOIN); } - @Override - public final TableOptionalOnStep fullOuterHashJoin(Path path) { - return join(path, FULL_OUTER_JOIN, HASH); - } - @Override - public final TableOptionalOnStep fullOuterLoopJoin(Path path) { - return join(path, FULL_OUTER_JOIN, LOOP); - } - @Override - public final TableOptionalOnStep fullOuterMergeJoin(Path path) { - return join(path, FULL_OUTER_JOIN, MERGE); - } + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @Override public final TablePartitionByStep fullOuterJoin(SQL sql) { @@ -1900,40 +1928,44 @@ implements return fullOuterJoin(table); } - @Override - public final TablePartitionByStep fullHashJoin(TableLike table) { - return fullOuterHashJoin(table); - } - - @Override - public final TablePartitionByStep fullLoopJoin(TableLike table) { - return fullOuterLoopJoin(table); - } - - @Override - public final TablePartitionByStep fullMergeJoin(TableLike table) { - return fullOuterMergeJoin(table); - } - @Override public final TableOptionalOnStep fullJoin(Path path) { return fullOuterJoin(path); } - @Override - public final TableOptionalOnStep fullHashJoin(Path path) { - return fullOuterHashJoin(path); - } - @Override - public final TableOptionalOnStep fullLoopJoin(Path path) { - return fullOuterLoopJoin(path); - } - @Override - public final TableOptionalOnStep fullMergeJoin(Path path) { - return fullOuterMergeJoin(path); - } + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @Override public final TablePartitionByStep fullJoin(SQL sql) { diff --git a/jOOQ/src/main/java/org/jooq/impl/SelectImpl.java b/jOOQ/src/main/java/org/jooq/impl/SelectImpl.java index ec337403c7..115e3bfc52 100644 --- a/jOOQ/src/main/java/org/jooq/impl/SelectImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/SelectImpl.java @@ -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) {