From fb07821ced6d192af46c5027bcec74ff1c5b8aec Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@gmail.com>
Date: Mon, 2 Dec 2019 10:48:24 +0100
Subject: [PATCH] [jOOQ/jOOQ#7639] Added CHECK code generation support for
 Derby

---
 .../org/jooq/meta/derby/DerbyDatabase.java    |  34 +++-
 .../jooq/meta/derby/sys/DefaultCatalog.java   |  51 ++++++
 .../java/org/jooq/meta/derby/sys/Sys.java     | 123 +++++++++++---
 .../java/org/jooq/meta/derby/sys/Tables.java  |  85 +++++-----
 .../jooq/meta/derby/sys/tables/Syschecks.java |  79 +++++++++
 .../meta/derby/sys/tables/Syscolumns.java     | 151 ++++++++++-------
 .../derby/sys/tables/Sysconglomerates.java    | 138 ++++++++++------
 .../meta/derby/sys/tables/Sysconstraints.java | 130 +++++++++------
 .../jooq/meta/derby/sys/tables/Syskeys.java   |  90 ++++++----
 .../meta/derby/sys/tables/Sysschemas.java     |  98 +++++++----
 .../meta/derby/sys/tables/Syssequences.java   | 154 +++++++++++-------
 .../jooq/meta/derby/sys/tables/Systables.java | 114 ++++++++-----
 .../org/jooq/meta/hsqldb/HSQLDBDatabase.java  |  19 ++-
 .../jooq/meta/postgres/PostgresDatabase.java  |   3 +-
 14 files changed, 870 insertions(+), 399 deletions(-)
 create mode 100644 jOOQ-meta/src/main/java/org/jooq/meta/derby/sys/DefaultCatalog.java
 create mode 100644 jOOQ-meta/src/main/java/org/jooq/meta/derby/sys/tables/Syschecks.java

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 9fe84053bc..edc8689878 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
@@ -40,6 +40,7 @@ package org.jooq.meta.derby;
 
 import static org.jooq.impl.DSL.field;
 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;
 import static org.jooq.meta.derby.sys.tables.Sysconstraints.SYSCONSTRAINTS;
 import static org.jooq.meta.derby.sys.tables.Syskeys.SYSKEYS;
@@ -64,6 +65,7 @@ import org.jooq.meta.AbstractDatabase;
 import org.jooq.meta.ArrayDefinition;
 import org.jooq.meta.CatalogDefinition;
 import org.jooq.meta.DataTypeDefinition;
+import org.jooq.meta.DefaultCheckConstraintDefinition;
 import org.jooq.meta.DefaultDataTypeDefinition;
 import org.jooq.meta.DefaultRelations;
 import org.jooq.meta.DefaultSequenceDefinition;
@@ -75,6 +77,7 @@ import org.jooq.meta.SchemaDefinition;
 import org.jooq.meta.SequenceDefinition;
 import org.jooq.meta.TableDefinition;
 import org.jooq.meta.UDTDefinition;
+import org.jooq.meta.derby.sys.tables.Syschecks;
 import org.jooq.meta.derby.sys.tables.Sysconglomerates;
 import org.jooq.meta.derby.sys.tables.Sysconstraints;
 import org.jooq.meta.derby.sys.tables.Syskeys;
@@ -225,8 +228,35 @@ public class DerbyDatabase extends AbstractDatabase {
     }
 
     @Override
-    protected void loadCheckConstraints(DefaultRelations r) throws SQLException {
-        // Currently not supported
+    protected void loadCheckConstraints(DefaultRelations relations) throws SQLException {
+
+        for (Record record : create()
+            .select(
+                Sysschemas.SCHEMANAME,
+                Systables.TABLENAME,
+                Sysconstraints.CONSTRAINTNAME,
+                Syschecks.CHECKDEFINITION)
+            .from(SYSCHECKS)
+            .join(SYSCONSTRAINTS)
+                .on(Syschecks.CONSTRAINTID.eq(Sysconstraints.CONSTRAINTID))
+            .join(SYSTABLES)
+                .on(Systables.TABLEID.equal(Sysconstraints.TABLEID))
+            .join(SYSSCHEMAS)
+                .on(Sysschemas.SCHEMAID.equal(Systables.SCHEMAID))
+            .where(Sysschemas.SCHEMANAME.in(getInputSchemata()))
+        ) {
+            SchemaDefinition schema = getSchema(record.get(Sysschemas.SCHEMANAME));
+            TableDefinition table = getTable(schema, record.get(Systables.TABLENAME));
+
+            if (table != null) {
+                relations.addCheckConstraint(table, new DefaultCheckConstraintDefinition(
+                    schema,
+                    table,
+                    record.get(Sysconstraints.CONSTRAINTNAME),
+                    record.get(Syschecks.CHECKDEFINITION)
+                ));
+            }
+        }
     }
 
     @Override
diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/derby/sys/DefaultCatalog.java b/jOOQ-meta/src/main/java/org/jooq/meta/derby/sys/DefaultCatalog.java
new file mode 100644
index 0000000000..290cccedc9
--- /dev/null
+++ b/jOOQ-meta/src/main/java/org/jooq/meta/derby/sys/DefaultCatalog.java
@@ -0,0 +1,51 @@
+/*
+ * This file is generated by jOOQ.
+ */
+package org.jooq.meta.derby.sys;
+
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.jooq.Schema;
+import org.jooq.impl.CatalogImpl;
+
+
+/**
+ * This class is generated by jOOQ.
+ */
+@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+public class DefaultCatalog extends CatalogImpl {
+
+    private static final long serialVersionUID = 1914219230;
+
+    /**
+     * The reference instance of <code></code>
+     */
+    public static final DefaultCatalog DEFAULT_CATALOG = new DefaultCatalog();
+
+    /**
+     * The schema <code>SYS</code>.
+     */
+    public final Sys SYS = org.jooq.meta.derby.sys.Sys.SYS;
+
+    /**
+     * No further instances allowed
+     */
+    private DefaultCatalog() {
+        super("");
+    }
+
+    @Override
+    public final List<Schema> getSchemas() {
+        List result = new ArrayList();
+        result.addAll(getSchemas0());
+        return result;
+    }
+
+    private final List<Schema> getSchemas0() {
+        return Arrays.<Schema>asList(
+            Sys.SYS);
+    }
+}
diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/derby/sys/Sys.java b/jOOQ-meta/src/main/java/org/jooq/meta/derby/sys/Sys.java
index d5520239f2..6031a4c22a 100644
--- a/jOOQ-meta/src/main/java/org/jooq/meta/derby/sys/Sys.java
+++ b/jOOQ-meta/src/main/java/org/jooq/meta/derby/sys/Sys.java
@@ -1,37 +1,108 @@
-/**
- * This class is generated by jOOQ
+/*
+ * This file is generated by jOOQ.
  */
 package org.jooq.meta.derby.sys;
 
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.jooq.Catalog;
+import org.jooq.Table;
+import org.jooq.impl.SchemaImpl;
+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;
+
+
 /**
  * This class is generated by jOOQ.
  */
-@java.lang.SuppressWarnings("all")
-public class Sys extends org.jooq.impl.SchemaImpl {
+@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+public class Sys extends SchemaImpl {
 
-	private static final long serialVersionUID = -1659535602;
+    private static final long serialVersionUID = -1952686643;
 
-	/**
-	 * The singleton instance of <code>SYS</code>
-	 */
-	public static final Sys SYS = new Sys();
+    /**
+     * The reference instance of <code>SYS</code>
+     */
+    public static final Sys SYS = new Sys();
 
-	/**
-	 * No further instances allowed
-	 */
-	private Sys() {
-		super("SYS");
-	}
+    /**
+     * The table <code>SYS.SYSCHECKS</code>.
+     */
+    public final Syschecks SYSCHECKS = org.jooq.meta.derby.sys.tables.Syschecks.SYSCHECKS;
 
-	@Override
-	public final java.util.List<org.jooq.Table<?>> getTables() {
-		return java.util.Arrays.<org.jooq.Table<?>>asList(
-			org.jooq.meta.derby.sys.tables.Syscolumns.SYSCOLUMNS,
-			org.jooq.meta.derby.sys.tables.Sysconglomerates.SYSCONGLOMERATES,
-			org.jooq.meta.derby.sys.tables.Sysconstraints.SYSCONSTRAINTS,
-			org.jooq.meta.derby.sys.tables.Syskeys.SYSKEYS,
-			org.jooq.meta.derby.sys.tables.Sysschemas.SYSSCHEMAS,
-			org.jooq.meta.derby.sys.tables.Syssequences.SYSSEQUENCES,
-			org.jooq.meta.derby.sys.tables.Systables.SYSTABLES);
-	}
+    /**
+     * The table <code>SYS.SYSCOLUMNS</code>.
+     */
+    public final Syscolumns SYSCOLUMNS = org.jooq.meta.derby.sys.tables.Syscolumns.SYSCOLUMNS;
+
+    /**
+     * The table <code>SYS.SYSCONGLOMERATES</code>.
+     */
+    public final Sysconglomerates SYSCONGLOMERATES = org.jooq.meta.derby.sys.tables.Sysconglomerates.SYSCONGLOMERATES;
+
+    /**
+     * The table <code>SYS.SYSCONSTRAINTS</code>.
+     */
+    public final Sysconstraints SYSCONSTRAINTS = org.jooq.meta.derby.sys.tables.Sysconstraints.SYSCONSTRAINTS;
+
+    /**
+     * The table <code>SYS.SYSKEYS</code>.
+     */
+    public final Syskeys SYSKEYS = org.jooq.meta.derby.sys.tables.Syskeys.SYSKEYS;
+
+    /**
+     * The table <code>SYS.SYSSCHEMAS</code>.
+     */
+    public final Sysschemas SYSSCHEMAS = org.jooq.meta.derby.sys.tables.Sysschemas.SYSSCHEMAS;
+
+    /**
+     * The table <code>SYS.SYSSEQUENCES</code>.
+     */
+    public final Syssequences SYSSEQUENCES = org.jooq.meta.derby.sys.tables.Syssequences.SYSSEQUENCES;
+
+    /**
+     * The table <code>SYS.SYSTABLES</code>.
+     */
+    public final Systables SYSTABLES = org.jooq.meta.derby.sys.tables.Systables.SYSTABLES;
+
+    /**
+     * No further instances allowed
+     */
+    private Sys() {
+        super("SYS", null);
+    }
+
+
+    @Override
+    public Catalog getCatalog() {
+        return DefaultCatalog.DEFAULT_CATALOG;
+    }
+
+    @Override
+    public final List<Table<?>> getTables() {
+        List result = new ArrayList();
+        result.addAll(getTables0());
+        return result;
+    }
+
+    private final List<Table<?>> getTables0() {
+        return Arrays.<Table<?>>asList(
+            Syschecks.SYSCHECKS,
+            Syscolumns.SYSCOLUMNS,
+            Sysconglomerates.SYSCONGLOMERATES,
+            Sysconstraints.SYSCONSTRAINTS,
+            Syskeys.SYSKEYS,
+            Sysschemas.SYSSCHEMAS,
+            Syssequences.SYSSEQUENCES,
+            Systables.SYSTABLES);
+    }
 }
diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/derby/sys/Tables.java b/jOOQ-meta/src/main/java/org/jooq/meta/derby/sys/Tables.java
index 2825b848af..64acde60c8 100644
--- a/jOOQ-meta/src/main/java/org/jooq/meta/derby/sys/Tables.java
+++ b/jOOQ-meta/src/main/java/org/jooq/meta/derby/sys/Tables.java
@@ -1,53 +1,62 @@
-/**
- * This class is generated by jOOQ
+/*
+ * This file is generated by jOOQ.
  */
 package org.jooq.meta.derby.sys;
 
+
+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;
+
+
 /**
- * This class is generated by jOOQ.
- *
  * Convenience access to all tables in SYS
  */
-@java.lang.SuppressWarnings("all")
-public final class Tables {
+@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+public class Tables {
 
-	/**
-	 * The table SYS.SYSCOLUMNS
-	 */
-	public static final org.jooq.meta.derby.sys.tables.Syscolumns SYSCOLUMNS = org.jooq.meta.derby.sys.tables.Syscolumns.SYSCOLUMNS;
+    /**
+     * The table <code>SYS.SYSCHECKS</code>.
+     */
+    public static final Syschecks SYSCHECKS = Syschecks.SYSCHECKS;
 
-	/**
-	 * The table SYS.SYSCONGLOMERATES
-	 */
-	public static final org.jooq.meta.derby.sys.tables.Sysconglomerates SYSCONGLOMERATES = org.jooq.meta.derby.sys.tables.Sysconglomerates.SYSCONGLOMERATES;
+    /**
+     * The table <code>SYS.SYSCOLUMNS</code>.
+     */
+    public static final Syscolumns SYSCOLUMNS = Syscolumns.SYSCOLUMNS;
 
-	/**
-	 * The table SYS.SYSCONSTRAINTS
-	 */
-	public static final org.jooq.meta.derby.sys.tables.Sysconstraints SYSCONSTRAINTS = org.jooq.meta.derby.sys.tables.Sysconstraints.SYSCONSTRAINTS;
+    /**
+     * The table <code>SYS.SYSCONGLOMERATES</code>.
+     */
+    public static final Sysconglomerates SYSCONGLOMERATES = Sysconglomerates.SYSCONGLOMERATES;
 
-	/**
-	 * The table SYS.SYSKEYS
-	 */
-	public static final org.jooq.meta.derby.sys.tables.Syskeys SYSKEYS = org.jooq.meta.derby.sys.tables.Syskeys.SYSKEYS;
+    /**
+     * The table <code>SYS.SYSCONSTRAINTS</code>.
+     */
+    public static final Sysconstraints SYSCONSTRAINTS = Sysconstraints.SYSCONSTRAINTS;
 
-	/**
-	 * The table SYS.SYSSCHEMAS
-	 */
-	public static final org.jooq.meta.derby.sys.tables.Sysschemas SYSSCHEMAS = org.jooq.meta.derby.sys.tables.Sysschemas.SYSSCHEMAS;
+    /**
+     * The table <code>SYS.SYSKEYS</code>.
+     */
+    public static final Syskeys SYSKEYS = Syskeys.SYSKEYS;
 
-	/**
-	 * The table SYS.SYSSEQUENCES
-	 */
-	public static final org.jooq.meta.derby.sys.tables.Syssequences SYSSEQUENCES = org.jooq.meta.derby.sys.tables.Syssequences.SYSSEQUENCES;
+    /**
+     * The table <code>SYS.SYSSCHEMAS</code>.
+     */
+    public static final Sysschemas SYSSCHEMAS = Sysschemas.SYSSCHEMAS;
 
-	/**
-	 * The table SYS.SYSTABLES
-	 */
-	public static final org.jooq.meta.derby.sys.tables.Systables SYSTABLES = org.jooq.meta.derby.sys.tables.Systables.SYSTABLES;
+    /**
+     * The table <code>SYS.SYSSEQUENCES</code>.
+     */
+    public static final Syssequences SYSSEQUENCES = Syssequences.SYSSEQUENCES;
 
-	/**
-	 * No further instances allowed
-	 */
-	private Tables() {}
+    /**
+     * The table <code>SYS.SYSTABLES</code>.
+     */
+    public static final Systables SYSTABLES = Systables.SYSTABLES;
 }
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
new file mode 100644
index 0000000000..3ffc34d313
--- /dev/null
+++ b/jOOQ-meta/src/main/java/org/jooq/meta/derby/sys/tables/Syschecks.java
@@ -0,0 +1,79 @@
+/*
+ * This file is generated by jOOQ.
+ */
+package org.jooq.meta.derby.sys.tables;
+
+
+import org.jooq.Field;
+import org.jooq.ForeignKey;
+import org.jooq.Name;
+import org.jooq.Record;
+import org.jooq.Schema;
+import org.jooq.Table;
+import org.jooq.TableField;
+import org.jooq.impl.DSL;
+import org.jooq.impl.TableImpl;
+import org.jooq.meta.derby.sys.Sys;
+
+
+/**
+ * This class is generated by jOOQ.
+ */
+@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+public class Syschecks extends TableImpl<Record> {
+
+    private static final long serialVersionUID = -152859427;
+
+    /**
+     * The reference instance of <code>SYS.SYSCHECKS</code>
+     */
+    public static final Syschecks SYSCHECKS = new Syschecks();
+
+    /**
+     * The class holding records for this type
+     */
+    @Override
+    public Class<Record> getRecordType() {
+        return Record.class;
+    }
+
+    /**
+     * The column <code>SYS.SYSCHECKS.CONSTRAINTID</code>.
+     */
+    public static final TableField<Record, String> CONSTRAINTID = createField(DSL.name("CONSTRAINTID"), org.jooq.impl.SQLDataType.CHAR(36).nullable(false), SYSCHECKS, "");
+
+    /**
+     * The column <code>SYS.SYSCHECKS.CHECKDEFINITION</code>.
+     */
+    public static final TableField<Record, String> CHECKDEFINITION = createField(DSL.name("CHECKDEFINITION"), org.jooq.impl.SQLDataType.LONGVARCHAR.nullable(false), SYSCHECKS, "");
+
+    /**
+     * @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, "");
+
+    /**
+     * No further instances allowed
+     */
+    private Syschecks() {
+        this(DSL.name("SYSCHECKS"), null);
+    }
+
+    private Syschecks(Name alias, Table<Record> aliased) {
+        this(alias, aliased, null);
+    }
+
+    private Syschecks(Name alias, Table<Record> aliased, Field<?>[] parameters) {
+        super(alias, null, aliased, parameters, DSL.comment(""));
+    }
+
+    public <O extends Record> Syschecks(Table<O> child, ForeignKey<O, Record> key) {
+        super(child, key, SYSCHECKS);
+    }
+
+    @Override
+    public Schema getSchema() {
+        return Sys.SYS;
+    }
+}
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 501ab5d7ac..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
@@ -1,78 +1,113 @@
-/**
- * This class is generated by jOOQ
+/*
+ * This file is generated by jOOQ.
  */
 package org.jooq.meta.derby.sys.tables;
 
+
+import org.jooq.Field;
+import org.jooq.ForeignKey;
+import org.jooq.Name;
+import org.jooq.Record;
+import org.jooq.Schema;
+import org.jooq.Table;
+import org.jooq.TableField;
+import org.jooq.impl.DSL;
+import org.jooq.impl.TableImpl;
+import org.jooq.meta.derby.sys.Sys;
+
+
 /**
  * This class is generated by jOOQ.
  */
-@java.lang.SuppressWarnings("all")
-public class Syscolumns extends org.jooq.impl.TableImpl<org.jooq.Record> {
+@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+public class Syscolumns extends TableImpl<Record> {
 
-	private static final long serialVersionUID = 1515539769;
+    private static final long serialVersionUID = 1849209761;
 
-	/**
-	 * The singleton instance of <code>SYS.SYSCOLUMNS</code>
-	 */
-	public static final org.jooq.meta.derby.sys.tables.Syscolumns SYSCOLUMNS = new org.jooq.meta.derby.sys.tables.Syscolumns();
+    /**
+     * The reference instance of <code>SYS.SYSCOLUMNS</code>
+     */
+    public static final Syscolumns SYSCOLUMNS = new Syscolumns();
 
-	/**
-	 * The class holding records for this type
-	 */
-	@Override
-	public java.lang.Class<org.jooq.Record> getRecordType() {
-		return org.jooq.Record.class;
-	}
+    /**
+     * The class holding records for this type
+     */
+    @Override
+    public Class<Record> getRecordType() {
+        return Record.class;
+    }
 
-	/**
-	 * The column <code>SYS.SYSCOLUMNS.REFERENCEID</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> REFERENCEID = createField("REFERENCEID", org.jooq.impl.SQLDataType.CHAR, SYSCOLUMNS);
+    /**
+     * The column <code>SYS.SYSCOLUMNS.REFERENCEID</code>.
+     */
+    public static final TableField<Record, String> REFERENCEID = createField(DSL.name("REFERENCEID"), org.jooq.impl.SQLDataType.CHAR(36).nullable(false), SYSCOLUMNS, "");
 
-	/**
-	 * The column <code>SYS.SYSCOLUMNS.COLUMNNAME</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> COLUMNNAME = createField("COLUMNNAME", org.jooq.impl.SQLDataType.VARCHAR, SYSCOLUMNS);
+    /**
+     * The column <code>SYS.SYSCOLUMNS.COLUMNNAME</code>.
+     */
+    public static final TableField<Record, String> COLUMNNAME = createField(DSL.name("COLUMNNAME"), org.jooq.impl.SQLDataType.VARCHAR(128).nullable(false), SYSCOLUMNS, "");
 
-	/**
-	 * The column <code>SYS.SYSCOLUMNS.COLUMNNUMBER</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.Integer> COLUMNNUMBER = createField("COLUMNNUMBER", org.jooq.impl.SQLDataType.INTEGER, SYSCOLUMNS);
+    /**
+     * The column <code>SYS.SYSCOLUMNS.COLUMNNUMBER</code>.
+     */
+    public static final TableField<Record, Integer> COLUMNNUMBER = createField(DSL.name("COLUMNNUMBER"), org.jooq.impl.SQLDataType.INTEGER.nullable(false), SYSCOLUMNS, "");
 
-	/**
-	 * The column <code>SYS.SYSCOLUMNS.COLUMNDATATYPE</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> COLUMNDATATYPE = createField("COLUMNDATATYPE", org.jooq.impl.SQLDataType.CLOB, SYSCOLUMNS);
+    /**
+     * The column <code>SYS.SYSCOLUMNS.COLUMNDATATYPE</code>.
+     */
+    public static final TableField<Record, String> COLUMNDATATYPE = createField(DSL.name("COLUMNDATATYPE"), org.jooq.impl.SQLDataType.CLOB.nullable(false), SYSCOLUMNS, "");
 
-	/**
-	 * The column <code>SYS.SYSCOLUMNS.COLUMNDEFAULT</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> COLUMNDEFAULT = createField("COLUMNDEFAULT", org.jooq.impl.SQLDataType.CLOB, SYSCOLUMNS);
+    /**
+     * The column <code>SYS.SYSCOLUMNS.COLUMNDEFAULT</code>.
+     */
+    public static final TableField<Record, String> COLUMNDEFAULT = createField(DSL.name("COLUMNDEFAULT"), org.jooq.impl.SQLDataType.CLOB, SYSCOLUMNS, "");
 
-	/**
-	 * The column <code>SYS.SYSCOLUMNS.COLUMNDEFAULTID</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> COLUMNDEFAULTID = createField("COLUMNDEFAULTID", org.jooq.impl.SQLDataType.CHAR, SYSCOLUMNS);
+    /**
+     * The column <code>SYS.SYSCOLUMNS.COLUMNDEFAULTID</code>.
+     */
+    public static final TableField<Record, String> COLUMNDEFAULTID = createField(DSL.name("COLUMNDEFAULTID"), org.jooq.impl.SQLDataType.CHAR(36), SYSCOLUMNS, "");
 
-	/**
-	 * The column <code>SYS.SYSCOLUMNS.AUTOINCREMENTVALUE</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.Long> AUTOINCREMENTVALUE = createField("AUTOINCREMENTVALUE", org.jooq.impl.SQLDataType.BIGINT, SYSCOLUMNS);
+    /**
+     * The column <code>SYS.SYSCOLUMNS.AUTOINCREMENTVALUE</code>.
+     */
+    public static final TableField<Record, Long> AUTOINCREMENTVALUE = createField(DSL.name("AUTOINCREMENTVALUE"), org.jooq.impl.SQLDataType.BIGINT, SYSCOLUMNS, "");
 
-	/**
-	 * The column <code>SYS.SYSCOLUMNS.AUTOINCREMENTSTART</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.Long> AUTOINCREMENTSTART = createField("AUTOINCREMENTSTART", org.jooq.impl.SQLDataType.BIGINT, SYSCOLUMNS);
+    /**
+     * The column <code>SYS.SYSCOLUMNS.AUTOINCREMENTSTART</code>.
+     */
+    public static final TableField<Record, Long> AUTOINCREMENTSTART = createField(DSL.name("AUTOINCREMENTSTART"), org.jooq.impl.SQLDataType.BIGINT, SYSCOLUMNS, "");
 
-	/**
-	 * The column <code>SYS.SYSCOLUMNS.AUTOINCREMENTINC</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.Long> AUTOINCREMENTINC = createField("AUTOINCREMENTINC", org.jooq.impl.SQLDataType.BIGINT, SYSCOLUMNS);
+    /**
+     * The column <code>SYS.SYSCOLUMNS.AUTOINCREMENTINC</code>.
+     */
+    public static final TableField<Record, Long> AUTOINCREMENTINC = createField(DSL.name("AUTOINCREMENTINC"), org.jooq.impl.SQLDataType.BIGINT, SYSCOLUMNS, "");
 
-	/**
-	 * No further instances allowed
-	 */
-	private Syscolumns() {
-		super("SYSCOLUMNS", org.jooq.meta.derby.sys.Sys.SYS);
-	}
+    /**
+     * The column <code>SYS.SYSCOLUMNS.AUTOINCREMENTCYCLE</code>.
+     */
+    public static final TableField<Record, Boolean> AUTOINCREMENTCYCLE = createField(DSL.name("AUTOINCREMENTCYCLE"), org.jooq.impl.SQLDataType.BOOLEAN, SYSCOLUMNS, "");
+
+    /**
+     * No further instances allowed
+     */
+    private Syscolumns() {
+        this(DSL.name("SYSCOLUMNS"), null);
+    }
+
+    private Syscolumns(Name alias, Table<Record> aliased) {
+        this(alias, aliased, null);
+    }
+
+    private Syscolumns(Name alias, Table<Record> aliased, Field<?>[] parameters) {
+        super(alias, null, aliased, parameters, DSL.comment(""));
+    }
+
+    public <O extends Record> Syscolumns(Table<O> child, ForeignKey<O, Record> key) {
+        super(child, key, SYSCOLUMNS);
+    }
+
+    @Override
+    public Schema getSchema() {
+        return Sys.SYS;
+    }
 }
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 7c0be50434..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
@@ -1,73 +1,103 @@
-/**
- * This class is generated by jOOQ
+/*
+ * This file is generated by jOOQ.
  */
 package org.jooq.meta.derby.sys.tables;
 
+
+import org.jooq.Field;
+import org.jooq.ForeignKey;
+import org.jooq.Name;
+import org.jooq.Record;
+import org.jooq.Schema;
+import org.jooq.Table;
+import org.jooq.TableField;
+import org.jooq.impl.DSL;
+import org.jooq.impl.TableImpl;
+import org.jooq.meta.derby.sys.Sys;
+
+
 /**
  * This class is generated by jOOQ.
  */
-@java.lang.SuppressWarnings("all")
-public class Sysconglomerates extends org.jooq.impl.TableImpl<org.jooq.Record> {
+@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+public class Sysconglomerates extends TableImpl<Record> {
 
-	private static final long serialVersionUID = 1621303140;
+    private static final long serialVersionUID = 1637592688;
 
-	/**
-	 * The singleton instance of <code>SYS.SYSCONGLOMERATES</code>
-	 */
-	public static final org.jooq.meta.derby.sys.tables.Sysconglomerates SYSCONGLOMERATES = new org.jooq.meta.derby.sys.tables.Sysconglomerates();
+    /**
+     * The reference instance of <code>SYS.SYSCONGLOMERATES</code>
+     */
+    public static final Sysconglomerates SYSCONGLOMERATES = new Sysconglomerates();
 
-	/**
-	 * The class holding records for this type
-	 */
-	@Override
-	public java.lang.Class<org.jooq.Record> getRecordType() {
-		return org.jooq.Record.class;
-	}
+    /**
+     * The class holding records for this type
+     */
+    @Override
+    public Class<Record> getRecordType() {
+        return Record.class;
+    }
 
-	/**
-	 * The column <code>SYS.SYSCONGLOMERATES.SCHEMAID</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> SCHEMAID = createField("SCHEMAID", org.jooq.impl.SQLDataType.CHAR, SYSCONGLOMERATES);
+    /**
+     * The column <code>SYS.SYSCONGLOMERATES.SCHEMAID</code>.
+     */
+    public static final TableField<Record, String> SCHEMAID = createField(DSL.name("SCHEMAID"), org.jooq.impl.SQLDataType.CHAR(36).nullable(false), SYSCONGLOMERATES, "");
 
-	/**
-	 * The column <code>SYS.SYSCONGLOMERATES.TABLEID</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> TABLEID = createField("TABLEID", org.jooq.impl.SQLDataType.CHAR, SYSCONGLOMERATES);
+    /**
+     * The column <code>SYS.SYSCONGLOMERATES.TABLEID</code>.
+     */
+    public static final TableField<Record, String> TABLEID = createField(DSL.name("TABLEID"), org.jooq.impl.SQLDataType.CHAR(36).nullable(false), SYSCONGLOMERATES, "");
 
-	/**
-	 * The column <code>SYS.SYSCONGLOMERATES.CONGLOMERATENUMBER</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.Long> CONGLOMERATENUMBER = createField("CONGLOMERATENUMBER", org.jooq.impl.SQLDataType.BIGINT, SYSCONGLOMERATES);
+    /**
+     * The column <code>SYS.SYSCONGLOMERATES.CONGLOMERATENUMBER</code>.
+     */
+    public static final TableField<Record, Long> CONGLOMERATENUMBER = createField(DSL.name("CONGLOMERATENUMBER"), org.jooq.impl.SQLDataType.BIGINT.nullable(false), SYSCONGLOMERATES, "");
 
-	/**
-	 * The column <code>SYS.SYSCONGLOMERATES.CONGLOMERATENAME</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> CONGLOMERATENAME = createField("CONGLOMERATENAME", org.jooq.impl.SQLDataType.VARCHAR, SYSCONGLOMERATES);
+    /**
+     * The column <code>SYS.SYSCONGLOMERATES.CONGLOMERATENAME</code>.
+     */
+    public static final TableField<Record, String> CONGLOMERATENAME = createField(DSL.name("CONGLOMERATENAME"), org.jooq.impl.SQLDataType.VARCHAR(128), SYSCONGLOMERATES, "");
 
-	/**
-	 * The column <code>SYS.SYSCONGLOMERATES.ISINDEX</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.Boolean> ISINDEX = createField("ISINDEX", org.jooq.impl.SQLDataType.BOOLEAN, SYSCONGLOMERATES);
+    /**
+     * The column <code>SYS.SYSCONGLOMERATES.ISINDEX</code>.
+     */
+    public static final TableField<Record, Boolean> ISINDEX = createField(DSL.name("ISINDEX"), org.jooq.impl.SQLDataType.BOOLEAN.nullable(false), SYSCONGLOMERATES, "");
 
-	/**
-	 * The column <code>SYS.SYSCONGLOMERATES.DESCRIPTOR</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> DESCRIPTOR = createField("DESCRIPTOR", org.jooq.impl.SQLDataType.CLOB, SYSCONGLOMERATES);
+    /**
+     * The column <code>SYS.SYSCONGLOMERATES.DESCRIPTOR</code>.
+     */
+    public static final TableField<Record, String> DESCRIPTOR = createField(DSL.name("DESCRIPTOR"), org.jooq.impl.SQLDataType.CLOB, SYSCONGLOMERATES, "");
 
-	/**
-	 * The column <code>SYS.SYSCONGLOMERATES.ISCONSTRAINT</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.Boolean> ISCONSTRAINT = createField("ISCONSTRAINT", org.jooq.impl.SQLDataType.BOOLEAN, SYSCONGLOMERATES);
+    /**
+     * The column <code>SYS.SYSCONGLOMERATES.ISCONSTRAINT</code>.
+     */
+    public static final TableField<Record, Boolean> ISCONSTRAINT = createField(DSL.name("ISCONSTRAINT"), org.jooq.impl.SQLDataType.BOOLEAN, SYSCONGLOMERATES, "");
 
-	/**
-	 * The column <code>SYS.SYSCONGLOMERATES.CONGLOMERATEID</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> CONGLOMERATEID = createField("CONGLOMERATEID", org.jooq.impl.SQLDataType.CHAR, SYSCONGLOMERATES);
+    /**
+     * The column <code>SYS.SYSCONGLOMERATES.CONGLOMERATEID</code>.
+     */
+    public static final TableField<Record, String> CONGLOMERATEID = createField(DSL.name("CONGLOMERATEID"), org.jooq.impl.SQLDataType.CHAR(36).nullable(false), SYSCONGLOMERATES, "");
 
-	/**
-	 * No further instances allowed
-	 */
-	private Sysconglomerates() {
-		super("SYSCONGLOMERATES", org.jooq.meta.derby.sys.Sys.SYS);
-	}
+    /**
+     * No further instances allowed
+     */
+    private Sysconglomerates() {
+        this(DSL.name("SYSCONGLOMERATES"), null);
+    }
+
+    private Sysconglomerates(Name alias, Table<Record> aliased) {
+        this(alias, aliased, null);
+    }
+
+    private Sysconglomerates(Name alias, Table<Record> aliased, Field<?>[] parameters) {
+        super(alias, null, aliased, parameters, DSL.comment(""));
+    }
+
+    public <O extends Record> Sysconglomerates(Table<O> child, ForeignKey<O, Record> key) {
+        super(child, key, SYSCONGLOMERATES);
+    }
+
+    @Override
+    public Schema getSchema() {
+        return Sys.SYS;
+    }
 }
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 1f1efe1c81..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
@@ -1,68 +1,98 @@
-/**
- * This class is generated by jOOQ
+/*
+ * This file is generated by jOOQ.
  */
 package org.jooq.meta.derby.sys.tables;
 
+
+import org.jooq.Field;
+import org.jooq.ForeignKey;
+import org.jooq.Name;
+import org.jooq.Record;
+import org.jooq.Schema;
+import org.jooq.Table;
+import org.jooq.TableField;
+import org.jooq.impl.DSL;
+import org.jooq.impl.TableImpl;
+import org.jooq.meta.derby.sys.Sys;
+
+
 /**
  * This class is generated by jOOQ.
  */
-@java.lang.SuppressWarnings("all")
-public class Sysconstraints extends org.jooq.impl.TableImpl<org.jooq.Record> {
+@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+public class Sysconstraints extends TableImpl<Record> {
 
-	private static final long serialVersionUID = 896651060;
+    private static final long serialVersionUID = 1919449543;
 
-	/**
-	 * The singleton instance of <code>SYS.SYSCONSTRAINTS</code>
-	 */
-	public static final org.jooq.meta.derby.sys.tables.Sysconstraints SYSCONSTRAINTS = new org.jooq.meta.derby.sys.tables.Sysconstraints();
+    /**
+     * The reference instance of <code>SYS.SYSCONSTRAINTS</code>
+     */
+    public static final Sysconstraints SYSCONSTRAINTS = new Sysconstraints();
 
-	/**
-	 * The class holding records for this type
-	 */
-	@Override
-	public java.lang.Class<org.jooq.Record> getRecordType() {
-		return org.jooq.Record.class;
-	}
+    /**
+     * The class holding records for this type
+     */
+    @Override
+    public Class<Record> getRecordType() {
+        return Record.class;
+    }
 
-	/**
-	 * The column <code>SYS.SYSCONSTRAINTS.CONSTRAINTID</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> CONSTRAINTID = createField("CONSTRAINTID", org.jooq.impl.SQLDataType.CHAR, SYSCONSTRAINTS);
+    /**
+     * The column <code>SYS.SYSCONSTRAINTS.CONSTRAINTID</code>.
+     */
+    public static final TableField<Record, String> CONSTRAINTID = createField(DSL.name("CONSTRAINTID"), org.jooq.impl.SQLDataType.CHAR(36).nullable(false), SYSCONSTRAINTS, "");
 
-	/**
-	 * The column <code>SYS.SYSCONSTRAINTS.TABLEID</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> TABLEID = createField("TABLEID", org.jooq.impl.SQLDataType.CHAR, SYSCONSTRAINTS);
+    /**
+     * The column <code>SYS.SYSCONSTRAINTS.TABLEID</code>.
+     */
+    public static final TableField<Record, String> TABLEID = createField(DSL.name("TABLEID"), org.jooq.impl.SQLDataType.CHAR(36).nullable(false), SYSCONSTRAINTS, "");
 
-	/**
-	 * The column <code>SYS.SYSCONSTRAINTS.CONSTRAINTNAME</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> CONSTRAINTNAME = createField("CONSTRAINTNAME", org.jooq.impl.SQLDataType.VARCHAR, SYSCONSTRAINTS);
+    /**
+     * The column <code>SYS.SYSCONSTRAINTS.CONSTRAINTNAME</code>.
+     */
+    public static final TableField<Record, String> CONSTRAINTNAME = createField(DSL.name("CONSTRAINTNAME"), org.jooq.impl.SQLDataType.VARCHAR(128).nullable(false), SYSCONSTRAINTS, "");
 
-	/**
-	 * The column <code>SYS.SYSCONSTRAINTS.TYPE</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> TYPE = createField("TYPE", org.jooq.impl.SQLDataType.CHAR, SYSCONSTRAINTS);
+    /**
+     * The column <code>SYS.SYSCONSTRAINTS.TYPE</code>.
+     */
+    public static final TableField<Record, String> TYPE = createField(DSL.name("TYPE"), org.jooq.impl.SQLDataType.CHAR(1).nullable(false), SYSCONSTRAINTS, "");
 
-	/**
-	 * The column <code>SYS.SYSCONSTRAINTS.SCHEMAID</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> SCHEMAID = createField("SCHEMAID", org.jooq.impl.SQLDataType.CHAR, SYSCONSTRAINTS);
+    /**
+     * The column <code>SYS.SYSCONSTRAINTS.SCHEMAID</code>.
+     */
+    public static final TableField<Record, String> SCHEMAID = createField(DSL.name("SCHEMAID"), org.jooq.impl.SQLDataType.CHAR(36).nullable(false), SYSCONSTRAINTS, "");
 
-	/**
-	 * The column <code>SYS.SYSCONSTRAINTS.STATE</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> STATE = createField("STATE", org.jooq.impl.SQLDataType.CHAR, SYSCONSTRAINTS);
+    /**
+     * The column <code>SYS.SYSCONSTRAINTS.STATE</code>.
+     */
+    public static final TableField<Record, String> STATE = createField(DSL.name("STATE"), org.jooq.impl.SQLDataType.CHAR(1).nullable(false), SYSCONSTRAINTS, "");
 
-	/**
-	 * The column <code>SYS.SYSCONSTRAINTS.REFERENCECOUNT</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.Integer> REFERENCECOUNT = createField("REFERENCECOUNT", org.jooq.impl.SQLDataType.INTEGER, SYSCONSTRAINTS);
+    /**
+     * The column <code>SYS.SYSCONSTRAINTS.REFERENCECOUNT</code>.
+     */
+    public static final TableField<Record, Integer> REFERENCECOUNT = createField(DSL.name("REFERENCECOUNT"), org.jooq.impl.SQLDataType.INTEGER.nullable(false), SYSCONSTRAINTS, "");
 
-	/**
-	 * No further instances allowed
-	 */
-	private Sysconstraints() {
-		super("SYSCONSTRAINTS", org.jooq.meta.derby.sys.Sys.SYS);
-	}
+    /**
+     * No further instances allowed
+     */
+    private Sysconstraints() {
+        this(DSL.name("SYSCONSTRAINTS"), null);
+    }
+
+    private Sysconstraints(Name alias, Table<Record> aliased) {
+        this(alias, aliased, null);
+    }
+
+    private Sysconstraints(Name alias, Table<Record> aliased, Field<?>[] parameters) {
+        super(alias, null, aliased, parameters, DSL.comment(""));
+    }
+
+    public <O extends Record> Sysconstraints(Table<O> child, ForeignKey<O, Record> key) {
+        super(child, key, SYSCONSTRAINTS);
+    }
+
+    @Override
+    public Schema getSchema() {
+        return Sys.SYS;
+    }
 }
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 a025f2d2a3..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
@@ -1,43 +1,73 @@
-/**
- * This class is generated by jOOQ
+/*
+ * This file is generated by jOOQ.
  */
 package org.jooq.meta.derby.sys.tables;
 
+
+import org.jooq.Field;
+import org.jooq.ForeignKey;
+import org.jooq.Name;
+import org.jooq.Record;
+import org.jooq.Schema;
+import org.jooq.Table;
+import org.jooq.TableField;
+import org.jooq.impl.DSL;
+import org.jooq.impl.TableImpl;
+import org.jooq.meta.derby.sys.Sys;
+
+
 /**
  * This class is generated by jOOQ.
  */
-@java.lang.SuppressWarnings("all")
-public class Syskeys extends org.jooq.impl.TableImpl<org.jooq.Record> {
+@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+public class Syskeys extends TableImpl<Record> {
 
-	private static final long serialVersionUID = 761298961;
+    private static final long serialVersionUID = 1636373174;
 
-	/**
-	 * The singleton instance of <code>SYS.SYSKEYS</code>
-	 */
-	public static final org.jooq.meta.derby.sys.tables.Syskeys SYSKEYS = new org.jooq.meta.derby.sys.tables.Syskeys();
+    /**
+     * The reference instance of <code>SYS.SYSKEYS</code>
+     */
+    public static final Syskeys SYSKEYS = new Syskeys();
 
-	/**
-	 * The class holding records for this type
-	 */
-	@Override
-	public java.lang.Class<org.jooq.Record> getRecordType() {
-		return org.jooq.Record.class;
-	}
+    /**
+     * The class holding records for this type
+     */
+    @Override
+    public Class<Record> getRecordType() {
+        return Record.class;
+    }
 
-	/**
-	 * The column <code>SYS.SYSKEYS.CONSTRAINTID</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> CONSTRAINTID = createField("CONSTRAINTID", org.jooq.impl.SQLDataType.CHAR, SYSKEYS);
+    /**
+     * The column <code>SYS.SYSKEYS.CONSTRAINTID</code>.
+     */
+    public static final TableField<Record, String> CONSTRAINTID = createField(DSL.name("CONSTRAINTID"), org.jooq.impl.SQLDataType.CHAR(36).nullable(false), SYSKEYS, "");
 
-	/**
-	 * The column <code>SYS.SYSKEYS.CONGLOMERATEID</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> CONGLOMERATEID = createField("CONGLOMERATEID", org.jooq.impl.SQLDataType.CHAR, SYSKEYS);
+    /**
+     * The column <code>SYS.SYSKEYS.CONGLOMERATEID</code>.
+     */
+    public static final TableField<Record, String> CONGLOMERATEID = createField(DSL.name("CONGLOMERATEID"), org.jooq.impl.SQLDataType.CHAR(36).nullable(false), SYSKEYS, "");
 
-	/**
-	 * No further instances allowed
-	 */
-	private Syskeys() {
-		super("SYSKEYS", org.jooq.meta.derby.sys.Sys.SYS);
-	}
+    /**
+     * No further instances allowed
+     */
+    private Syskeys() {
+        this(DSL.name("SYSKEYS"), null);
+    }
+
+    private Syskeys(Name alias, Table<Record> aliased) {
+        this(alias, aliased, null);
+    }
+
+    private Syskeys(Name alias, Table<Record> aliased, Field<?>[] parameters) {
+        super(alias, null, aliased, parameters, DSL.comment(""));
+    }
+
+    public <O extends Record> Syskeys(Table<O> child, ForeignKey<O, Record> key) {
+        super(child, key, SYSKEYS);
+    }
+
+    @Override
+    public Schema getSchema() {
+        return Sys.SYS;
+    }
 }
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 1d4f7a8bee..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
@@ -1,48 +1,78 @@
-/**
- * This class is generated by jOOQ
+/*
+ * This file is generated by jOOQ.
  */
 package org.jooq.meta.derby.sys.tables;
 
+
+import org.jooq.Field;
+import org.jooq.ForeignKey;
+import org.jooq.Name;
+import org.jooq.Record;
+import org.jooq.Schema;
+import org.jooq.Table;
+import org.jooq.TableField;
+import org.jooq.impl.DSL;
+import org.jooq.impl.TableImpl;
+import org.jooq.meta.derby.sys.Sys;
+
+
 /**
  * This class is generated by jOOQ.
  */
-@java.lang.SuppressWarnings("all")
-public class Sysschemas extends org.jooq.impl.TableImpl<org.jooq.Record> {
+@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+public class Sysschemas extends TableImpl<Record> {
 
-	private static final long serialVersionUID = 1872180098;
+    private static final long serialVersionUID = -1863062257;
 
-	/**
-	 * The singleton instance of <code>SYS.SYSSCHEMAS</code>
-	 */
-	public static final org.jooq.meta.derby.sys.tables.Sysschemas SYSSCHEMAS = new org.jooq.meta.derby.sys.tables.Sysschemas();
+    /**
+     * The reference instance of <code>SYS.SYSSCHEMAS</code>
+     */
+    public static final Sysschemas SYSSCHEMAS = new Sysschemas();
 
-	/**
-	 * The class holding records for this type
-	 */
-	@Override
-	public java.lang.Class<org.jooq.Record> getRecordType() {
-		return org.jooq.Record.class;
-	}
+    /**
+     * The class holding records for this type
+     */
+    @Override
+    public Class<Record> getRecordType() {
+        return Record.class;
+    }
 
-	/**
-	 * The column <code>SYS.SYSSCHEMAS.SCHEMAID</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> SCHEMAID = createField("SCHEMAID", org.jooq.impl.SQLDataType.CHAR, SYSSCHEMAS);
+    /**
+     * The column <code>SYS.SYSSCHEMAS.SCHEMAID</code>.
+     */
+    public static final TableField<Record, String> SCHEMAID = createField(DSL.name("SCHEMAID"), org.jooq.impl.SQLDataType.CHAR(36).nullable(false), SYSSCHEMAS, "");
 
-	/**
-	 * The column <code>SYS.SYSSCHEMAS.SCHEMANAME</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> SCHEMANAME = createField("SCHEMANAME", org.jooq.impl.SQLDataType.VARCHAR, SYSSCHEMAS);
+    /**
+     * The column <code>SYS.SYSSCHEMAS.SCHEMANAME</code>.
+     */
+    public static final TableField<Record, String> SCHEMANAME = createField(DSL.name("SCHEMANAME"), org.jooq.impl.SQLDataType.VARCHAR(128).nullable(false), SYSSCHEMAS, "");
 
-	/**
-	 * The column <code>SYS.SYSSCHEMAS.AUTHORIZATIONID</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> AUTHORIZATIONID = createField("AUTHORIZATIONID", org.jooq.impl.SQLDataType.VARCHAR, SYSSCHEMAS);
+    /**
+     * The column <code>SYS.SYSSCHEMAS.AUTHORIZATIONID</code>.
+     */
+    public static final TableField<Record, String> AUTHORIZATIONID = createField(DSL.name("AUTHORIZATIONID"), org.jooq.impl.SQLDataType.VARCHAR(128).nullable(false), SYSSCHEMAS, "");
 
-	/**
-	 * No further instances allowed
-	 */
-	private Sysschemas() {
-		super("SYSSCHEMAS", org.jooq.meta.derby.sys.Sys.SYS);
-	}
+    /**
+     * No further instances allowed
+     */
+    private Sysschemas() {
+        this(DSL.name("SYSSCHEMAS"), null);
+    }
+
+    private Sysschemas(Name alias, Table<Record> aliased) {
+        this(alias, aliased, null);
+    }
+
+    private Sysschemas(Name alias, Table<Record> aliased, Field<?>[] parameters) {
+        super(alias, null, aliased, parameters, DSL.comment(""));
+    }
+
+    public <O extends Record> Sysschemas(Table<O> child, ForeignKey<O, Record> key) {
+        super(child, key, SYSSCHEMAS);
+    }
+
+    @Override
+    public Schema getSchema() {
+        return Sys.SYS;
+    }
 }
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 d3ce780294..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
@@ -1,83 +1,113 @@
-/**
- * This class is generated by jOOQ
+/*
+ * This file is generated by jOOQ.
  */
 package org.jooq.meta.derby.sys.tables;
 
+
+import org.jooq.Field;
+import org.jooq.ForeignKey;
+import org.jooq.Name;
+import org.jooq.Record;
+import org.jooq.Schema;
+import org.jooq.Table;
+import org.jooq.TableField;
+import org.jooq.impl.DSL;
+import org.jooq.impl.TableImpl;
+import org.jooq.meta.derby.sys.Sys;
+
+
 /**
  * This class is generated by jOOQ.
  */
-@java.lang.SuppressWarnings("all")
-public class Syssequences extends org.jooq.impl.TableImpl<org.jooq.Record> {
+@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+public class Syssequences extends TableImpl<Record> {
 
-	private static final long serialVersionUID = 1195022971;
+    private static final long serialVersionUID = 547821189;
 
-	/**
-	 * The singleton instance of <code>SYS.SYSSEQUENCES</code>
-	 */
-	public static final org.jooq.meta.derby.sys.tables.Syssequences SYSSEQUENCES = new org.jooq.meta.derby.sys.tables.Syssequences();
+    /**
+     * The reference instance of <code>SYS.SYSSEQUENCES</code>
+     */
+    public static final Syssequences SYSSEQUENCES = new Syssequences();
 
-	/**
-	 * The class holding records for this type
-	 */
-	@Override
-	public java.lang.Class<org.jooq.Record> getRecordType() {
-		return org.jooq.Record.class;
-	}
+    /**
+     * The class holding records for this type
+     */
+    @Override
+    public Class<Record> getRecordType() {
+        return Record.class;
+    }
 
-	/**
-	 * The column <code>SYS.SYSSEQUENCES.SEQUENCEID</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> SEQUENCEID = createField("SEQUENCEID", org.jooq.impl.SQLDataType.CHAR, SYSSEQUENCES);
+    /**
+     * The column <code>SYS.SYSSEQUENCES.SEQUENCEID</code>.
+     */
+    public static final TableField<Record, String> SEQUENCEID = createField(DSL.name("SEQUENCEID"), org.jooq.impl.SQLDataType.CHAR(36).nullable(false), SYSSEQUENCES, "");
 
-	/**
-	 * The column <code>SYS.SYSSEQUENCES.SEQUENCENAME</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> SEQUENCENAME = createField("SEQUENCENAME", org.jooq.impl.SQLDataType.VARCHAR, SYSSEQUENCES);
+    /**
+     * The column <code>SYS.SYSSEQUENCES.SEQUENCENAME</code>.
+     */
+    public static final TableField<Record, String> SEQUENCENAME = createField(DSL.name("SEQUENCENAME"), org.jooq.impl.SQLDataType.VARCHAR(128).nullable(false), SYSSEQUENCES, "");
 
-	/**
-	 * The column <code>SYS.SYSSEQUENCES.SCHEMAID</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> SCHEMAID = createField("SCHEMAID", org.jooq.impl.SQLDataType.CHAR, SYSSEQUENCES);
+    /**
+     * The column <code>SYS.SYSSEQUENCES.SCHEMAID</code>.
+     */
+    public static final TableField<Record, String> SCHEMAID = createField(DSL.name("SCHEMAID"), org.jooq.impl.SQLDataType.CHAR(36).nullable(false), SYSSEQUENCES, "");
 
-	/**
-	 * The column <code>SYS.SYSSEQUENCES.SEQUENCEDATATYPE</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> SEQUENCEDATATYPE = createField("SEQUENCEDATATYPE", org.jooq.impl.SQLDataType.CLOB, SYSSEQUENCES);
+    /**
+     * The column <code>SYS.SYSSEQUENCES.SEQUENCEDATATYPE</code>.
+     */
+    public static final TableField<Record, String> SEQUENCEDATATYPE = createField(DSL.name("SEQUENCEDATATYPE"), org.jooq.impl.SQLDataType.CLOB.nullable(false), SYSSEQUENCES, "");
 
-	/**
-	 * The column <code>SYS.SYSSEQUENCES.CURRENTVALUE</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.Long> CURRENTVALUE = createField("CURRENTVALUE", org.jooq.impl.SQLDataType.BIGINT, SYSSEQUENCES);
+    /**
+     * The column <code>SYS.SYSSEQUENCES.CURRENTVALUE</code>.
+     */
+    public static final TableField<Record, Long> CURRENTVALUE = createField(DSL.name("CURRENTVALUE"), org.jooq.impl.SQLDataType.BIGINT, SYSSEQUENCES, "");
 
-	/**
-	 * The column <code>SYS.SYSSEQUENCES.STARTVALUE</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.Long> STARTVALUE = createField("STARTVALUE", org.jooq.impl.SQLDataType.BIGINT, SYSSEQUENCES);
+    /**
+     * The column <code>SYS.SYSSEQUENCES.STARTVALUE</code>.
+     */
+    public static final TableField<Record, Long> STARTVALUE = createField(DSL.name("STARTVALUE"), org.jooq.impl.SQLDataType.BIGINT.nullable(false), SYSSEQUENCES, "");
 
-	/**
-	 * The column <code>SYS.SYSSEQUENCES.MINIMUMVALUE</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.Long> MINIMUMVALUE = createField("MINIMUMVALUE", org.jooq.impl.SQLDataType.BIGINT, SYSSEQUENCES);
+    /**
+     * The column <code>SYS.SYSSEQUENCES.MINIMUMVALUE</code>.
+     */
+    public static final TableField<Record, Long> MINIMUMVALUE = createField(DSL.name("MINIMUMVALUE"), org.jooq.impl.SQLDataType.BIGINT.nullable(false), SYSSEQUENCES, "");
 
-	/**
-	 * The column <code>SYS.SYSSEQUENCES.MAXIMUMVALUE</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.Long> MAXIMUMVALUE = createField("MAXIMUMVALUE", org.jooq.impl.SQLDataType.BIGINT, SYSSEQUENCES);
+    /**
+     * The column <code>SYS.SYSSEQUENCES.MAXIMUMVALUE</code>.
+     */
+    public static final TableField<Record, Long> MAXIMUMVALUE = createField(DSL.name("MAXIMUMVALUE"), org.jooq.impl.SQLDataType.BIGINT.nullable(false), SYSSEQUENCES, "");
 
-	/**
-	 * The column <code>SYS.SYSSEQUENCES.INCREMENT</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.Long> INCREMENT = createField("INCREMENT", org.jooq.impl.SQLDataType.BIGINT, SYSSEQUENCES);
+    /**
+     * The column <code>SYS.SYSSEQUENCES.INCREMENT</code>.
+     */
+    public static final TableField<Record, Long> INCREMENT = createField(DSL.name("INCREMENT"), org.jooq.impl.SQLDataType.BIGINT.nullable(false), SYSSEQUENCES, "");
 
-	/**
-	 * The column <code>SYS.SYSSEQUENCES.CYCLEOPTION</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> CYCLEOPTION = createField("CYCLEOPTION", org.jooq.impl.SQLDataType.CHAR, SYSSEQUENCES);
+    /**
+     * The column <code>SYS.SYSSEQUENCES.CYCLEOPTION</code>.
+     */
+    public static final TableField<Record, String> CYCLEOPTION = createField(DSL.name("CYCLEOPTION"), org.jooq.impl.SQLDataType.CHAR(1).nullable(false), SYSSEQUENCES, "");
 
-	/**
-	 * No further instances allowed
-	 */
-	private Syssequences() {
-		super("SYSSEQUENCES", org.jooq.meta.derby.sys.Sys.SYS);
-	}
+    /**
+     * No further instances allowed
+     */
+    private Syssequences() {
+        this(DSL.name("SYSSEQUENCES"), null);
+    }
+
+    private Syssequences(Name alias, Table<Record> aliased) {
+        this(alias, aliased, null);
+    }
+
+    private Syssequences(Name alias, Table<Record> aliased, Field<?>[] parameters) {
+        super(alias, null, aliased, parameters, DSL.comment(""));
+    }
+
+    public <O extends Record> Syssequences(Table<O> child, ForeignKey<O, Record> key) {
+        super(child, key, SYSSEQUENCES);
+    }
+
+    @Override
+    public Schema getSchema() {
+        return Sys.SYS;
+    }
 }
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 33acb51bdb..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
@@ -1,58 +1,88 @@
-/**
- * This class is generated by jOOQ
+/*
+ * This file is generated by jOOQ.
  */
 package org.jooq.meta.derby.sys.tables;
 
+
+import org.jooq.Field;
+import org.jooq.ForeignKey;
+import org.jooq.Name;
+import org.jooq.Record;
+import org.jooq.Schema;
+import org.jooq.Table;
+import org.jooq.TableField;
+import org.jooq.impl.DSL;
+import org.jooq.impl.TableImpl;
+import org.jooq.meta.derby.sys.Sys;
+
+
 /**
  * This class is generated by jOOQ.
  */
-@java.lang.SuppressWarnings("all")
-public class Systables extends org.jooq.impl.TableImpl<org.jooq.Record> {
+@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+public class Systables extends TableImpl<Record> {
 
-	private static final long serialVersionUID = -675426733;
+    private static final long serialVersionUID = 200239054;
 
-	/**
-	 * The singleton instance of <code>SYS.SYSTABLES</code>
-	 */
-	public static final org.jooq.meta.derby.sys.tables.Systables SYSTABLES = new org.jooq.meta.derby.sys.tables.Systables();
+    /**
+     * The reference instance of <code>SYS.SYSTABLES</code>
+     */
+    public static final Systables SYSTABLES = new Systables();
 
-	/**
-	 * The class holding records for this type
-	 */
-	@Override
-	public java.lang.Class<org.jooq.Record> getRecordType() {
-		return org.jooq.Record.class;
-	}
+    /**
+     * The class holding records for this type
+     */
+    @Override
+    public Class<Record> getRecordType() {
+        return Record.class;
+    }
 
-	/**
-	 * The column <code>SYS.SYSTABLES.TABLEID</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> TABLEID = createField("TABLEID", org.jooq.impl.SQLDataType.CHAR, SYSTABLES);
+    /**
+     * The column <code>SYS.SYSTABLES.TABLEID</code>.
+     */
+    public static final TableField<Record, String> TABLEID = createField(DSL.name("TABLEID"), org.jooq.impl.SQLDataType.CHAR(36).nullable(false), SYSTABLES, "");
 
-	/**
-	 * The column <code>SYS.SYSTABLES.TABLENAME</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> TABLENAME = createField("TABLENAME", org.jooq.impl.SQLDataType.VARCHAR, SYSTABLES);
+    /**
+     * The column <code>SYS.SYSTABLES.TABLENAME</code>.
+     */
+    public static final TableField<Record, String> TABLENAME = createField(DSL.name("TABLENAME"), org.jooq.impl.SQLDataType.VARCHAR(128).nullable(false), SYSTABLES, "");
 
-	/**
-	 * The column <code>SYS.SYSTABLES.TABLETYPE</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> TABLETYPE = createField("TABLETYPE", org.jooq.impl.SQLDataType.CHAR, SYSTABLES);
+    /**
+     * The column <code>SYS.SYSTABLES.TABLETYPE</code>.
+     */
+    public static final TableField<Record, String> TABLETYPE = createField(DSL.name("TABLETYPE"), org.jooq.impl.SQLDataType.CHAR(1).nullable(false), SYSTABLES, "");
 
-	/**
-	 * The column <code>SYS.SYSTABLES.SCHEMAID</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> SCHEMAID = createField("SCHEMAID", org.jooq.impl.SQLDataType.CHAR, SYSTABLES);
+    /**
+     * The column <code>SYS.SYSTABLES.SCHEMAID</code>.
+     */
+    public static final TableField<Record, String> SCHEMAID = createField(DSL.name("SCHEMAID"), org.jooq.impl.SQLDataType.CHAR(36).nullable(false), SYSTABLES, "");
 
-	/**
-	 * The column <code>SYS.SYSTABLES.LOCKGRANULARITY</code>.
-	 */
-	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> LOCKGRANULARITY = createField("LOCKGRANULARITY", org.jooq.impl.SQLDataType.CHAR, SYSTABLES);
+    /**
+     * The column <code>SYS.SYSTABLES.LOCKGRANULARITY</code>.
+     */
+    public static final TableField<Record, String> LOCKGRANULARITY = createField(DSL.name("LOCKGRANULARITY"), org.jooq.impl.SQLDataType.CHAR(1).nullable(false), SYSTABLES, "");
 
-	/**
-	 * No further instances allowed
-	 */
-	private Systables() {
-		super("SYSTABLES", org.jooq.meta.derby.sys.Sys.SYS);
-	}
+    /**
+     * No further instances allowed
+     */
+    private Systables() {
+        this(DSL.name("SYSTABLES"), null);
+    }
+
+    private Systables(Name alias, Table<Record> aliased) {
+        this(alias, aliased, null);
+    }
+
+    private Systables(Name alias, Table<Record> aliased, Field<?>[] parameters) {
+        super(alias, null, aliased, parameters, DSL.comment(""));
+    }
+
+    public <O extends Record> Systables(Table<O> child, ForeignKey<O, Record> key) {
+        super(child, key, SYSTABLES);
+    }
+
+    @Override
+    public Schema getSchema() {
+        return Sys.SYS;
+    }
 }
diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/hsqldb/HSQLDBDatabase.java b/jOOQ-meta/src/main/java/org/jooq/meta/hsqldb/HSQLDBDatabase.java
index 1a22e57bfa..c0622162c7 100644
--- a/jOOQ-meta/src/main/java/org/jooq/meta/hsqldb/HSQLDBDatabase.java
+++ b/jOOQ-meta/src/main/java/org/jooq/meta/hsqldb/HSQLDBDatabase.java
@@ -39,10 +39,13 @@
 package org.jooq.meta.hsqldb;
 
 import static org.jooq.impl.DSL.field;
+import static org.jooq.impl.DSL.inline;
 import static org.jooq.impl.DSL.name;
 import static org.jooq.impl.DSL.noCondition;
 import static org.jooq.impl.DSL.nvl;
+import static org.jooq.impl.DSL.select;
 import static org.jooq.meta.hsqldb.information_schema.Tables.CHECK_CONSTRAINTS;
+import static org.jooq.meta.hsqldb.information_schema.Tables.COLUMNS;
 import static org.jooq.meta.hsqldb.information_schema.Tables.ELEMENT_TYPES;
 import static org.jooq.meta.hsqldb.information_schema.Tables.KEY_COLUMN_USAGE;
 import static org.jooq.meta.hsqldb.information_schema.Tables.REFERENTIAL_CONSTRAINTS;
@@ -88,6 +91,7 @@ import org.jooq.meta.SequenceDefinition;
 import org.jooq.meta.TableDefinition;
 import org.jooq.meta.UDTDefinition;
 import org.jooq.meta.hsqldb.information_schema.tables.CheckConstraints;
+import org.jooq.meta.hsqldb.information_schema.tables.Columns;
 import org.jooq.meta.hsqldb.information_schema.tables.TableConstraints;
 import org.jooq.tools.JooqLogger;
 
@@ -286,6 +290,7 @@ public class HSQLDBDatabase extends AbstractDatabase {
     protected void loadCheckConstraints(DefaultRelations relations) throws SQLException {
         TableConstraints tc = TABLE_CONSTRAINTS.as("tc");
         CheckConstraints cc = CHECK_CONSTRAINTS.as("cc");
+        Columns c = COLUMNS.as("c");
 
         // [#2808] [#3019] Workaround for bad handling of JOIN .. USING
         Field<String> constraintName = field(name(cc.CONSTRAINT_NAME.getName()), String.class);
@@ -303,8 +308,18 @@ public class HSQLDBDatabase extends AbstractDatabase {
                 .where(tc.TABLE_SCHEMA.in(getInputSchemata()))
                 .and(getIncludeSystemCheckConstraints()
                     ? noCondition()
-                    : tc.CONSTRAINT_NAME.notLike("SYS!_CT!_%", '!'))
-                .fetch()) {
+                    : tc.CONSTRAINT_NAME.notLike("SYS!_CT!_%", '!')
+                        .or(cc.CHECK_CLAUSE.notIn(
+
+                            // TODO: Should we ever quote these?
+                            select(c.TABLE_SCHEMA.concat(inline('.'))
+                                    .concat(c.TABLE_NAME).concat(inline('.'))
+                                    .concat(c.COLUMN_NAME).concat(inline(" IS NOT NULL")))
+                            .from(c)
+                            .where(c.TABLE_SCHEMA.eq(tc.TABLE_SCHEMA))
+                            .and(c.TABLE_NAME.eq(tc.TABLE_NAME))
+                        )))
+        ) {
 
             SchemaDefinition schema = getSchema(record.get(tc.TABLE_SCHEMA));
             TableDefinition table = getTable(schema, record.get(tc.TABLE_NAME));
diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/PostgresDatabase.java b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/PostgresDatabase.java
index 74f78cf6fd..7cf1e66c48 100644
--- a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/PostgresDatabase.java
+++ b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/PostgresDatabase.java
@@ -39,6 +39,7 @@
 package org.jooq.meta.postgres;
 
 import static org.jooq.impl.DSL.array;
+import static org.jooq.impl.DSL.cast;
 import static org.jooq.impl.DSL.condition;
 import static org.jooq.impl.DSL.count;
 import static org.jooq.impl.DSL.decode;
@@ -574,7 +575,7 @@ public class PostgresDatabase extends AbstractDatabase {
                     SEQUENCES.INCREMENT.cast(BIGINT).as(SEQUENCES.INCREMENT),
                     SEQUENCES.MINIMUM_VALUE.cast(BIGINT).as(SEQUENCES.MINIMUM_VALUE),
                     nullif(SEQUENCES.MAXIMUM_VALUE.cast(NUMERIC),
-                        power(inline(2, NUMERIC), SEQUENCES.NUMERIC_PRECISION.minus(1)).minus(1)).as(SEQUENCES.MAXIMUM_VALUE),
+                        power(cast(inline(2), NUMERIC), cast(SEQUENCES.NUMERIC_PRECISION.minus(1), NUMERIC)).minus(1)).as(SEQUENCES.MAXIMUM_VALUE),
                     SEQUENCES.CYCLE_OPTION.cast(BOOLEAN).as(SEQUENCES.CYCLE_OPTION))
                 .from(SEQUENCES)
                 .where(SEQUENCES.SEQUENCE_SCHEMA.in(getInputSchemata()))