From cbcd506bdf453c40cffb6de1c02e8f53286918cf Mon Sep 17 00:00:00 2001 From: Knut Wannheden Date: Wed, 20 Nov 2019 12:23:34 +0100 Subject: [PATCH] [jOOQ/jOOQ#9437] No generics for AlterSequenceFlagsStep Using generics here causes problems given the current signatures on `DSLContext`, where the return type explicitly uses `BigInteger` as the generic type parameter. --- .../java/org/jooq/AlterSequenceFlagsStep.java | 38 +++++++-------- .../main/java/org/jooq/AlterSequenceStep.java | 2 +- .../java/org/jooq/impl/AlterSequenceImpl.java | 47 ++++++++++--------- 3 files changed, 44 insertions(+), 43 deletions(-) diff --git a/jOOQ/src/main/java/org/jooq/AlterSequenceFlagsStep.java b/jOOQ/src/main/java/org/jooq/AlterSequenceFlagsStep.java index 59c049829d..15d01bcd1c 100644 --- a/jOOQ/src/main/java/org/jooq/AlterSequenceFlagsStep.java +++ b/jOOQ/src/main/java/org/jooq/AlterSequenceFlagsStep.java @@ -80,128 +80,128 @@ import static org.jooq.SQLDialect.POSTGRES; * * @author Knut Wannheden */ -public interface AlterSequenceFlagsStep extends AlterSequenceFinalStep { +public interface AlterSequenceFlagsStep extends AlterSequenceFinalStep { /** * Restart the sequence at its initial value. */ @Support({ HSQLDB, MARIADB, POSTGRES }) - AlterSequenceStep restart(); + AlterSequenceFlagsStep restart(); /** * Restart the sequence at a given value. */ @Support({ CUBRID, FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES }) - AlterSequenceStep restartWith(T value); + AlterSequenceFlagsStep restartWith(Number value); /** * Restart the sequence at a given value. */ @Support({ CUBRID, FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES }) - AlterSequenceStep restartWith(Field value); + AlterSequenceFlagsStep restartWith(Field value); /** * Add a START WITH clause to the ALTER SEQUENCE * statement. */ @Support({ MARIADB, POSTGRES }) - AlterSequenceFlagsStep startWith(T value); + AlterSequenceFlagsStep startWith(Number value); /** * Add a START WITH clause to the ALTER SEQUENCE * statement. */ @Support({ MARIADB, POSTGRES }) - AlterSequenceFlagsStep startWith(Field value); + AlterSequenceFlagsStep startWith(Field value); /** * Add a INCREMENT BY clause to the ALTER SEQUENCE * statement. */ @Support({ CUBRID, FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES }) - AlterSequenceFlagsStep incrementBy(T value); + AlterSequenceFlagsStep incrementBy(Number value); /** * Add a INCREMENT BY clause to the ALTER SEQUENCE * statement. */ @Support({ CUBRID, FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES }) - AlterSequenceFlagsStep incrementBy(Field value); + AlterSequenceFlagsStep incrementBy(Field value); /** * Add a MINVALUE clause to the ALTER SEQUENCE * statement. */ @Support({ CUBRID, H2, HSQLDB, MARIADB, POSTGRES }) - AlterSequenceFlagsStep minvalue(T value); + AlterSequenceFlagsStep minvalue(Number value); /** * Add a MINVALUE clause to the ALTER SEQUENCE * statement. */ @Support({ CUBRID, H2, HSQLDB, MARIADB, POSTGRES }) - AlterSequenceFlagsStep minvalue(Field value); + AlterSequenceFlagsStep minvalue(Field value); /** * Add a NO MINVALUE clause to the ALTER SEQUENCE * statement. */ @Support({ CUBRID, H2, HSQLDB, MARIADB, POSTGRES }) - AlterSequenceFlagsStep noMinvalue(); + AlterSequenceFlagsStep noMinvalue(); /** * Add a MINVALUE clause to the ALTER SEQUENCE * statement. */ @Support({ CUBRID, H2, HSQLDB, MARIADB, POSTGRES }) - AlterSequenceFlagsStep maxvalue(T value); + AlterSequenceFlagsStep maxvalue(Number value); /** * Add a MINVALUE clause to the ALTER SEQUENCE * statement. */ @Support({ CUBRID, H2, HSQLDB, MARIADB, POSTGRES }) - AlterSequenceFlagsStep maxvalue(Field value); + AlterSequenceFlagsStep maxvalue(Field value); /** * Add a NO MINVALUE clause to the ALTER SEQUENCE * statement. */ @Support({ CUBRID, H2, HSQLDB, MARIADB, POSTGRES }) - AlterSequenceFlagsStep noMaxvalue(); + AlterSequenceFlagsStep noMaxvalue(); /** * Add a CYCLE clause to the ALTER SEQUENCE * statement. */ @Support({ CUBRID, H2, HSQLDB, MARIADB, POSTGRES }) - AlterSequenceFlagsStep cycle(); + AlterSequenceFlagsStep cycle(); /** * Add a NO CYCLE clause to the ALTER SEQUENCE * statement. */ @Support({ CUBRID, H2, HSQLDB, MARIADB, POSTGRES }) - AlterSequenceFlagsStep noCycle(); + AlterSequenceFlagsStep noCycle(); /** * Add a CACHE clause to the ALTER SEQUENCE * statement. */ @Support({ CUBRID, H2, MARIADB, POSTGRES }) - AlterSequenceFlagsStep cache(T value); + AlterSequenceFlagsStep cache(Number value); /** * Add a CACHE clause to the ALTER SEQUENCE * statement. */ @Support({ CUBRID, H2, MARIADB, POSTGRES }) - AlterSequenceFlagsStep cache(Field value); + AlterSequenceFlagsStep cache(Field value); /** * Add a NO CACHE clause to the ALTER SEQUENCE * statement. */ @Support({ CUBRID, H2, HSQLDB, MARIADB, POSTGRES }) - AlterSequenceFlagsStep noCache(); + AlterSequenceFlagsStep noCache(); } diff --git a/jOOQ/src/main/java/org/jooq/AlterSequenceStep.java b/jOOQ/src/main/java/org/jooq/AlterSequenceStep.java index 2cdd26f490..9ebdc76562 100644 --- a/jOOQ/src/main/java/org/jooq/AlterSequenceStep.java +++ b/jOOQ/src/main/java/org/jooq/AlterSequenceStep.java @@ -67,7 +67,7 @@ import static org.jooq.SQLDialect.POSTGRES; * * @author Lukas Eder */ -public interface AlterSequenceStep extends AlterSequenceFlagsStep { +public interface AlterSequenceStep extends AlterSequenceFlagsStep { /** * Add a RENAME TO clause to the ALTER SEQUENCE diff --git a/jOOQ/src/main/java/org/jooq/impl/AlterSequenceImpl.java b/jOOQ/src/main/java/org/jooq/impl/AlterSequenceImpl.java index 6c9b75f4b5..ea59828956 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AlterSequenceImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/AlterSequenceImpl.java @@ -78,6 +78,7 @@ import static org.jooq.impl.Tools.endTryCatch; import java.util.Set; import org.jooq.AlterSequenceFinalStep; +import org.jooq.AlterSequenceFlagsStep; import org.jooq.AlterSequenceStep; import org.jooq.Clause; import org.jooq.Configuration; @@ -114,14 +115,14 @@ final class AlterSequenceImpl extends AbstractRowCountQuery im private Sequence renameTo; private boolean restart; private Field restartWith; - private Field startWith; - private Field incrementBy; - private Field minvalue; + private Field startWith; + private Field incrementBy; + private Field minvalue; private boolean noMinvalue; - private Field maxvalue; + private Field maxvalue; private boolean noMaxvalue; private Boolean cycle; - private Field cache; + private Field cache; private boolean noCache; AlterSequenceImpl(Configuration configuration, Sequence sequence) { @@ -144,19 +145,19 @@ final class AlterSequenceImpl extends AbstractRowCountQuery im // ------------------------------------------------------------------------ @Override - public final AlterSequenceStep restart() { + public final AlterSequenceFlagsStep restart() { restart = true; restartWith = null; return this; } @Override - public final AlterSequenceStep restartWith(T value) { + public final AlterSequenceFlagsStep restartWith(Number value) { return restartWith(Tools.field(value, sequence.getDataType())); } @Override - public final AlterSequenceStep restartWith(Field value) { + public final AlterSequenceFlagsStep restartWith(Field value) { restart = false; restartWith = value; return this; @@ -179,91 +180,91 @@ final class AlterSequenceImpl extends AbstractRowCountQuery im } @Override - public AlterSequenceStep startWith(T value) { + public AlterSequenceFlagsStep startWith(Number value) { return startWith(Tools.field(value, sequence.getDataType())); } @Override - public AlterSequenceStep startWith(Field value) { + public AlterSequenceFlagsStep startWith(Field value) { startWith = value; return this; } @Override - public AlterSequenceStep incrementBy(T value) { + public AlterSequenceFlagsStep incrementBy(Number value) { return incrementBy(Tools.field(value, sequence.getDataType())); } @Override - public AlterSequenceStep incrementBy(Field value) { + public AlterSequenceFlagsStep incrementBy(Field value) { incrementBy = value; return this; } @Override - public AlterSequenceStep minvalue(T value) { + public AlterSequenceFlagsStep minvalue(Number value) { return minvalue(Tools.field(value, sequence.getDataType())); } @Override - public AlterSequenceStep minvalue(Field value) { + public AlterSequenceFlagsStep minvalue(Field value) { minvalue = value; noMinvalue = false; return this; } @Override - public AlterSequenceStep noMinvalue() { + public AlterSequenceFlagsStep noMinvalue() { minvalue = null; noMinvalue = true; return this; } @Override - public AlterSequenceStep maxvalue(T value) { + public AlterSequenceFlagsStep maxvalue(Number value) { return maxvalue(Tools.field(value, sequence.getDataType())); } @Override - public AlterSequenceStep maxvalue(Field value) { + public AlterSequenceFlagsStep maxvalue(Field value) { maxvalue = value; noMaxvalue = false; return this; } @Override - public AlterSequenceStep noMaxvalue() { + public AlterSequenceFlagsStep noMaxvalue() { maxvalue = null; noMaxvalue = true; return this; } @Override - public AlterSequenceStep cycle() { + public AlterSequenceFlagsStep cycle() { cycle = true; return this; } @Override - public AlterSequenceStep noCycle() { + public AlterSequenceFlagsStep noCycle() { cycle = false; return this; } @Override - public AlterSequenceStep cache(T value) { + public AlterSequenceFlagsStep cache(Number value) { return cache(Tools.field(value, sequence.getDataType())); } @Override - public AlterSequenceStep cache(Field value) { + public AlterSequenceFlagsStep cache(Field value) { cache = value; noCache = false; return this; } @Override - public AlterSequenceStep noCache() { + public AlterSequenceFlagsStep noCache() { cache = null; noCache = true; return this;