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

[jOOQ/jOOQ#14301] Add SQLDialect.MYSQL_8_0_31

Browse Source 
This includes:
- [jOOQ/jOOQ#14302] Add support for INTERSECT ALL and EXCEPT ALL in MySQL
This commit is contained in:
Lukas Eder 2022-11-25 15:18:01 +01:00
parent 174a4c34f3
commit 6f9e648718
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
jOOQ/src/main/java/org/jooq/Select.java
View File

@ -53,6 +53,7 @@ import static org.jooq.SQLDialect.IGNITE;
// ...
import static org.jooq.SQLDialect.MARIADB;
// ...
import static org.jooq.SQLDialect.MYSQL;
// ...
// ...
import static org.jooq.SQLDialect.POSTGRES;
@ -141,7 +142,7 @@ extends
* {@link StackOverflowError} when generating the SQL.
*/
@NotNull @CheckReturnValue
@Support({ CUBRID, DERBY, H2, HSQLDB, IGNITE, MARIADB, POSTGRES, SQLITE, YUGABYTEDB })
@Support({ CUBRID, DERBY, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE, YUGABYTEDB })
Select<R> except(Select<? extends R> select);
/**
@ -154,7 +155,7 @@ extends
* {@link StackOverflowError} when generating the SQL.
*/
@NotNull @CheckReturnValue
@Support({ CUBRID, DERBY, HSQLDB, POSTGRES, YUGABYTEDB })
@Support({ CUBRID, DERBY, HSQLDB, MYSQL, POSTGRES, YUGABYTEDB })
Select<R> exceptAll(Select<? extends R> select);
/**
@ -167,7 +168,7 @@ extends
* {@link StackOverflowError} when generating the SQL.
*/
@NotNull @CheckReturnValue
@Support({ CUBRID, DERBY, H2, HSQLDB, IGNITE, MARIADB, POSTGRES, SQLITE, YUGABYTEDB })
@Support({ CUBRID, DERBY, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE, YUGABYTEDB })
Select<R> intersect(Select<? extends R> select);
/**
@ -180,7 +181,7 @@ extends
* {@link StackOverflowError} when generating the SQL.
*/
@NotNull @CheckReturnValue
@Support({ CUBRID, DERBY, HSQLDB, POSTGRES, YUGABYTEDB })
@Support({ CUBRID, DERBY, HSQLDB, MYSQL, POSTGRES, YUGABYTEDB })
Select<R> intersectAll(Select<? extends R> select);
/**

9
jOOQ/src/main/java/org/jooq/SelectUnionStep.java
View File

@ -53,6 +53,7 @@ import static org.jooq.SQLDialect.IGNITE;
// ...
import static org.jooq.SQLDialect.MARIADB;
// ...
import static org.jooq.SQLDialect.MYSQL;
// ...
// ...
import static org.jooq.SQLDialect.POSTGRES;
@ -151,7 +152,7 @@ public interface SelectUnionStep<R extends Record> extends SelectCorrelatedSubqu
*/
@Override
@NotNull @CheckReturnValue
@Support({ CUBRID, DERBY, H2, HSQLDB, IGNITE, MARIADB, POSTGRES, SQLITE, YUGABYTEDB })
@Support({ CUBRID, DERBY, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE, YUGABYTEDB })
SelectOrderByStep<R> except(Select<? extends R> select);
/**
@ -159,7 +160,7 @@ public interface SelectUnionStep<R extends Record> extends SelectCorrelatedSubqu
*/
@Override
@NotNull @CheckReturnValue
@Support({ CUBRID, DERBY, HSQLDB, POSTGRES, YUGABYTEDB })
@Support({ CUBRID, DERBY, HSQLDB, MYSQL, POSTGRES, YUGABYTEDB })
SelectOrderByStep<R> exceptAll(Select<? extends R> select);
/**
@ -167,7 +168,7 @@ public interface SelectUnionStep<R extends Record> extends SelectCorrelatedSubqu
*/
@Override
@NotNull @CheckReturnValue
@Support({ CUBRID, DERBY, H2, HSQLDB, IGNITE, MARIADB, POSTGRES, SQLITE, YUGABYTEDB })
@Support({ CUBRID, DERBY, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE, YUGABYTEDB })
SelectOrderByStep<R> intersect(Select<? extends R> select);
/**
@ -175,6 +176,6 @@ public interface SelectUnionStep<R extends Record> extends SelectCorrelatedSubqu
*/
@Override
@NotNull @CheckReturnValue
@Support({ CUBRID, DERBY, HSQLDB, POSTGRES, YUGABYTEDB })
@Support({ CUBRID, DERBY, HSQLDB, MYSQL, POSTGRES, YUGABYTEDB })
SelectOrderByStep<R> intersectAll(Select<? extends R> select);
}

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

@ -3184,7 +3184,7 @@ final class SelectQueryImpl<R extends Record> extends AbstractResultQuery<R> imp
private static final Set<SQLDialect> NO_SUPPORT_UNION_PARENTHESES = SQLDialect.supportedBy(SQLITE);
private static final Set<SQLDialect> NO_SUPPORT_CTE_IN_UNION = SQLDialect.supportedBy(HSQLDB, MARIADB);
private static final Set<SQLDialect> UNION_PARENTHESIS = SQLDialect.supportedBy(DERBY, MARIADB, MYSQL);
private static final Set<SQLDialect> UNION_PARENTHESIS = SQLDialect.supportedBy(DERBY, MARIADB);
final boolean hasUnions() {
return !unionOp.isEmpty();