diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/duckdb/DuckDBDatabase.java b/jOOQ-meta/src/main/java/org/jooq/meta/duckdb/DuckDBDatabase.java index 2a0a4fb40f..b75f85d265 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/duckdb/DuckDBDatabase.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/duckdb/DuckDBDatabase.java @@ -130,14 +130,6 @@ public class DuckDBDatabase extends AbstractDatabase implements ResultQueryDatab ctx.settings().setRenderMapping(new RenderMapping() .withDefaultCatalog(DUCKDB_TABLES.getCatalog().getName()) .withDefaultSchema(DUCKDB_TABLES.getSchema().getName()) -// .withCatalogs(new MappedCatalog() -// .withInput(DUCKDB_TABLES.getCatalog().getName()) -// .withOutput("") -// .withSchemata(new MappedSchema() -// .withInput(DUCKDB_TABLES.getSchema().getName()) -// .withOutput("") -// ) -// ) ); return ctx; } @@ -377,7 +369,7 @@ public class DuckDBDatabase extends AbstractDatabase implements ResultQueryDatab cycle, 0 as cache from duckdb_sequences() - where sequence_name in ({0}) + where schema_name in ({0}) """, DSL.list(schemas.stream().map(DSL::val).collect(toList())) ) diff --git a/jOOQ/src/main/java/org/jooq/DSLContext.java b/jOOQ/src/main/java/org/jooq/DSLContext.java index 522b5b8854..af867f8586 100644 --- a/jOOQ/src/main/java/org/jooq/DSLContext.java +++ b/jOOQ/src/main/java/org/jooq/DSLContext.java @@ -12508,7 +12508,7 @@ public interface DSLContext extends Scope { * @throws DataAccessException if something went wrong executing the query */ @NotNull - @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES, YUGABYTEDB }) + @Support({ CUBRID, DERBY, DUCKDB, FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES, YUGABYTEDB }) BigInteger nextval(String sequence) throws DataAccessException; /** @@ -12518,7 +12518,7 @@ public interface DSLContext extends Scope { * @throws DataAccessException if something went wrong executing the query */ @NotNull - @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES, YUGABYTEDB }) + @Support({ CUBRID, DERBY, DUCKDB, FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES, YUGABYTEDB }) BigInteger nextval(Name sequence) throws DataAccessException; /** @@ -12528,7 +12528,7 @@ public interface DSLContext extends Scope { * @throws DataAccessException if something went wrong executing the query */ @NotNull - @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES, YUGABYTEDB }) + @Support({ CUBRID, DERBY, DUCKDB, FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES, YUGABYTEDB }) T nextval(Sequence sequence) throws DataAccessException; /** @@ -12540,7 +12540,7 @@ public interface DSLContext extends Scope { * @throws DataAccessException if something went wrong executing the query */ @NotNull - @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES, YUGABYTEDB }) + @Support({ CUBRID, DERBY, DUCKDB, FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES, YUGABYTEDB }) List nextvals(Sequence sequence, int size) throws DataAccessException; /** @@ -12550,7 +12550,7 @@ public interface DSLContext extends Scope { * @throws DataAccessException if something went wrong executing the query */ @NotNull - @Support({ CUBRID, FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES, YUGABYTEDB }) + @Support({ CUBRID, DUCKDB, FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES, YUGABYTEDB }) BigInteger currval(String sequence) throws DataAccessException; /** @@ -12560,7 +12560,7 @@ public interface DSLContext extends Scope { * @throws DataAccessException if something went wrong executing the query */ @NotNull - @Support({ CUBRID, FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES, YUGABYTEDB }) + @Support({ CUBRID, DUCKDB, FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES, YUGABYTEDB }) BigInteger currval(Name sequence) throws DataAccessException; /** @@ -12570,7 +12570,7 @@ public interface DSLContext extends Scope { * @throws DataAccessException if something went wrong executing the query */ @NotNull - @Support({ CUBRID, FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES, YUGABYTEDB }) + @Support({ CUBRID, DUCKDB, FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES, YUGABYTEDB }) T currval(Sequence sequence) throws DataAccessException; // ------------------------------------------------------------------------- diff --git a/jOOQ/src/main/java/org/jooq/Sequence.java b/jOOQ/src/main/java/org/jooq/Sequence.java index 074e7128d3..c0f992a377 100644 --- a/jOOQ/src/main/java/org/jooq/Sequence.java +++ b/jOOQ/src/main/java/org/jooq/Sequence.java @@ -42,6 +42,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.FIREBIRD; import static org.jooq.SQLDialect.H2; // ... @@ -116,14 +117,14 @@ public interface Sequence extends Qualified, Typed { * An expression to get the current value of this sequence. */ @NotNull - @Support({ CUBRID, FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES, YUGABYTEDB }) + @Support({ CUBRID, DUCKDB, FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES, YUGABYTEDB }) Field currval(); /** * An expression to increment the sequence and get the next value. */ @NotNull - @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES, YUGABYTEDB }) + @Support({ CUBRID, DERBY, DUCKDB, FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES, YUGABYTEDB }) Field nextval(); /** @@ -132,6 +133,6 @@ public interface Sequence extends Qualified, Typed { * This is done using {@link DSL#generateSeries(int, int)}. */ @NotNull - @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES, YUGABYTEDB }) + @Support({ CUBRID, DERBY, DUCKDB, FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES, YUGABYTEDB }) Select> nextvals(int size); } \ No newline at end of file diff --git a/jOOQ/src/main/java/org/jooq/impl/DSL.java b/jOOQ/src/main/java/org/jooq/impl/DSL.java index 946aedfa18..c5fff64095 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DSL.java +++ b/jOOQ/src/main/java/org/jooq/impl/DSL.java @@ -13622,7 +13622,7 @@ public class DSL { * */ @NotNull - @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES, YUGABYTEDB }) + @Support({ CUBRID, DERBY, DUCKDB, FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES, YUGABYTEDB }) public static Sequence sequence(Name name) { return sequence(name, BigInteger.class); } @@ -13656,7 +13656,7 @@ public class DSL { * {@link SQLDataType}) */ @NotNull - @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES, YUGABYTEDB }) + @Support({ CUBRID, DERBY, DUCKDB, FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES, YUGABYTEDB }) public static Sequence sequence(Name name, Class type) { return sequence(name, getDataType(type)); } @@ -13675,7 +13675,7 @@ public class DSL { * */ @NotNull - @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES, YUGABYTEDB }) + @Support({ CUBRID, DERBY, DUCKDB, FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES, YUGABYTEDB }) public static Sequence sequence(Name name, DataType type) { return new SequenceImpl<>( name.unqualifiedName(), @@ -15189,7 +15189,7 @@ public class DSL { */ @Deprecated(forRemoval = true, since = "3.10") @NotNull - @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, POSTGRES, YUGABYTEDB }) + @Support({ CUBRID, DERBY, DUCKDB, FIREBIRD, H2, HSQLDB, POSTGRES, YUGABYTEDB }) @PlainSQL public static Sequence sequence(String sql) { return sequence(sql, BigInteger.class); @@ -15220,7 +15220,7 @@ public class DSL { */ @Deprecated(forRemoval = true, since = "3.10") @NotNull - @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, POSTGRES, YUGABYTEDB }) + @Support({ CUBRID, DERBY, DUCKDB, FIREBIRD, H2, HSQLDB, POSTGRES, YUGABYTEDB }) @PlainSQL public static Sequence sequence(String sql, Class type) { return sequence(sql, getDataType(type)); @@ -15243,7 +15243,7 @@ public class DSL { */ @Deprecated(forRemoval = true, since = "3.10") @NotNull - @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, POSTGRES, YUGABYTEDB }) + @Support({ CUBRID, DERBY, DUCKDB, FIREBIRD, H2, HSQLDB, POSTGRES, YUGABYTEDB }) @PlainSQL public static Sequence sequence(String sql, DataType type) { return new SequenceImpl<>(sql, null, type, true);