github/jooq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[jOOQ/jOOQ#9660] Upgrade Derby to version 10.15

Browse Source 
Also regenerates the `SYS` schema in `jOOQ-meta` for Derby.
This commit is contained in:
Knut Wannheden 2019-12-11 10:38:48 +01:00
parent 4da8a11f92
commit 420b5ca0cb
11 changed files with 159 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
jOOQ-meta/src/main/java/org/jooq/meta/derby/sys/Indexes.java Normal file
View File

@ -0,0 +1,69 @@
/*
* 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 <code>SYS</code> 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);
}
}

14
jOOQ-meta/src/main/java/org/jooq/meta/derby/sys/tables/Syschecks.java
View File

@ -4,8 +4,12 @@
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;
@ -13,6 +17,7 @@ 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;
@ -22,7 +27,7 @@ import org.jooq.meta.derby.sys.Sys;
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class Syschecks extends TableImpl<Record> {
private static final long serialVersionUID = -152859427;
private static final long serialVersionUID = 2138225021;
/**
* The reference instance of <code>SYS.SYSCHECKS</code>
@ -51,7 +56,7 @@ public class Syschecks extends TableImpl<Record> {
* @deprecated Unknown data type. Please define an explicit {@link org.jooq.Binding} to specify how this type should be handled. Deprecation can be turned off using {@literal <deprecationOnUnknownTypes/>} in your code generator configuration.
*/
@java.lang.Deprecated
public static final TableField<Record, Object> REFERENCEDCOLUMNS = createField(DSL.name("REFERENCEDCOLUMNS"), org.jooq.impl.DefaultDataType.getDefaultDataType("\"org.apache.derby.catalog.ReferencedColumns\"").nullable(false), SYSCHECKS, "");
public static final TableField<Record, Object> REFERENCEDCOLUMNS = createField(DSL.name("REFERENCEDCOLUMNS"), org.jooq.impl.SQLDataType.OTHER.nullable(false), SYSCHECKS, "");
/**
* No further instances allowed
@ -76,4 +81,9 @@ public class Syschecks extends TableImpl<Record> {
public Schema getSchema() {
return Sys.SYS;
}
@Override
public List<Index> getIndexes() {
return Arrays.<Index>asList(Indexes.SYSCHECKS_INDEX1);
}
}

12
jOOQ-meta/src/main/java/org/jooq/meta/derby/sys/tables/Syscolumns.java
View File

@ -4,8 +4,12 @@
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;
@ -13,6 +17,7 @@ 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;
@ -22,7 +27,7 @@ import org.jooq.meta.derby.sys.Sys;
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class Syscolumns extends TableImpl<Record> {
private static final long serialVersionUID = 1849209761;
private static final long serialVersionUID = 199055172;
/**
* The reference instance of <code>SYS.SYSCOLUMNS</code>
@ -110,4 +115,9 @@ public class Syscolumns extends TableImpl<Record> {
public Schema getSchema() {
return Sys.SYS;
}
@Override
public List<Index> getIndexes() {
return Arrays.<Index>asList(Indexes.SYSCOLUMNS_INDEX1, Indexes.SYSCOLUMNS_INDEX2);
}
}

12
jOOQ-meta/src/main/java/org/jooq/meta/derby/sys/tables/Sysconglomerates.java
View File

@ -4,8 +4,12 @@
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;
@ -13,6 +17,7 @@ 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;
@ -22,7 +27,7 @@ import org.jooq.meta.derby.sys.Sys;
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class Sysconglomerates extends TableImpl<Record> {
private static final long serialVersionUID = 1637592688;
private static final long serialVersionUID = 1148620021;
/**
* The reference instance of <code>SYS.SYSCONGLOMERATES</code>
@ -100,4 +105,9 @@ public class Sysconglomerates extends TableImpl<Record> {
public Schema getSchema() {
return Sys.SYS;
}
@Override
public List<Index> getIndexes() {
return Arrays.<Index>asList(Indexes.SYSCONGLOMERATES_INDEX1, Indexes.SYSCONGLOMERATES_INDEX2, Indexes.SYSCONGLOMERATES_INDEX3);
}
}

12
jOOQ-meta/src/main/java/org/jooq/meta/derby/sys/tables/Sysconstraints.java
View File

@ -4,8 +4,12 @@
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;
@ -13,6 +17,7 @@ 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;
@ -22,7 +27,7 @@ import org.jooq.meta.derby.sys.Sys;
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class Sysconstraints extends TableImpl<Record> {
private static final long serialVersionUID = 1919449543;
private static final long serialVersionUID = -1106134207;
/**
* The reference instance of <code>SYS.SYSCONSTRAINTS</code>
@ -95,4 +100,9 @@ public class Sysconstraints extends TableImpl<Record> {
public Schema getSchema() {
return Sys.SYS;
}
@Override
public List<Index> getIndexes() {
return Arrays.<Index>asList(Indexes.SYSCONSTRAINTS_INDEX1, Indexes.SYSCONSTRAINTS_INDEX2, Indexes.SYSCONSTRAINTS_INDEX3);
}
}

12
jOOQ-meta/src/main/java/org/jooq/meta/derby/sys/tables/Syskeys.java
View File

@ -4,8 +4,12 @@
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;
@ -13,6 +17,7 @@ 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;
@ -22,7 +27,7 @@ import org.jooq.meta.derby.sys.Sys;
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class Syskeys extends TableImpl<Record> {
private static final long serialVersionUID = 1636373174;
private static final long serialVersionUID = -629744389;
/**
* The reference instance of <code>SYS.SYSKEYS</code>
@ -70,4 +75,9 @@ public class Syskeys extends TableImpl<Record> {
public Schema getSchema() {
return Sys.SYS;
}
@Override
public List<Index> getIndexes() {
return Arrays.<Index>asList(Indexes.SYSKEYS_INDEX1);
}
}

12
jOOQ-meta/src/main/java/org/jooq/meta/derby/sys/tables/Sysschemas.java
View File

@ -4,8 +4,12 @@
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;
@ -13,6 +17,7 @@ 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;
@ -22,7 +27,7 @@ import org.jooq.meta.derby.sys.Sys;
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class Sysschemas extends TableImpl<Record> {
private static final long serialVersionUID = -1863062257;
private static final long serialVersionUID = -1548203886;
/**
* The reference instance of <code>SYS.SYSSCHEMAS</code>
@ -75,4 +80,9 @@ public class Sysschemas extends TableImpl<Record> {
public Schema getSchema() {
return Sys.SYS;
}
@Override
public List<Index> getIndexes() {
return Arrays.<Index>asList(Indexes.SYSSCHEMAS_INDEX1, Indexes.SYSSCHEMAS_INDEX2);
}
}

12
jOOQ-meta/src/main/java/org/jooq/meta/derby/sys/tables/Syssequences.java
View File

@ -4,8 +4,12 @@
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;
@ -13,6 +17,7 @@ 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;
@ -22,7 +27,7 @@ import org.jooq.meta.derby.sys.Sys;
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class Syssequences extends TableImpl<Record> {
private static final long serialVersionUID = 547821189;
private static final long serialVersionUID = 811403848;
/**
* The reference instance of <code>SYS.SYSSEQUENCES</code>
@ -110,4 +115,9 @@ public class Syssequences extends TableImpl<Record> {
public Schema getSchema() {
return Sys.SYS;
}
@Override
public List<Index> getIndexes() {
return Arrays.<Index>asList(Indexes.SYSSEQUENCES_INDEX1, Indexes.SYSSEQUENCES_INDEX2);
}
}

12
jOOQ-meta/src/main/java/org/jooq/meta/derby/sys/tables/Systables.java
View File

@ -4,8 +4,12 @@
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;
@ -13,6 +17,7 @@ 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;
@ -22,7 +27,7 @@ import org.jooq.meta.derby.sys.Sys;
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class Systables extends TableImpl<Record> {
private static final long serialVersionUID = 200239054;
private static final long serialVersionUID = 106284821;
/**
* The reference instance of <code>SYS.SYSTABLES</code>
@ -85,4 +90,9 @@ public class Systables extends TableImpl<Record> {
public Schema getSchema() {
return Sys.SYS;
}
@Override
public List<Index> getIndexes() {
return Arrays.<Index>asList(Indexes.SYSTABLES_INDEX1, Indexes.SYSTABLES_INDEX2);
}
}

15
jOOQ/pom.xml
View File

@ -119,21 +119,6 @@

2
pom.xml
View File

@ -29,7 +29,7 @@
<!-- These in-memory DBs are used by jOOQ-meta-extensions and a variety of integration tests -->
<h2.version>1.4.200</h2.version>
<sqlite.version>3.25.2</sqlite.version>
<derby.version>10.14.2.0</derby.version>
<derby.version>10.15.1.3</derby.version>
<hsqldb.version>2.5.0</hsqldb.version>
<!-- From JDK 11 onwards, we need to depend on the JAXB API explicitly -->