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

Revert [#6282] Emulate MySQL's STRAIGHT_JOIN in Oracle using /*+LEADING*/ hint

Browse Source
This commit is contained in:
lukaseder 2018-12-14 10:00:53 +01:00
parent f5c161c4a4
commit 25e86d05bf
5 changed files with 1 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
jOOQ/src/main/java/org/jooq/JoinType.java
View File

@ -42,7 +42,6 @@ import static org.jooq.SQLDialect.MYSQL;
// ...
// ...
// ...
// ...
import org.jooq.impl.DSL;

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

@ -1671,9 +1671,6 @@ public interface SelectJoinStep<R extends Record> extends SelectWhereStep<R> {
/**
* <code>STRAIGHT_JOIN</code> a table to this table.
* <p>
* MySQL natively supports this clause. Oracle can emulate it using a
* <code>+LEADING(a b)</code> hint.
*
* @see Table#straightJoin(TableLike)
*/
@ -1683,9 +1680,6 @@ public interface SelectJoinStep<R extends Record> extends SelectWhereStep<R> {
/**
* <code>STRAIGHT_JOIN</code> a table to this table.
* <p>
* MySQL natively supports this clause. Oracle can emulate it using a
* <code>+LEADING(a b)</code> hint.
* <p>
* <b>NOTE</b>: When inserting plain SQL into jOOQ objects, you must
* guarantee syntax integrity. You may also create the possibility of
* malicious SQL injection. Be sure to properly use bind variables and/or
@ -1701,9 +1695,6 @@ public interface SelectJoinStep<R extends Record> extends SelectWhereStep<R> {
/**
* <code>STRAIGHT_JOIN</code> a table to this table.
* <p>
* MySQL natively supports this clause. Oracle can emulate it using a
* <code>+LEADING(a b)</code> hint.
* <p>
* <b>NOTE</b>: When inserting plain SQL into jOOQ objects, you must
* guarantee syntax integrity. You may also create the possibility of
* malicious SQL injection. Be sure to properly use bind variables and/or
@ -1719,9 +1710,6 @@ public interface SelectJoinStep<R extends Record> extends SelectWhereStep<R> {
/**
* <code>STRAIGHT_JOIN</code> a table to this table.
* <p>
* MySQL natively supports this clause. Oracle can emulate it using a
* <code>+LEADING(a b)</code> hint.
* <p>
* <b>NOTE</b>: When inserting plain SQL into jOOQ objects, you must
* guarantee syntax integrity. You may also create the possibility of
* malicious SQL injection. Be sure to properly use bind variables and/or
@ -1738,9 +1726,6 @@ public interface SelectJoinStep<R extends Record> extends SelectWhereStep<R> {
/**
* <code>STRAIGHT_JOIN</code> a table to this table.
* <p>
* MySQL natively supports this clause. Oracle can emulate it using a
* <code>+LEADING(a b)</code> hint.
* <p>
* <b>NOTE</b>: When inserting plain SQL into jOOQ objects, you must
* guarantee syntax integrity. You may also create the possibility of
* malicious SQL injection. Be sure to properly use bind variables and/or
@ -1756,9 +1741,6 @@ public interface SelectJoinStep<R extends Record> extends SelectWhereStep<R> {
/**
* <code>STRAIGHT_JOIN</code> a table to this table.
* <p>
* MySQL natively supports this clause. Oracle can emulate it using a
* <code>+LEADING(a b)</code> hint.
*
* @see DSL#table(Name)
* @see Table#straightJoin(Name)

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

@ -2043,9 +2043,6 @@ public interface Table<R extends Record> extends TableLike<R>, Named {
/**
* <code>STRAIGHT_JOIN</code> a table to this table.
* <p>
* MySQL natively supports this clause. Oracle can emulate it using a
* <code>+LEADING(a b)</code> hint.
*/
@Support({ MYSQL })
TableOnStep<Record> straightJoin(TableLike<?> table);
@ -2053,9 +2050,6 @@ public interface Table<R extends Record> extends TableLike<R>, Named {
/**
* <code>STRAIGHT_JOIN</code> a table to this table.
* <p>
* MySQL natively supports this clause. Oracle can emulate it using a
* <code>+LEADING(a b)</code> hint.
* <p>
* <b>NOTE</b>: When inserting plain SQL into jOOQ objects, you must
* guarantee syntax integrity. You may also create the possibility of
* malicious SQL injection. Be sure to properly use bind variables and/or
@ -2071,9 +2065,6 @@ public interface Table<R extends Record> extends TableLike<R>, Named {
/**
* <code>STRAIGHT_JOIN</code> a table to this table.
* <p>
* MySQL natively supports this clause. Oracle can emulate it using a
* <code>+LEADING(a b)</code> hint.
* <p>
* <b>NOTE</b>: When inserting plain SQL into jOOQ objects, you must
* guarantee syntax integrity. You may also create the possibility of
* malicious SQL injection. Be sure to properly use bind variables and/or
@ -2089,9 +2080,6 @@ public interface Table<R extends Record> extends TableLike<R>, Named {
/**
* <code>STRAIGHT_JOIN</code> a table to this table.
* <p>
* MySQL natively supports this clause. Oracle can emulate it using a
* <code>+LEADING(a b)</code> hint.
* <p>
* <b>NOTE</b>: When inserting plain SQL into jOOQ objects, you must
* guarantee syntax integrity. You may also create the possibility of
* malicious SQL injection. Be sure to properly use bind variables and/or
@ -2108,9 +2096,6 @@ public interface Table<R extends Record> extends TableLike<R>, Named {
/**
* <code>STRAIGHT_JOIN</code> a table to this table.
* <p>
* MySQL natively supports this clause. Oracle can emulate it using a
* <code>+LEADING(a b)</code> hint.
* <p>
* <b>NOTE</b>: When inserting plain SQL into jOOQ objects, you must
* guarantee syntax integrity. You may also create the possibility of
* malicious SQL injection. Be sure to properly use bind variables and/or
@ -2126,9 +2111,6 @@ public interface Table<R extends Record> extends TableLike<R>, Named {
/**
* <code>STRAIGHT_JOIN</code> a table to this table.
* <p>
* MySQL natively supports this clause. Oracle can emulate it using a
* <code>+LEADING(a b)</code> hint.
*
* @see DSL#table(Name)
*/

12
jOOQ/src/main/java/org/jooq/impl/JoinTable.java
View File

@ -67,7 +67,6 @@ import static org.jooq.JoinType.NATURAL_LEFT_OUTER_JOIN;
import static org.jooq.JoinType.NATURAL_RIGHT_OUTER_JOIN;
import static org.jooq.JoinType.OUTER_APPLY;
import static org.jooq.JoinType.RIGHT_OUTER_JOIN;
import static org.jooq.JoinType.STRAIGHT_JOIN;
// ...
// ...
// ...
@ -77,8 +76,6 @@ import static org.jooq.SQLDialect.H2;
// ...
// ...
// ...
import static org.jooq.SQLDialect.MARIADB;
import static org.jooq.SQLDialect.MYSQL;
import static org.jooq.SQLDialect.POSTGRES;
// ...
// ...
@ -144,7 +141,6 @@ implements
*/
private static final long serialVersionUID = 8377996833996498178L;
private static final Clause[] CLAUSES = { TABLE, TABLE_JOIN };
private static final EnumSet<SQLDialect> SUPPORTS_STRAIGHT_JOIN = EnumSet.of(MARIADB, MYSQL);
private static final EnumSet<SQLDialect> EMULATE_NATURAL_JOIN = EnumSet.of(CUBRID);
private static final EnumSet<SQLDialect> EMULATE_NATURAL_OUTER_JOIN = EnumSet.of(CUBRID, H2);
private static final EnumSet<SQLDialect> EMULATE_JOIN_USING = EnumSet.of(CUBRID, H2);
@ -157,7 +153,7 @@ implements
final JoinType type;
private final JoinType type;
private final ConditionProviderImpl condition;
private final QueryPartList<Field<?>> using;
@ -362,8 +358,6 @@ implements
return LEFT_OUTER_JOIN;
else if (emulateNaturalRightOuterJoin(context))
return RIGHT_OUTER_JOIN;
else if (emulateStraightJoin(context))
return JOIN;
else
return type;
}
@ -388,10 +382,6 @@ implements
return type == NATURAL_RIGHT_OUTER_JOIN && EMULATE_NATURAL_OUTER_JOIN.contains(context.family());
}
private final boolean emulateStraightJoin(Context<?> context) {
return type == STRAIGHT_JOIN && !SUPPORTS_STRAIGHT_JOIN.contains(context.family());
}
private final void toSQLJoinCondition(Context<?> context) {
if (!using.isEmpty()) {

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

@ -1189,10 +1189,6 @@ final class SelectQueryImpl<R extends Record> extends AbstractResultQuery<R> imp
if (Tools.isNotEmpty(distinctOn))
context.visit(K_DISTINCT_ON).sql(" (").visit(distinctOn).sql(") ");
else if (distinct)
@ -1522,35 +1518,6 @@ final class SelectQueryImpl<R extends Record> extends AbstractResultQuery<R> imp
}
}
private final void toSQLOrderBy(
Context<?> ctx,
Field<?>[] originalFields, Field<?>[] alternativeFields,