diff --git a/jOOQ/src/main/java/org/jooq/Select.java b/jOOQ/src/main/java/org/jooq/Select.java index 605b0b375f..7bf274626d 100644 --- a/jOOQ/src/main/java/org/jooq/Select.java +++ b/jOOQ/src/main/java/org/jooq/Select.java @@ -53,6 +53,7 @@ import static org.jooq.SQLDialect.IGNITE; // ... import static org.jooq.SQLDialect.MARIADB; // ... +// ... import static org.jooq.SQLDialect.MYSQL; // ... // ... @@ -155,7 +156,7 @@ extends * {@link StackOverflowError} when generating the SQL. */ @NotNull @CheckReturnValue - @Support({ CUBRID, DERBY, HSQLDB, MYSQL, POSTGRES, YUGABYTEDB }) + @Support({ CUBRID, DERBY, HSQLDB, MARIADB, MYSQL, POSTGRES, YUGABYTEDB }) Select exceptAll(Select select); /** @@ -181,7 +182,7 @@ extends * {@link StackOverflowError} when generating the SQL. */ @NotNull @CheckReturnValue - @Support({ CUBRID, DERBY, HSQLDB, MYSQL, POSTGRES, YUGABYTEDB }) + @Support({ CUBRID, DERBY, HSQLDB, MARIADB, MYSQL, POSTGRES, YUGABYTEDB }) Select intersectAll(Select select); /** diff --git a/jOOQ/src/main/java/org/jooq/SelectUnionStep.java b/jOOQ/src/main/java/org/jooq/SelectUnionStep.java index 6d1afaf955..2098c1cfb6 100644 --- a/jOOQ/src/main/java/org/jooq/SelectUnionStep.java +++ b/jOOQ/src/main/java/org/jooq/SelectUnionStep.java @@ -53,6 +53,7 @@ import static org.jooq.SQLDialect.IGNITE; // ... import static org.jooq.SQLDialect.MARIADB; // ... +// ... import static org.jooq.SQLDialect.MYSQL; // ... // ... @@ -160,7 +161,7 @@ public interface SelectUnionStep extends SelectCorrelatedSubqu */ @Override @NotNull @CheckReturnValue - @Support({ CUBRID, DERBY, HSQLDB, MYSQL, POSTGRES, YUGABYTEDB }) + @Support({ CUBRID, DERBY, HSQLDB, MARIADB, MYSQL, POSTGRES, YUGABYTEDB }) SelectOrderByStep exceptAll(Select select); /** @@ -176,6 +177,6 @@ public interface SelectUnionStep extends SelectCorrelatedSubqu */ @Override @NotNull @CheckReturnValue - @Support({ CUBRID, DERBY, HSQLDB, MYSQL, POSTGRES, YUGABYTEDB }) + @Support({ CUBRID, DERBY, HSQLDB, MARIADB, MYSQL, POSTGRES, YUGABYTEDB }) SelectOrderByStep intersectAll(Select select); } diff --git a/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java b/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java index 3dabeb6c40..718b4eb941 100644 --- a/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java @@ -88,6 +88,7 @@ import static org.jooq.SQLDialect.MARIADB; // ... // ... // ... +// ... import static org.jooq.SQLDialect.MYSQL; // ... // ... @@ -95,6 +96,7 @@ import static org.jooq.SQLDialect.MYSQL; // ... // ... // ... +// ... import static org.jooq.SQLDialect.POSTGRES; // ... // ... @@ -3184,7 +3186,7 @@ final class SelectQueryImpl extends AbstractResultQuery imp private static final Set NO_SUPPORT_UNION_PARENTHESES = SQLDialect.supportedBy(SQLITE); private static final Set NO_SUPPORT_CTE_IN_UNION = SQLDialect.supportedBy(HSQLDB, MARIADB); - private static final Set UNION_PARENTHESIS = SQLDialect.supportedBy(DERBY, MARIADB); + private static final Set UNION_PARENTHESIS = SQLDialect.supportedUntil(DERBY); final boolean hasUnions() { return !unionOp.isEmpty();