diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/derby/DerbyDatabase.java b/jOOQ-meta/src/main/java/org/jooq/meta/derby/DerbyDatabase.java index c153edf834..d3e5ce1a71 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/derby/DerbyDatabase.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/derby/DerbyDatabase.java @@ -38,10 +38,15 @@ package org.jooq.meta.derby; +import static org.jooq.impl.DSL.case_; +import static org.jooq.impl.DSL.cast; import static org.jooq.impl.DSL.condition; import static org.jooq.impl.DSL.field; +import static org.jooq.impl.DSL.inline; import static org.jooq.impl.DSL.noCondition; import static org.jooq.impl.DSL.not; +import static org.jooq.impl.DSL.nullif; +import static org.jooq.impl.DSL.one; import static org.jooq.impl.SQLDataType.VARCHAR; import static org.jooq.meta.derby.sys.tables.Syschecks.SYSCHECKS; import static org.jooq.meta.derby.sys.tables.Sysconglomerates.SYSCONGLOMERATES; @@ -358,7 +363,21 @@ public class DerbyDatabase extends AbstractDatabase { for (Record record : create().select( Sysschemas.SCHEMANAME, Syssequences.SEQUENCENAME, - Syssequences.SEQUENCEDATATYPE) + Syssequences.SEQUENCEDATATYPE, + nullif(Syssequences.STARTVALUE, one()).as(Syssequences.STARTVALUE), + nullif(Syssequences.INCREMENT, one()).as(Syssequences.INCREMENT), + nullif(Syssequences.MINIMUMVALUE, case_(cast(Syssequences.SEQUENCEDATATYPE, VARCHAR)) + .when(inline("SMALLINT"), inline((long) Short.MIN_VALUE)) + .when(inline("INTEGER"), inline((long) Integer.MIN_VALUE)) + .when(inline("BIGINT"), inline(Long.MIN_VALUE)) + ).as(Syssequences.MINIMUMVALUE), + nullif(Syssequences.MAXIMUMVALUE, case_(cast(Syssequences.SEQUENCEDATATYPE, VARCHAR)) + .when(inline("SMALLINT"), inline((long) Short.MAX_VALUE)) + .when(inline("INTEGER"), inline((long) Integer.MAX_VALUE)) + .when(inline("BIGINT"), inline(Long.MAX_VALUE)) + ).as(Syssequences.MAXIMUMVALUE), + Syssequences.CYCLEOPTION + ) .from(SYSSEQUENCES) .join(SYSSCHEMAS) .on(Sysschemas.SCHEMAID.equal(Syssequences.SCHEMAID)) @@ -379,8 +398,16 @@ public class DerbyDatabase extends AbstractDatabase { result.add(new DefaultSequenceDefinition( schema, - record.get(Syssequences.SEQUENCENAME, String.class), - type)); + record.get(Syssequences.SEQUENCENAME), + type, + null, + record.get(Syssequences.STARTVALUE), + record.get(Syssequences.INCREMENT), + record.get(Syssequences.MINIMUMVALUE), + record.get(Syssequences.MAXIMUMVALUE), + record.get(Syssequences.CYCLEOPTION, Boolean.class), + null + )); } return result; diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/derby/sys/Indexes.java b/jOOQ-meta/src/main/java/org/jooq/meta/derby/sys/Indexes.java deleted file mode 100644 index 92ae71d52e..0000000000 --- a/jOOQ-meta/src/main/java/org/jooq/meta/derby/sys/Indexes.java +++ /dev/null @@ -1,69 +0,0 @@ -/* - * This file is generated by jOOQ. - */ -package org.jooq.meta.derby.sys; - - -import org.jooq.Index; -import org.jooq.OrderField; -import org.jooq.impl.Internal; -import org.jooq.meta.derby.sys.tables.Syschecks; -import org.jooq.meta.derby.sys.tables.Syscolumns; -import org.jooq.meta.derby.sys.tables.Sysconglomerates; -import org.jooq.meta.derby.sys.tables.Sysconstraints; -import org.jooq.meta.derby.sys.tables.Syskeys; -import org.jooq.meta.derby.sys.tables.Sysschemas; -import org.jooq.meta.derby.sys.tables.Syssequences; -import org.jooq.meta.derby.sys.tables.Systables; - - -/** - * A class modelling indexes of tables of the SYS schema. - */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class Indexes { - - // ------------------------------------------------------------------------- - // INDEX definitions - // ------------------------------------------------------------------------- - - public static final Index SYSCHECKS_INDEX1 = Indexes0.SYSCHECKS_INDEX1; - public static final Index SYSCOLUMNS_INDEX1 = Indexes0.SYSCOLUMNS_INDEX1; - public static final Index SYSCOLUMNS_INDEX2 = Indexes0.SYSCOLUMNS_INDEX2; - public static final Index SYSCONGLOMERATES_INDEX1 = Indexes0.SYSCONGLOMERATES_INDEX1; - public static final Index SYSCONGLOMERATES_INDEX2 = Indexes0.SYSCONGLOMERATES_INDEX2; - public static final Index SYSCONGLOMERATES_INDEX3 = Indexes0.SYSCONGLOMERATES_INDEX3; - public static final Index SYSCONSTRAINTS_INDEX1 = Indexes0.SYSCONSTRAINTS_INDEX1; - public static final Index SYSCONSTRAINTS_INDEX2 = Indexes0.SYSCONSTRAINTS_INDEX2; - public static final Index SYSCONSTRAINTS_INDEX3 = Indexes0.SYSCONSTRAINTS_INDEX3; - public static final Index SYSKEYS_INDEX1 = Indexes0.SYSKEYS_INDEX1; - public static final Index SYSSCHEMAS_INDEX1 = Indexes0.SYSSCHEMAS_INDEX1; - public static final Index SYSSCHEMAS_INDEX2 = Indexes0.SYSSCHEMAS_INDEX2; - public static final Index SYSSEQUENCES_INDEX1 = Indexes0.SYSSEQUENCES_INDEX1; - public static final Index SYSSEQUENCES_INDEX2 = Indexes0.SYSSEQUENCES_INDEX2; - public static final Index SYSTABLES_INDEX1 = Indexes0.SYSTABLES_INDEX1; - public static final Index SYSTABLES_INDEX2 = Indexes0.SYSTABLES_INDEX2; - - // ------------------------------------------------------------------------- - // [#1459] distribute members to avoid static initialisers > 64kb - // ------------------------------------------------------------------------- - - private static class Indexes0 { - public static Index SYSCHECKS_INDEX1 = Internal.createIndex("SYSCHECKS_INDEX1", Syschecks.SYSCHECKS, new OrderField[] { Syschecks.CONSTRAINTID }, true); - public static Index SYSCOLUMNS_INDEX1 = Internal.createIndex("SYSCOLUMNS_INDEX1", Syscolumns.SYSCOLUMNS, new OrderField[] { Syscolumns.REFERENCEID, Syscolumns.COLUMNNAME }, true); - public static Index SYSCOLUMNS_INDEX2 = Internal.createIndex("SYSCOLUMNS_INDEX2", Syscolumns.SYSCOLUMNS, new OrderField[] { Syscolumns.COLUMNDEFAULTID }, false); - public static Index SYSCONGLOMERATES_INDEX1 = Internal.createIndex("SYSCONGLOMERATES_INDEX1", Sysconglomerates.SYSCONGLOMERATES, new OrderField[] { Sysconglomerates.CONGLOMERATEID }, false); - public static Index SYSCONGLOMERATES_INDEX2 = Internal.createIndex("SYSCONGLOMERATES_INDEX2", Sysconglomerates.SYSCONGLOMERATES, new OrderField[] { Sysconglomerates.CONGLOMERATENAME, Sysconglomerates.SCHEMAID }, true); - public static Index SYSCONGLOMERATES_INDEX3 = Internal.createIndex("SYSCONGLOMERATES_INDEX3", Sysconglomerates.SYSCONGLOMERATES, new OrderField[] { Sysconglomerates.TABLEID }, false); - public static Index SYSCONSTRAINTS_INDEX1 = Internal.createIndex("SYSCONSTRAINTS_INDEX1", Sysconstraints.SYSCONSTRAINTS, new OrderField[] { Sysconstraints.CONSTRAINTID }, true); - public static Index SYSCONSTRAINTS_INDEX2 = Internal.createIndex("SYSCONSTRAINTS_INDEX2", Sysconstraints.SYSCONSTRAINTS, new OrderField[] { Sysconstraints.CONSTRAINTNAME, Sysconstraints.SCHEMAID }, true); - public static Index SYSCONSTRAINTS_INDEX3 = Internal.createIndex("SYSCONSTRAINTS_INDEX3", Sysconstraints.SYSCONSTRAINTS, new OrderField[] { Sysconstraints.TABLEID }, false); - public static Index SYSKEYS_INDEX1 = Internal.createIndex("SYSKEYS_INDEX1", Syskeys.SYSKEYS, new OrderField[] { Syskeys.CONSTRAINTID }, true); - public static Index SYSSCHEMAS_INDEX1 = Internal.createIndex("SYSSCHEMAS_INDEX1", Sysschemas.SYSSCHEMAS, new OrderField[] { Sysschemas.SCHEMANAME }, true); - public static Index SYSSCHEMAS_INDEX2 = Internal.createIndex("SYSSCHEMAS_INDEX2", Sysschemas.SYSSCHEMAS, new OrderField[] { Sysschemas.SCHEMAID }, true); - public static Index SYSSEQUENCES_INDEX1 = Internal.createIndex("SYSSEQUENCES_INDEX1", Syssequences.SYSSEQUENCES, new OrderField[] { Syssequences.SEQUENCEID }, true); - public static Index SYSSEQUENCES_INDEX2 = Internal.createIndex("SYSSEQUENCES_INDEX2", Syssequences.SYSSEQUENCES, new OrderField[] { Syssequences.SCHEMAID, Syssequences.SEQUENCENAME }, true); - public static Index SYSTABLES_INDEX1 = Internal.createIndex("SYSTABLES_INDEX1", Systables.SYSTABLES, new OrderField[] { Systables.TABLENAME, Systables.SCHEMAID }, true); - public static Index SYSTABLES_INDEX2 = Internal.createIndex("SYSTABLES_INDEX2", Systables.SYSTABLES, new OrderField[] { Systables.TABLEID }, true); - } -} diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/derby/sys/tables/Syschecks.java b/jOOQ-meta/src/main/java/org/jooq/meta/derby/sys/tables/Syschecks.java index e4a0221646..6e19323e1e 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/derby/sys/tables/Syschecks.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/derby/sys/tables/Syschecks.java @@ -4,12 +4,8 @@ package org.jooq.meta.derby.sys.tables; -import java.util.Arrays; -import java.util.List; - import org.jooq.Field; import org.jooq.ForeignKey; -import org.jooq.Index; import org.jooq.Name; import org.jooq.Record; import org.jooq.Schema; @@ -17,7 +13,6 @@ import org.jooq.Table; import org.jooq.TableField; import org.jooq.impl.DSL; import org.jooq.impl.TableImpl; -import org.jooq.meta.derby.sys.Indexes; import org.jooq.meta.derby.sys.Sys; @@ -27,7 +22,7 @@ import org.jooq.meta.derby.sys.Sys; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Syschecks extends TableImpl { - private static final long serialVersionUID = 2138225021; + private static final long serialVersionUID = -1609899715; /** * The reference instance of SYS.SYSCHECKS @@ -81,9 +76,4 @@ public class Syschecks extends TableImpl { public Schema getSchema() { return Sys.SYS; } - - @Override - public List getIndexes() { - return Arrays.asList(Indexes.SYSCHECKS_INDEX1); - } } diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/derby/sys/tables/Syscolumns.java b/jOOQ-meta/src/main/java/org/jooq/meta/derby/sys/tables/Syscolumns.java index c6413f5f9c..2870b1f2bb 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/derby/sys/tables/Syscolumns.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/derby/sys/tables/Syscolumns.java @@ -4,12 +4,8 @@ package org.jooq.meta.derby.sys.tables; -import java.util.Arrays; -import java.util.List; - import org.jooq.Field; import org.jooq.ForeignKey; -import org.jooq.Index; import org.jooq.Name; import org.jooq.Record; import org.jooq.Schema; @@ -17,7 +13,6 @@ import org.jooq.Table; import org.jooq.TableField; import org.jooq.impl.DSL; import org.jooq.impl.TableImpl; -import org.jooq.meta.derby.sys.Indexes; import org.jooq.meta.derby.sys.Sys; @@ -27,7 +22,7 @@ import org.jooq.meta.derby.sys.Sys; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Syscolumns extends TableImpl { - private static final long serialVersionUID = 199055172; + private static final long serialVersionUID = 1849209761; /** * The reference instance of SYS.SYSCOLUMNS @@ -115,9 +110,4 @@ public class Syscolumns extends TableImpl { public Schema getSchema() { return Sys.SYS; } - - @Override - public List getIndexes() { - return Arrays.asList(Indexes.SYSCOLUMNS_INDEX1, Indexes.SYSCOLUMNS_INDEX2); - } } diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/derby/sys/tables/Sysconglomerates.java b/jOOQ-meta/src/main/java/org/jooq/meta/derby/sys/tables/Sysconglomerates.java index 947e5321b4..76d90b5643 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/derby/sys/tables/Sysconglomerates.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/derby/sys/tables/Sysconglomerates.java @@ -4,12 +4,8 @@ package org.jooq.meta.derby.sys.tables; -import java.util.Arrays; -import java.util.List; - import org.jooq.Field; import org.jooq.ForeignKey; -import org.jooq.Index; import org.jooq.Name; import org.jooq.Record; import org.jooq.Schema; @@ -17,7 +13,6 @@ import org.jooq.Table; import org.jooq.TableField; import org.jooq.impl.DSL; import org.jooq.impl.TableImpl; -import org.jooq.meta.derby.sys.Indexes; import org.jooq.meta.derby.sys.Sys; @@ -27,7 +22,7 @@ import org.jooq.meta.derby.sys.Sys; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Sysconglomerates extends TableImpl { - private static final long serialVersionUID = 1148620021; + private static final long serialVersionUID = 1637592688; /** * The reference instance of SYS.SYSCONGLOMERATES @@ -105,9 +100,4 @@ public class Sysconglomerates extends TableImpl { public Schema getSchema() { return Sys.SYS; } - - @Override - public List getIndexes() { - return Arrays.asList(Indexes.SYSCONGLOMERATES_INDEX1, Indexes.SYSCONGLOMERATES_INDEX2, Indexes.SYSCONGLOMERATES_INDEX3); - } } diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/derby/sys/tables/Sysconstraints.java b/jOOQ-meta/src/main/java/org/jooq/meta/derby/sys/tables/Sysconstraints.java index e0eb0868b8..bb13779ebd 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/derby/sys/tables/Sysconstraints.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/derby/sys/tables/Sysconstraints.java @@ -4,12 +4,8 @@ package org.jooq.meta.derby.sys.tables; -import java.util.Arrays; -import java.util.List; - import org.jooq.Field; import org.jooq.ForeignKey; -import org.jooq.Index; import org.jooq.Name; import org.jooq.Record; import org.jooq.Schema; @@ -17,7 +13,6 @@ import org.jooq.Table; import org.jooq.TableField; import org.jooq.impl.DSL; import org.jooq.impl.TableImpl; -import org.jooq.meta.derby.sys.Indexes; import org.jooq.meta.derby.sys.Sys; @@ -27,7 +22,7 @@ import org.jooq.meta.derby.sys.Sys; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Sysconstraints extends TableImpl { - private static final long serialVersionUID = -1106134207; + private static final long serialVersionUID = 1919449543; /** * The reference instance of SYS.SYSCONSTRAINTS @@ -100,9 +95,4 @@ public class Sysconstraints extends TableImpl { public Schema getSchema() { return Sys.SYS; } - - @Override - public List getIndexes() { - return Arrays.asList(Indexes.SYSCONSTRAINTS_INDEX1, Indexes.SYSCONSTRAINTS_INDEX2, Indexes.SYSCONSTRAINTS_INDEX3); - } } diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/derby/sys/tables/Syskeys.java b/jOOQ-meta/src/main/java/org/jooq/meta/derby/sys/tables/Syskeys.java index e1708d7647..38847da6b1 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/derby/sys/tables/Syskeys.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/derby/sys/tables/Syskeys.java @@ -4,12 +4,8 @@ package org.jooq.meta.derby.sys.tables; -import java.util.Arrays; -import java.util.List; - import org.jooq.Field; import org.jooq.ForeignKey; -import org.jooq.Index; import org.jooq.Name; import org.jooq.Record; import org.jooq.Schema; @@ -17,7 +13,6 @@ import org.jooq.Table; import org.jooq.TableField; import org.jooq.impl.DSL; import org.jooq.impl.TableImpl; -import org.jooq.meta.derby.sys.Indexes; import org.jooq.meta.derby.sys.Sys; @@ -27,7 +22,7 @@ import org.jooq.meta.derby.sys.Sys; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Syskeys extends TableImpl { - private static final long serialVersionUID = -629744389; + private static final long serialVersionUID = 1636373174; /** * The reference instance of SYS.SYSKEYS @@ -75,9 +70,4 @@ public class Syskeys extends TableImpl { public Schema getSchema() { return Sys.SYS; } - - @Override - public List getIndexes() { - return Arrays.asList(Indexes.SYSKEYS_INDEX1); - } } diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/derby/sys/tables/Sysschemas.java b/jOOQ-meta/src/main/java/org/jooq/meta/derby/sys/tables/Sysschemas.java index 325299c9b2..e91e6e7905 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/derby/sys/tables/Sysschemas.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/derby/sys/tables/Sysschemas.java @@ -4,12 +4,8 @@ package org.jooq.meta.derby.sys.tables; -import java.util.Arrays; -import java.util.List; - import org.jooq.Field; import org.jooq.ForeignKey; -import org.jooq.Index; import org.jooq.Name; import org.jooq.Record; import org.jooq.Schema; @@ -17,7 +13,6 @@ import org.jooq.Table; import org.jooq.TableField; import org.jooq.impl.DSL; import org.jooq.impl.TableImpl; -import org.jooq.meta.derby.sys.Indexes; import org.jooq.meta.derby.sys.Sys; @@ -27,7 +22,7 @@ import org.jooq.meta.derby.sys.Sys; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Sysschemas extends TableImpl { - private static final long serialVersionUID = -1548203886; + private static final long serialVersionUID = -1863062257; /** * The reference instance of SYS.SYSSCHEMAS @@ -80,9 +75,4 @@ public class Sysschemas extends TableImpl { public Schema getSchema() { return Sys.SYS; } - - @Override - public List getIndexes() { - return Arrays.asList(Indexes.SYSSCHEMAS_INDEX1, Indexes.SYSSCHEMAS_INDEX2); - } } diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/derby/sys/tables/Syssequences.java b/jOOQ-meta/src/main/java/org/jooq/meta/derby/sys/tables/Syssequences.java index 9d0ec4a9c2..e4261494cf 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/derby/sys/tables/Syssequences.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/derby/sys/tables/Syssequences.java @@ -4,12 +4,8 @@ package org.jooq.meta.derby.sys.tables; -import java.util.Arrays; -import java.util.List; - import org.jooq.Field; import org.jooq.ForeignKey; -import org.jooq.Index; import org.jooq.Name; import org.jooq.Record; import org.jooq.Schema; @@ -17,7 +13,6 @@ import org.jooq.Table; import org.jooq.TableField; import org.jooq.impl.DSL; import org.jooq.impl.TableImpl; -import org.jooq.meta.derby.sys.Indexes; import org.jooq.meta.derby.sys.Sys; @@ -27,7 +22,7 @@ import org.jooq.meta.derby.sys.Sys; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Syssequences extends TableImpl { - private static final long serialVersionUID = 811403848; + private static final long serialVersionUID = 547821189; /** * The reference instance of SYS.SYSSEQUENCES @@ -115,9 +110,4 @@ public class Syssequences extends TableImpl { public Schema getSchema() { return Sys.SYS; } - - @Override - public List getIndexes() { - return Arrays.asList(Indexes.SYSSEQUENCES_INDEX1, Indexes.SYSSEQUENCES_INDEX2); - } } diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/derby/sys/tables/Systables.java b/jOOQ-meta/src/main/java/org/jooq/meta/derby/sys/tables/Systables.java index d3b1d9b404..4804aa0ff2 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/derby/sys/tables/Systables.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/derby/sys/tables/Systables.java @@ -4,12 +4,8 @@ package org.jooq.meta.derby.sys.tables; -import java.util.Arrays; -import java.util.List; - import org.jooq.Field; import org.jooq.ForeignKey; -import org.jooq.Index; import org.jooq.Name; import org.jooq.Record; import org.jooq.Schema; @@ -17,7 +13,6 @@ import org.jooq.Table; import org.jooq.TableField; import org.jooq.impl.DSL; import org.jooq.impl.TableImpl; -import org.jooq.meta.derby.sys.Indexes; import org.jooq.meta.derby.sys.Sys; @@ -27,7 +22,7 @@ import org.jooq.meta.derby.sys.Sys; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Systables extends TableImpl { - private static final long serialVersionUID = 106284821; + private static final long serialVersionUID = 200239054; /** * The reference instance of SYS.SYSTABLES @@ -90,9 +85,4 @@ public class Systables extends TableImpl { public Schema getSchema() { return Sys.SYS; } - - @Override - public List getIndexes() { - return Arrays.asList(Indexes.SYSTABLES_INDEX1, Indexes.SYSTABLES_INDEX2); - } }