From d22a9f79164baac7da54bfcc5ec2ffc795ac6feb Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Thu, 15 Feb 2024 08:33:36 +0100 Subject: [PATCH] [jOOQ/jOOQ#16287] Support EXCEPT ALL and INTERSECT ALL in DuckDB 0.10.0 --- jOOQ/src/main/java/org/jooq/Select.java | 13 +++++++------ jOOQ/src/main/java/org/jooq/SelectUnionStep.java | 13 +++++++------ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/jOOQ/src/main/java/org/jooq/Select.java b/jOOQ/src/main/java/org/jooq/Select.java index 4a2edecc26..4ecf1317ff 100644 --- a/jOOQ/src/main/java/org/jooq/Select.java +++ b/jOOQ/src/main/java/org/jooq/Select.java @@ -44,6 +44,7 @@ package org.jooq; import static org.jooq.SQLDialect.CUBRID; // ... import static org.jooq.SQLDialect.DERBY; +import static org.jooq.SQLDialect.DUCKDB; // ... import static org.jooq.SQLDialect.H2; // ... @@ -173,7 +174,7 @@ extends * {@link StackOverflowError} when generating the SQL. */ @NotNull @CheckReturnValue - @Support({ CUBRID, DERBY, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE, TRINO, YUGABYTEDB }) + @Support({ CUBRID, DERBY, DUCKDB, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE, TRINO, YUGABYTEDB }) Select except(Select select); /** @@ -190,7 +191,7 @@ extends * {@link StackOverflowError} when generating the SQL. */ @NotNull @CheckReturnValue - @Support({ CUBRID, DERBY, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE, TRINO, YUGABYTEDB }) + @Support({ CUBRID, DERBY, DUCKDB, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE, TRINO, YUGABYTEDB }) Select exceptDistinct(Select select); /** @@ -203,7 +204,7 @@ extends * {@link StackOverflowError} when generating the SQL. */ @NotNull @CheckReturnValue - @Support({ CUBRID, DERBY, HSQLDB, MARIADB, MYSQL, POSTGRES, TRINO, YUGABYTEDB }) + @Support({ CUBRID, DERBY, DUCKDB, HSQLDB, MARIADB, MYSQL, POSTGRES, TRINO, YUGABYTEDB }) Select exceptAll(Select select); /** @@ -223,7 +224,7 @@ extends * {@link StackOverflowError} when generating the SQL. */ @NotNull @CheckReturnValue - @Support({ CUBRID, DERBY, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE, TRINO, YUGABYTEDB }) + @Support({ CUBRID, DERBY, DUCKDB, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE, TRINO, YUGABYTEDB }) Select intersect(Select select); /** @@ -240,7 +241,7 @@ extends * {@link StackOverflowError} when generating the SQL. */ @NotNull @CheckReturnValue - @Support({ CUBRID, DERBY, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE, TRINO, YUGABYTEDB }) + @Support({ CUBRID, DERBY, DUCKDB, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE, TRINO, YUGABYTEDB }) Select intersectDistinct(Select select); /** @@ -253,7 +254,7 @@ extends * {@link StackOverflowError} when generating the SQL. */ @NotNull @CheckReturnValue - @Support({ CUBRID, DERBY, HSQLDB, MARIADB, MYSQL, POSTGRES, TRINO, YUGABYTEDB }) + @Support({ CUBRID, DERBY, DUCKDB, HSQLDB, MARIADB, MYSQL, POSTGRES, TRINO, 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 fabe44e9c5..2baec53fee 100644 --- a/jOOQ/src/main/java/org/jooq/SelectUnionStep.java +++ b/jOOQ/src/main/java/org/jooq/SelectUnionStep.java @@ -44,6 +44,7 @@ package org.jooq; import static org.jooq.SQLDialect.CUBRID; // ... import static org.jooq.SQLDialect.DERBY; +import static org.jooq.SQLDialect.DUCKDB; // ... import static org.jooq.SQLDialect.H2; // ... @@ -178,7 +179,7 @@ public interface SelectUnionStep extends SelectCorrelatedSubqu */ @Override @NotNull @CheckReturnValue - @Support({ CUBRID, DERBY, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE, TRINO, YUGABYTEDB }) + @Support({ CUBRID, DERBY, DUCKDB, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE, TRINO, YUGABYTEDB }) SelectOrderByStep except(Select select); /** @@ -190,7 +191,7 @@ public interface SelectUnionStep extends SelectCorrelatedSubqu */ @Override @NotNull @CheckReturnValue - @Support({ CUBRID, DERBY, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE, TRINO, YUGABYTEDB }) + @Support({ CUBRID, DERBY, DUCKDB, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE, TRINO, YUGABYTEDB }) SelectOrderByStep exceptDistinct(Select select); /** @@ -198,7 +199,7 @@ public interface SelectUnionStep extends SelectCorrelatedSubqu */ @Override @NotNull @CheckReturnValue - @Support({ CUBRID, DERBY, HSQLDB, MARIADB, MYSQL, POSTGRES, TRINO, YUGABYTEDB }) + @Support({ CUBRID, DERBY, DUCKDB, HSQLDB, MARIADB, MYSQL, POSTGRES, TRINO, YUGABYTEDB }) SelectOrderByStep exceptAll(Select select); /** @@ -213,7 +214,7 @@ public interface SelectUnionStep extends SelectCorrelatedSubqu */ @Override @NotNull @CheckReturnValue - @Support({ CUBRID, DERBY, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE, TRINO, YUGABYTEDB }) + @Support({ CUBRID, DERBY, DUCKDB, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE, TRINO, YUGABYTEDB }) SelectOrderByStep intersect(Select select); /** @@ -228,7 +229,7 @@ public interface SelectUnionStep extends SelectCorrelatedSubqu */ @Override @NotNull @CheckReturnValue - @Support({ CUBRID, DERBY, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE, TRINO, YUGABYTEDB }) + @Support({ CUBRID, DERBY, DUCKDB, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE, TRINO, YUGABYTEDB }) SelectOrderByStep intersectDistinct(Select select); /** @@ -236,6 +237,6 @@ public interface SelectUnionStep extends SelectCorrelatedSubqu */ @Override @NotNull @CheckReturnValue - @Support({ CUBRID, DERBY, HSQLDB, MARIADB, MYSQL, POSTGRES, TRINO, YUGABYTEDB }) + @Support({ CUBRID, DERBY, DUCKDB, HSQLDB, MARIADB, MYSQL, POSTGRES, TRINO, YUGABYTEDB }) SelectOrderByStep intersectAll(Select select); }