diff --git a/jOOQ/src/main/java/org/jooq/CreateSequenceAsStep.java b/jOOQ/src/main/java/org/jooq/CreateSequenceAsStep.java new file mode 100644 index 0000000000..a19607fe4a --- /dev/null +++ b/jOOQ/src/main/java/org/jooq/CreateSequenceAsStep.java @@ -0,0 +1,86 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Other licenses: + * ----------------------------------------------------------------------------- + * Commercial licenses for this work are available. These replace the above + * ASL 2.0 and offer limited warranties, support, maintenance, and commercial + * database integrations. + * + * For more information, please visit: https://www.jooq.org/legal/licensing + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + */ +package org.jooq; + +import static org.jooq.SQLDialect.*; +import static org.jooq.impl.DSL.*; + +import java.util.*; + +import org.jooq.impl.DSL; + +import org.jetbrains.annotations.*; + +/** + * A step in the construction of the CREATE SEQUENCE statement. + *

+ *

Referencing XYZ*Step types directly from client code

+ *

+ * It is usually not recommended to reference any XYZ*Step types + * directly from client code, or assign them to local variables. When writing + * dynamic SQL, creating a statement's components dynamically, and passing them + * to the DSL API statically is usually a better choice. See the manual's + * section about dynamic SQL for details: https://www.jooq.org/doc/latest/manual/sql-building/dynamic-sql. + *

+ * Drawbacks of referencing the XYZ*Step types directly: + *

+ */ +@SuppressWarnings({ "unused" }) +public interface CreateSequenceAsStep extends CreateSequenceFlagsStep { + + /** + * Add the AS clause to the CREATE SEQUENCE statement. + */ + @Support({ DERBY, H2, HSQLDB, POSTGRES, YUGABYTEDB }) + @NotNull @CheckReturnValue + CreateSequenceFlagsStep as(Class dataType); + + /** + * Add the AS clause to the CREATE SEQUENCE statement. + */ + @Support({ DERBY, H2, HSQLDB, POSTGRES, YUGABYTEDB }) + @NotNull @CheckReturnValue + CreateSequenceFlagsStep as(DataType dataType); +} diff --git a/jOOQ/src/main/java/org/jooq/CreateSequenceFlagsStep.java b/jOOQ/src/main/java/org/jooq/CreateSequenceFlagsStep.java index 76c379aaaa..2efa52dc94 100644 --- a/jOOQ/src/main/java/org/jooq/CreateSequenceFlagsStep.java +++ b/jOOQ/src/main/java/org/jooq/CreateSequenceFlagsStep.java @@ -68,7 +68,7 @@ import org.jetbrains.annotations.*; * */ @SuppressWarnings({ "unused" }) -public interface CreateSequenceFlagsStep extends CreateSequenceFinalStep { +public interface CreateSequenceFlagsStep extends CreateSequenceFinalStep { /** * Add the START WITH clause to the CREATE SEQUENCE statement. @@ -77,14 +77,14 @@ public interface CreateSequenceFlagsStep extends CreateSequenceFinalStep { */ @Support({ CUBRID, DERBY, DUCKDB, FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES, YUGABYTEDB }) @NotNull @CheckReturnValue - CreateSequenceFlagsStep startWith(Number startWith); + CreateSequenceFlagsStep startWith(T startWith); /** * Add the START WITH clause to the CREATE SEQUENCE statement. */ @Support({ CUBRID, DERBY, DUCKDB, FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES, YUGABYTEDB }) @NotNull @CheckReturnValue - CreateSequenceFlagsStep startWith(Field startWith); + CreateSequenceFlagsStep startWith(Field startWith); /** * Add the INCREMENT BY clause to the CREATE SEQUENCE statement. @@ -93,14 +93,14 @@ public interface CreateSequenceFlagsStep extends CreateSequenceFinalStep { */ @Support({ CUBRID, DERBY, DUCKDB, FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES, YUGABYTEDB }) @NotNull @CheckReturnValue - CreateSequenceFlagsStep incrementBy(Number incrementBy); + CreateSequenceFlagsStep incrementBy(T incrementBy); /** * Add the INCREMENT BY clause to the CREATE SEQUENCE statement. */ @Support({ CUBRID, DERBY, DUCKDB, FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES, YUGABYTEDB }) @NotNull @CheckReturnValue - CreateSequenceFlagsStep incrementBy(Field incrementBy); + CreateSequenceFlagsStep incrementBy(Field incrementBy); /** * Add the MINVALUE clause to the CREATE SEQUENCE statement. @@ -109,21 +109,21 @@ public interface CreateSequenceFlagsStep extends CreateSequenceFinalStep { */ @Support({ CUBRID, DERBY, DUCKDB, H2, HSQLDB, MARIADB, POSTGRES, YUGABYTEDB }) @NotNull @CheckReturnValue - CreateSequenceFlagsStep minvalue(Number minvalue); + CreateSequenceFlagsStep minvalue(T minvalue); /** * Add the MINVALUE clause to the CREATE SEQUENCE statement. */ @Support({ CUBRID, DERBY, DUCKDB, H2, HSQLDB, MARIADB, POSTGRES, YUGABYTEDB }) @NotNull @CheckReturnValue - CreateSequenceFlagsStep minvalue(Field minvalue); + CreateSequenceFlagsStep minvalue(Field minvalue); /** * Add the NO MINVALUE clause to the CREATE SEQUENCE statement. */ @Support({ CUBRID, DERBY, DUCKDB, FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES, YUGABYTEDB }) @NotNull @CheckReturnValue - CreateSequenceFlagsStep noMinvalue(); + CreateSequenceFlagsStep noMinvalue(); /** * Add the MAXVALUE clause to the CREATE SEQUENCE statement. @@ -132,35 +132,35 @@ public interface CreateSequenceFlagsStep extends CreateSequenceFinalStep { */ @Support({ CUBRID, DERBY, DUCKDB, H2, HSQLDB, MARIADB, POSTGRES, YUGABYTEDB }) @NotNull @CheckReturnValue - CreateSequenceFlagsStep maxvalue(Number maxvalue); + CreateSequenceFlagsStep maxvalue(T maxvalue); /** * Add the MAXVALUE clause to the CREATE SEQUENCE statement. */ @Support({ CUBRID, DERBY, DUCKDB, H2, HSQLDB, MARIADB, POSTGRES, YUGABYTEDB }) @NotNull @CheckReturnValue - CreateSequenceFlagsStep maxvalue(Field maxvalue); + CreateSequenceFlagsStep maxvalue(Field maxvalue); /** * Add the NO MAXVALUE clause to the CREATE SEQUENCE statement. */ @Support({ CUBRID, DERBY, DUCKDB, FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES, YUGABYTEDB }) @NotNull @CheckReturnValue - CreateSequenceFlagsStep noMaxvalue(); + CreateSequenceFlagsStep noMaxvalue(); /** * Add the CYCLE clause to the CREATE SEQUENCE statement. */ @Support({ CUBRID, DERBY, DUCKDB, H2, HSQLDB, MARIADB, POSTGRES, YUGABYTEDB }) @NotNull @CheckReturnValue - CreateSequenceFlagsStep cycle(); + CreateSequenceFlagsStep cycle(); /** * Add the NO CYCLE clause to the CREATE SEQUENCE statement. */ @Support({ CUBRID, DERBY, DUCKDB, FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES, YUGABYTEDB }) @NotNull @CheckReturnValue - CreateSequenceFlagsStep noCycle(); + CreateSequenceFlagsStep noCycle(); /** * Add the CACHE clause to the CREATE SEQUENCE statement. @@ -169,19 +169,19 @@ public interface CreateSequenceFlagsStep extends CreateSequenceFinalStep { */ @Support({ CUBRID, H2, MARIADB, POSTGRES, YUGABYTEDB }) @NotNull @CheckReturnValue - CreateSequenceFlagsStep cache(Number cache); + CreateSequenceFlagsStep cache(T cache); /** * Add the CACHE clause to the CREATE SEQUENCE statement. */ @Support({ CUBRID, H2, MARIADB, POSTGRES, YUGABYTEDB }) @NotNull @CheckReturnValue - CreateSequenceFlagsStep cache(Field cache); + CreateSequenceFlagsStep cache(Field cache); /** * Add the NO CACHE clause to the CREATE SEQUENCE statement. */ @Support({ CUBRID, DERBY, DUCKDB, FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES, YUGABYTEDB }) @NotNull @CheckReturnValue - CreateSequenceFlagsStep noCache(); + CreateSequenceFlagsStep noCache(); } diff --git a/jOOQ/src/main/java/org/jooq/DSLContext.java b/jOOQ/src/main/java/org/jooq/DSLContext.java index 113dd5194a..e9615f0cbf 100644 --- a/jOOQ/src/main/java/org/jooq/DSLContext.java +++ b/jOOQ/src/main/java/org/jooq/DSLContext.java @@ -10832,7 +10832,7 @@ public interface DSLContext extends Scope { */ @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, DUCKDB, FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES, YUGABYTEDB }) - CreateSequenceFlagsStep createSequence(@Stringly.Name String sequence); + CreateSequenceAsStep createSequence(@Stringly.Name String sequence); /** * The CREATE SEQUENCE statement. @@ -10841,7 +10841,7 @@ public interface DSLContext extends Scope { */ @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, DUCKDB, FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES, YUGABYTEDB }) - CreateSequenceFlagsStep createSequence(Name sequence); + CreateSequenceAsStep createSequence(Name sequence); /** * The CREATE SEQUENCE statement. @@ -10850,7 +10850,7 @@ public interface DSLContext extends Scope { */ @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, DUCKDB, FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES, YUGABYTEDB }) - CreateSequenceFlagsStep createSequence(Sequence sequence); + CreateSequenceAsStep createSequence(Sequence sequence); /** * The CREATE SEQUENCE IF NOT EXISTS statement. @@ -10859,7 +10859,7 @@ public interface DSLContext extends Scope { */ @NotNull @CheckReturnValue @Support({ DUCKDB, FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES, YUGABYTEDB }) - CreateSequenceFlagsStep createSequenceIfNotExists(@Stringly.Name String sequence); + CreateSequenceAsStep createSequenceIfNotExists(@Stringly.Name String sequence); /** * The CREATE SEQUENCE IF NOT EXISTS statement. @@ -10868,7 +10868,7 @@ public interface DSLContext extends Scope { */ @NotNull @CheckReturnValue @Support({ DUCKDB, FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES, YUGABYTEDB }) - CreateSequenceFlagsStep createSequenceIfNotExists(Name sequence); + CreateSequenceAsStep createSequenceIfNotExists(Name sequence); /** * The CREATE SEQUENCE IF NOT EXISTS statement. @@ -10877,7 +10877,7 @@ public interface DSLContext extends Scope { */ @NotNull @CheckReturnValue @Support({ DUCKDB, FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES, YUGABYTEDB }) - CreateSequenceFlagsStep createSequenceIfNotExists(Sequence sequence); + CreateSequenceAsStep createSequenceIfNotExists(Sequence sequence); /** * The DROP DATABASE statement. diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateSequenceImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateSequenceImpl.java index 80ac0f70f5..57cf5ec67f 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CreateSequenceImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/CreateSequenceImpl.java @@ -64,27 +64,29 @@ import java.util.stream.*; /** * The CREATE SEQUENCE statement. */ -@SuppressWarnings({ "hiding", "rawtypes", "unused" }) -final class CreateSequenceImpl +@SuppressWarnings({ "hiding", "rawtypes", "unchecked", "unused" }) +final class CreateSequenceImpl extends AbstractDDLQuery implements - QOM.CreateSequence, - CreateSequenceFlagsStep, + QOM.CreateSequence, + CreateSequenceAsStep, + CreateSequenceFlagsStep, CreateSequenceFinalStep { - final Sequence sequence; - final boolean ifNotExists; - Field startWith; - Field incrementBy; - Field minvalue; - boolean noMinvalue; - Field maxvalue; - boolean noMaxvalue; - CycleOption cycle; - Field cache; - boolean noCache; + final Sequence sequence; + final boolean ifNotExists; + DataType dataType; + Field startWith; + Field incrementBy; + Field minvalue; + boolean noMinvalue; + Field maxvalue; + boolean noMaxvalue; + CycleOption cycle; + Field cache; + boolean noCache; CreateSequenceImpl( Configuration configuration, @@ -98,6 +100,7 @@ implements null, null, null, + null, false, null, false, @@ -111,20 +114,22 @@ implements Configuration configuration, Sequence sequence, boolean ifNotExists, - Field startWith, - Field incrementBy, - Field minvalue, + DataType dataType, + Field startWith, + Field incrementBy, + Field minvalue, boolean noMinvalue, - Field maxvalue, + Field maxvalue, boolean noMaxvalue, CycleOption cycle, - Field cache, + Field cache, boolean noCache ) { super(configuration); this.sequence = sequence; this.ifNotExists = ifNotExists; + this.dataType = dataType; this.startWith = startWith; this.incrementBy = incrementBy; this.minvalue = minvalue; @@ -141,86 +146,97 @@ implements // ------------------------------------------------------------------------- @Override - public final CreateSequenceImpl startWith(Number startWith) { - return startWith(Tools.field(startWith, sequence.getDataType())); + public final CreateSequenceImpl as(Class dataType) { + return as(DefaultDataType.getDataType(null, dataType)); } @Override - public final CreateSequenceImpl startWith(Field startWith) { + public final CreateSequenceImpl as(DataType dataType) { + this.dataType = (DataType) dataType; + return (CreateSequenceImpl) this; + } + + @Override + public final CreateSequenceImpl startWith(T startWith) { + return startWith(Tools.field(startWith, (DataType) sequence.getDataType())); + } + + @Override + public final CreateSequenceImpl startWith(Field startWith) { this.startWith = startWith; return this; } @Override - public final CreateSequenceImpl incrementBy(Number incrementBy) { - return incrementBy(Tools.field(incrementBy, sequence.getDataType())); + public final CreateSequenceImpl incrementBy(T incrementBy) { + return incrementBy(Tools.field(incrementBy, (DataType) sequence.getDataType())); } @Override - public final CreateSequenceImpl incrementBy(Field incrementBy) { + public final CreateSequenceImpl incrementBy(Field incrementBy) { this.incrementBy = incrementBy; return this; } @Override - public final CreateSequenceImpl minvalue(Number minvalue) { - return minvalue(Tools.field(minvalue, sequence.getDataType())); + public final CreateSequenceImpl minvalue(T minvalue) { + return minvalue(Tools.field(minvalue, (DataType) sequence.getDataType())); } @Override - public final CreateSequenceImpl minvalue(Field minvalue) { + public final CreateSequenceImpl minvalue(Field minvalue) { this.minvalue = minvalue; return this; } @Override - public final CreateSequenceImpl noMinvalue() { + public final CreateSequenceImpl noMinvalue() { this.noMinvalue = true; return this; } @Override - public final CreateSequenceImpl maxvalue(Number maxvalue) { - return maxvalue(Tools.field(maxvalue, sequence.getDataType())); + public final CreateSequenceImpl maxvalue(T maxvalue) { + return maxvalue(Tools.field(maxvalue, (DataType) sequence.getDataType())); } @Override - public final CreateSequenceImpl maxvalue(Field maxvalue) { + public final CreateSequenceImpl maxvalue(Field maxvalue) { this.maxvalue = maxvalue; return this; } @Override - public final CreateSequenceImpl noMaxvalue() { + public final CreateSequenceImpl noMaxvalue() { this.noMaxvalue = true; return this; } @Override - public final CreateSequenceImpl cycle() { + public final CreateSequenceImpl cycle() { this.cycle = CycleOption.CYCLE; return this; } @Override - public final CreateSequenceImpl noCycle() { + public final CreateSequenceImpl noCycle() { this.cycle = CycleOption.NO_CYCLE; return this; } @Override - public final CreateSequenceImpl cache(Number cache) { - return cache(Tools.field(cache, sequence.getDataType())); + public final CreateSequenceImpl cache(T cache) { + return cache(Tools.field(cache, (DataType) sequence.getDataType())); } @Override - public final CreateSequenceImpl cache(Field cache) { + public final CreateSequenceImpl cache(Field cache) { this.cache = cache; return this; } @Override - public final CreateSequenceImpl noCache() { + public final CreateSequenceImpl noCache() { this.noCache = true; return this; } @@ -267,6 +283,11 @@ implements ctx.visit(sequence); String noSeparator = NO_SEPARATOR.contains(ctx.dialect()) ? "" : " "; + if (dataType != null) { + ctx.sql(' ').visit(K_AS).sql(' '); + toSQLDDLTypeDeclaration(ctx, dataType); + } + // Some databases default to sequences starting with MIN_VALUE if (startWith == null && REQUIRES_START_WITH.contains(ctx.dialect())) ctx.sql(' ').visit(K_START_WITH).sql(" 1"); @@ -322,17 +343,22 @@ implements } @Override - public final Field $startWith() { + public final DataType $dataType() { + return dataType; + } + + @Override + public final Field $startWith() { return startWith; } @Override - public final Field $incrementBy() { + public final Field $incrementBy() { return incrementBy; } @Override - public final Field $minvalue() { + public final Field $minvalue() { return minvalue; } @@ -342,7 +368,7 @@ implements } @Override - public final Field $maxvalue() { + public final Field $maxvalue() { return maxvalue; } @@ -357,7 +383,7 @@ implements } @Override - public final Field $cache() { + public final Field $cache() { return cache; } @@ -367,64 +393,71 @@ implements } @Override - public final QOM.CreateSequence $sequence(Sequence newValue) { - return $constructor().apply(newValue, $ifNotExists(), $startWith(), $incrementBy(), $minvalue(), $noMinvalue(), $maxvalue(), $noMaxvalue(), $cycle(), $cache(), $noCache()); + public final QOM.CreateSequence $sequence(Sequence newValue) { + return $constructor().apply(newValue, $ifNotExists(), $dataType(), $startWith(), $incrementBy(), $minvalue(), $noMinvalue(), $maxvalue(), $noMaxvalue(), $cycle(), $cache(), $noCache()); } @Override - public final QOM.CreateSequence $ifNotExists(boolean newValue) { - return $constructor().apply($sequence(), newValue, $startWith(), $incrementBy(), $minvalue(), $noMinvalue(), $maxvalue(), $noMaxvalue(), $cycle(), $cache(), $noCache()); + public final QOM.CreateSequence $ifNotExists(boolean newValue) { + return $constructor().apply($sequence(), newValue, $dataType(), $startWith(), $incrementBy(), $minvalue(), $noMinvalue(), $maxvalue(), $noMaxvalue(), $cycle(), $cache(), $noCache()); } @Override - public final QOM.CreateSequence $startWith(Field newValue) { - return $constructor().apply($sequence(), $ifNotExists(), newValue, $incrementBy(), $minvalue(), $noMinvalue(), $maxvalue(), $noMaxvalue(), $cycle(), $cache(), $noCache()); + public final QOM.CreateSequence $dataType(DataType newValue) { + return $constructor().apply($sequence(), $ifNotExists(), newValue, $startWith(), $incrementBy(), $minvalue(), $noMinvalue(), $maxvalue(), $noMaxvalue(), $cycle(), $cache(), $noCache()); } @Override - public final QOM.CreateSequence $incrementBy(Field newValue) { - return $constructor().apply($sequence(), $ifNotExists(), $startWith(), newValue, $minvalue(), $noMinvalue(), $maxvalue(), $noMaxvalue(), $cycle(), $cache(), $noCache()); + public final QOM.CreateSequence $startWith(Field newValue) { + return $constructor().apply($sequence(), $ifNotExists(), $dataType(), newValue, $incrementBy(), $minvalue(), $noMinvalue(), $maxvalue(), $noMaxvalue(), $cycle(), $cache(), $noCache()); } @Override - public final QOM.CreateSequence $minvalue(Field newValue) { - return $constructor().apply($sequence(), $ifNotExists(), $startWith(), $incrementBy(), newValue, $noMinvalue(), $maxvalue(), $noMaxvalue(), $cycle(), $cache(), $noCache()); + public final QOM.CreateSequence $incrementBy(Field newValue) { + return $constructor().apply($sequence(), $ifNotExists(), $dataType(), $startWith(), newValue, $minvalue(), $noMinvalue(), $maxvalue(), $noMaxvalue(), $cycle(), $cache(), $noCache()); } @Override - public final QOM.CreateSequence $noMinvalue(boolean newValue) { - return $constructor().apply($sequence(), $ifNotExists(), $startWith(), $incrementBy(), $minvalue(), newValue, $maxvalue(), $noMaxvalue(), $cycle(), $cache(), $noCache()); + public final QOM.CreateSequence $minvalue(Field newValue) { + return $constructor().apply($sequence(), $ifNotExists(), $dataType(), $startWith(), $incrementBy(), newValue, $noMinvalue(), $maxvalue(), $noMaxvalue(), $cycle(), $cache(), $noCache()); } @Override - public final QOM.CreateSequence $maxvalue(Field newValue) { - return $constructor().apply($sequence(), $ifNotExists(), $startWith(), $incrementBy(), $minvalue(), $noMinvalue(), newValue, $noMaxvalue(), $cycle(), $cache(), $noCache()); + public final QOM.CreateSequence $noMinvalue(boolean newValue) { + return $constructor().apply($sequence(), $ifNotExists(), $dataType(), $startWith(), $incrementBy(), $minvalue(), newValue, $maxvalue(), $noMaxvalue(), $cycle(), $cache(), $noCache()); } @Override - public final QOM.CreateSequence $noMaxvalue(boolean newValue) { - return $constructor().apply($sequence(), $ifNotExists(), $startWith(), $incrementBy(), $minvalue(), $noMinvalue(), $maxvalue(), newValue, $cycle(), $cache(), $noCache()); + public final QOM.CreateSequence $maxvalue(Field newValue) { + return $constructor().apply($sequence(), $ifNotExists(), $dataType(), $startWith(), $incrementBy(), $minvalue(), $noMinvalue(), newValue, $noMaxvalue(), $cycle(), $cache(), $noCache()); } @Override - public final QOM.CreateSequence $cycle(CycleOption newValue) { - return $constructor().apply($sequence(), $ifNotExists(), $startWith(), $incrementBy(), $minvalue(), $noMinvalue(), $maxvalue(), $noMaxvalue(), newValue, $cache(), $noCache()); + public final QOM.CreateSequence $noMaxvalue(boolean newValue) { + return $constructor().apply($sequence(), $ifNotExists(), $dataType(), $startWith(), $incrementBy(), $minvalue(), $noMinvalue(), $maxvalue(), newValue, $cycle(), $cache(), $noCache()); } @Override - public final QOM.CreateSequence $cache(Field newValue) { - return $constructor().apply($sequence(), $ifNotExists(), $startWith(), $incrementBy(), $minvalue(), $noMinvalue(), $maxvalue(), $noMaxvalue(), $cycle(), newValue, $noCache()); + public final QOM.CreateSequence $cycle(CycleOption newValue) { + return $constructor().apply($sequence(), $ifNotExists(), $dataType(), $startWith(), $incrementBy(), $minvalue(), $noMinvalue(), $maxvalue(), $noMaxvalue(), newValue, $cache(), $noCache()); } @Override - public final QOM.CreateSequence $noCache(boolean newValue) { - return $constructor().apply($sequence(), $ifNotExists(), $startWith(), $incrementBy(), $minvalue(), $noMinvalue(), $maxvalue(), $noMaxvalue(), $cycle(), $cache(), newValue); + public final QOM.CreateSequence $cache(Field newValue) { + return $constructor().apply($sequence(), $ifNotExists(), $dataType(), $startWith(), $incrementBy(), $minvalue(), $noMinvalue(), $maxvalue(), $noMaxvalue(), $cycle(), newValue, $noCache()); } - public final Function11, ? super Boolean, ? super Field, ? super Field, ? super Field, ? super Boolean, ? super Field, ? super Boolean, ? super CycleOption, ? super Field, ? super Boolean, ? extends QOM.CreateSequence> $constructor() { - return (a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11) -> new CreateSequenceImpl(configuration(), a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11); + @Override + public final QOM.CreateSequence $noCache(boolean newValue) { + return $constructor().apply($sequence(), $ifNotExists(), $dataType(), $startWith(), $incrementBy(), $minvalue(), $noMinvalue(), $maxvalue(), $noMaxvalue(), $cycle(), $cache(), newValue); } + public final Function12, ? super Boolean, ? super DataType, ? super Field, ? super Field, ? super Field, ? super Boolean, ? super Field, ? super Boolean, ? super CycleOption, ? super Field, ? super Boolean, ? extends QOM.CreateSequence> $constructor() { + return (a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12) -> new CreateSequenceImpl(configuration(), a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12); + } + + + diff --git a/jOOQ/src/main/java/org/jooq/impl/DSL.java b/jOOQ/src/main/java/org/jooq/impl/DSL.java index 5980577f85..0930c7ced3 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DSL.java +++ b/jOOQ/src/main/java/org/jooq/impl/DSL.java @@ -9698,7 +9698,7 @@ public class DSL { */ @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, DUCKDB, FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES, YUGABYTEDB }) - public static org.jooq.CreateSequenceFlagsStep createSequence(@Stringly.Name String sequence) { + public static org.jooq.CreateSequenceAsStep createSequence(@Stringly.Name String sequence) { return dsl().createSequence(sequence); } @@ -9713,7 +9713,7 @@ public class DSL { */ @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, DUCKDB, FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES, YUGABYTEDB }) - public static org.jooq.CreateSequenceFlagsStep createSequence(Name sequence) { + public static org.jooq.CreateSequenceAsStep createSequence(Name sequence) { return dsl().createSequence(sequence); } @@ -9728,7 +9728,7 @@ public class DSL { */ @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, DUCKDB, FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES, YUGABYTEDB }) - public static org.jooq.CreateSequenceFlagsStep createSequence(Sequence sequence) { + public static org.jooq.CreateSequenceAsStep createSequence(Sequence sequence) { return dsl().createSequence(sequence); } @@ -9743,7 +9743,7 @@ public class DSL { */ @NotNull @CheckReturnValue @Support({ DUCKDB, FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES, YUGABYTEDB }) - public static org.jooq.CreateSequenceFlagsStep createSequenceIfNotExists(@Stringly.Name String sequence) { + public static org.jooq.CreateSequenceAsStep createSequenceIfNotExists(@Stringly.Name String sequence) { return dsl().createSequenceIfNotExists(sequence); } @@ -9758,7 +9758,7 @@ public class DSL { */ @NotNull @CheckReturnValue @Support({ DUCKDB, FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES, YUGABYTEDB }) - public static org.jooq.CreateSequenceFlagsStep createSequenceIfNotExists(Name sequence) { + public static org.jooq.CreateSequenceAsStep createSequenceIfNotExists(Name sequence) { return dsl().createSequenceIfNotExists(sequence); } @@ -9773,7 +9773,7 @@ public class DSL { */ @NotNull @CheckReturnValue @Support({ DUCKDB, FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES, YUGABYTEDB }) - public static org.jooq.CreateSequenceFlagsStep createSequenceIfNotExists(Sequence sequence) { + public static org.jooq.CreateSequenceAsStep createSequenceIfNotExists(Sequence sequence) { return dsl().createSequenceIfNotExists(sequence); } diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java b/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java index 46f6fab3f6..e6f9817ad1 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java +++ b/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java @@ -3729,32 +3729,32 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri } @Override - public org.jooq.CreateSequenceFlagsStep createSequence(@Stringly.Name String sequence) { + public org.jooq.CreateSequenceAsStep createSequence(@Stringly.Name String sequence) { return new CreateSequenceImpl(configuration(), DSL.sequence(DSL.name(sequence)), false); } @Override - public org.jooq.CreateSequenceFlagsStep createSequence(Name sequence) { + public org.jooq.CreateSequenceAsStep createSequence(Name sequence) { return new CreateSequenceImpl(configuration(), DSL.sequence(sequence), false); } @Override - public org.jooq.CreateSequenceFlagsStep createSequence(Sequence sequence) { + public org.jooq.CreateSequenceAsStep createSequence(Sequence sequence) { return new CreateSequenceImpl(configuration(), sequence, false); } @Override - public org.jooq.CreateSequenceFlagsStep createSequenceIfNotExists(@Stringly.Name String sequence) { + public org.jooq.CreateSequenceAsStep createSequenceIfNotExists(@Stringly.Name String sequence) { return new CreateSequenceImpl(configuration(), DSL.sequence(DSL.name(sequence)), true); } @Override - public org.jooq.CreateSequenceFlagsStep createSequenceIfNotExists(Name sequence) { + public org.jooq.CreateSequenceAsStep createSequenceIfNotExists(Name sequence) { return new CreateSequenceImpl(configuration(), DSL.sequence(sequence), true); } @Override - public org.jooq.CreateSequenceFlagsStep createSequenceIfNotExists(Sequence sequence) { + public org.jooq.CreateSequenceAsStep createSequenceIfNotExists(Sequence sequence) { return new CreateSequenceImpl(configuration(), sequence, true); } diff --git a/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java b/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java index 2a2ce797e0..3421eb367e 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java @@ -570,6 +570,7 @@ import org.jooq.CreateIndexWhereStep; // ... // ... // ... +import org.jooq.CreateSequenceAsStep; import org.jooq.CreateSequenceFlagsStep; import org.jooq.CreateTableAsStep; import org.jooq.CreateTableCommentStep; @@ -4359,6 +4360,7 @@ final class DefaultParseContext extends AbstractScope implements ParseContext { ? dsl.createSequenceIfNotExists(schemaName) : dsl.createSequence(schemaName); + boolean as = false; boolean startWith = false; boolean incrementBy = false; boolean minvalue = false; @@ -4367,9 +4369,12 @@ final class DefaultParseContext extends AbstractScope implements ParseContext { boolean cache = false; for (;;) { - Field field; + Field field; + DataType type = null; - if (!startWith && (startWith |= (field = parseSequenceStartWithIf()) != null)) + if (!as && (as |= (parseKeywordIf("AS") && (type = parseDataType()) != null))) + s = ((CreateSequenceAsStep) s).as(type); + else if (!startWith && (startWith |= (field = parseSequenceStartWithIf()) != null)) s = s.startWith(field); else if (!incrementBy && (incrementBy |= (field = parseSequenceIncrementByIf()) != null)) s = s.incrementBy(field); diff --git a/jOOQ/src/main/java/org/jooq/impl/QOM.java b/jOOQ/src/main/java/org/jooq/impl/QOM.java index 944d0a84fb..fdcfc3d934 100644 --- a/jOOQ/src/main/java/org/jooq/impl/QOM.java +++ b/jOOQ/src/main/java/org/jooq/impl/QOM.java @@ -3054,14 +3054,15 @@ public final class QOM { /** * The CREATE SEQUENCE statement. */ - public static final CreateSequence CreateSequence() { - return new org.jooq.impl.CreateSequenceImpl( + public static final CreateSequence CreateSequence() { + return new org.jooq.impl.CreateSequenceImpl<>( null, null, false, null, null, null, + null, false, null, false, @@ -3074,23 +3075,25 @@ public final class QOM { /** * The CREATE SEQUENCE statement. */ - public static final CreateSequence CreateSequence( + public static final CreateSequence CreateSequence( Sequence sequence, boolean ifNotExists, - Field startWith, - Field incrementBy, - Field minvalue, + DataType dataType, + Field startWith, + Field incrementBy, + Field minvalue, boolean noMinvalue, - Field maxvalue, + Field maxvalue, boolean noMaxvalue, CycleOption cycle, - Field cache, + Field cache, boolean noCache ) { - return new org.jooq.impl.CreateSequenceImpl( + return new org.jooq.impl.CreateSequenceImpl<>( null, sequence, ifNotExists, + dataType, startWith, incrementBy, minvalue, @@ -3106,7 +3109,7 @@ public final class QOM { /** * The CREATE SEQUENCE statement. */ - public /*sealed*/ interface CreateSequence + public /*sealed*/ interface CreateSequence extends DDLQuery //permits @@ -3114,37 +3117,40 @@ public final class QOM { { @NotNull Sequence $sequence(); boolean $ifNotExists(); - @Nullable Field $startWith(); - @Nullable Field $incrementBy(); - @Nullable Field $minvalue(); + @Nullable DataType $dataType(); + @Nullable Field $startWith(); + @Nullable Field $incrementBy(); + @Nullable Field $minvalue(); boolean $noMinvalue(); - @Nullable Field $maxvalue(); + @Nullable Field $maxvalue(); boolean $noMaxvalue(); @Nullable CycleOption $cycle(); - @Nullable Field $cache(); + @Nullable Field $cache(); boolean $noCache(); @CheckReturnValue - @NotNull CreateSequence $sequence(Sequence sequence); + @NotNull CreateSequence $sequence(Sequence sequence); @CheckReturnValue - @NotNull CreateSequence $ifNotExists(boolean ifNotExists); + @NotNull CreateSequence $ifNotExists(boolean ifNotExists); @CheckReturnValue - @NotNull CreateSequence $startWith(Field startWith); + @NotNull CreateSequence $dataType(DataType dataType); @CheckReturnValue - @NotNull CreateSequence $incrementBy(Field incrementBy); + @NotNull CreateSequence $startWith(Field startWith); @CheckReturnValue - @NotNull CreateSequence $minvalue(Field minvalue); + @NotNull CreateSequence $incrementBy(Field incrementBy); @CheckReturnValue - @NotNull CreateSequence $noMinvalue(boolean noMinvalue); + @NotNull CreateSequence $minvalue(Field minvalue); @CheckReturnValue - @NotNull CreateSequence $maxvalue(Field maxvalue); + @NotNull CreateSequence $noMinvalue(boolean noMinvalue); @CheckReturnValue - @NotNull CreateSequence $noMaxvalue(boolean noMaxvalue); + @NotNull CreateSequence $maxvalue(Field maxvalue); @CheckReturnValue - @NotNull CreateSequence $cycle(CycleOption cycle); + @NotNull CreateSequence $noMaxvalue(boolean noMaxvalue); @CheckReturnValue - @NotNull CreateSequence $cache(Field cache); + @NotNull CreateSequence $cycle(CycleOption cycle); @CheckReturnValue - @NotNull CreateSequence $noCache(boolean noCache); + @NotNull CreateSequence $cache(Field cache); + @CheckReturnValue + @NotNull CreateSequence $noCache(boolean noCache); } /**