diff --git a/jOOQ-codegen/src/main/java/org/jooq/util/DefaultGenerator.java b/jOOQ-codegen/src/main/java/org/jooq/util/DefaultGenerator.java
index 96dd330775..33b11d5352 100644
--- a/jOOQ-codegen/src/main/java/org/jooq/util/DefaultGenerator.java
+++ b/jOOQ-codegen/src/main/java/org/jooq/util/DefaultGenerator.java
@@ -282,6 +282,7 @@ public class DefaultGenerator implements Generator {
         // ----------------------------------------------------------------------
         // XXX Generating schemas
         // ----------------------------------------------------------------------
+		log.info("Generating schemata", "Total: " + database.getSchemata().size());
 		for (SchemaDefinition schema : database.getSchemata()) {
 		    generate(database, schema, watch);
 		}
@@ -1755,7 +1756,7 @@ public class DefaultGenerator implements Generator {
     }
 
     private void printColumnValidationAnnotation(GenerationWriter out, ColumnDefinition column) {
-        if (generateJPAAnnotations()) {
+        if (generateValidationAnnotations()) {
             DataTypeDefinition type = column.getType();
 
             boolean newline = true;
diff --git a/jOOQ-codegen/src/main/java/org/jooq/util/GenerationTool.java b/jOOQ-codegen/src/main/java/org/jooq/util/GenerationTool.java
index eb1ba5d142..d37664ce7b 100644
--- a/jOOQ-codegen/src/main/java/org/jooq/util/GenerationTool.java
+++ b/jOOQ-codegen/src/main/java/org/jooq/util/GenerationTool.java
@@ -117,8 +117,8 @@ public class GenerationTool {
 
     		    // TODO [#1201] Add better error handling here
     		    xml = xml.replaceAll(
-    		        "<configuration xmlns=\"http://www.jooq.org/xsd/jooq-codegen-\\d+\\.\\d+\\.\\d+.xsd\">",
-    		        "<configuration xmlns=\"http://www.jooq.org/xsd/jooq-codegen-2.3.0.xsd\">");
+    		        "<(\\w+:)?configuration xmlns(:\\w+)?=\"http://www.jooq.org/xsd/jooq-codegen-\\d+\\.\\d+\\.\\d+.xsd\">",
+    		        "<$1configuration xmlns$2=\"http://www.jooq.org/xsd/jooq-codegen-2.3.0.xsd\">");
 
     		    xml = xml.replace(
     		        "<configuration>",
@@ -323,7 +323,10 @@ public class GenerationTool {
 
             for (Schema schema : schemata) {
                 if (StringUtils.isBlank(schema.getInputSchema())) {
-                    log.warn("WARNING: The configuration property jdbc.Schema is deprecated and will be removed in the future. Use /configuration/generator/database/inputSchema instead");
+                    if (!StringUtils.isBlank(j.getSchema())) {
+                        log.warn("WARNING: The configuration property jdbc.Schema is deprecated and will be removed in the future. Use /configuration/generator/database/inputSchema instead");
+                    }
+
                     schema.setInputSchema(trim(j.getSchema()));
                 }
 
@@ -332,6 +335,12 @@ public class GenerationTool {
                 }
             }
 
+            if (schemata.size() == 1) {
+                if (StringUtils.isBlank(schemata.get(0).getInputSchema())) {
+                    log.info("No <inputSchema/> was provided. Generating ALL available schemata instead!");
+                }
+            }
+
             database.setConnection(connection);
             database.setConfiguredSchemata(schemata);
             database.setIncludes(defaultString(g.getDatabase().getIncludes()).split(","));
@@ -374,6 +383,8 @@ public class GenerationTool {
                 generator.setGenerateRecords(g.getGenerate().isRecords());
             if (g.getGenerate().isJpaAnnotations() != null)
                 generator.setGenerateJPAAnnotations(g.getGenerate().isJpaAnnotations());
+            if (g.getGenerate().isValidationAnnotations() != null)
+                generator.setGenerateValidationAnnotations(g.getGenerate().isValidationAnnotations());
 
             // Generator properties that should in fact be strategy properties
             strategy.setInstanceFields(generator.generateInstanceFields());
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/AbstractDatabase.java b/jOOQ-meta/src/main/java/org/jooq/util/AbstractDatabase.java
index ebf9a97f1f..6b530f40e8 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/AbstractDatabase.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/AbstractDatabase.java
@@ -42,11 +42,13 @@ import java.math.BigInteger;
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 
 import org.jooq.SQLDialect;
 import org.jooq.impl.SQLDataType;
 import org.jooq.tools.JooqLogger;
+import org.jooq.tools.StringUtils;
 import org.jooq.tools.csv.CSVReader;
 import org.jooq.util.jaxb.CustomType;
 import org.jooq.util.jaxb.EnumType;
@@ -82,6 +84,7 @@ public abstract class AbstractDatabase implements Database {
     // Loaded definitions
     // -------------------------------------------------------------------------
 
+    private List<String>                    inputSchemata;
     private List<SchemaDefinition>          schemata;
     private List<SequenceDefinition>        sequences;
     private List<TableDefinition>           tables;
@@ -115,8 +118,18 @@ public abstract class AbstractDatabase implements Database {
         if (schemata == null) {
             schemata = new ArrayList<SchemaDefinition>();
 
-            for (String name : getInputSchemata()) {
-                schemata.add(new SchemaDefinition(this, name, null));
+            try {
+                schemata = getSchemata0();
+            }
+            catch (SQLException e) {
+                log.error("Could not load schemata", e);
+            }
+
+            Iterator<SchemaDefinition> it = schemata.iterator();
+            while (it.hasNext()) {
+                if (!getInputSchemata().contains(it.next().getName())) {
+                    it.remove();
+                }
             }
         }
 
@@ -136,13 +149,29 @@ public abstract class AbstractDatabase implements Database {
 
     @Override
     public final List<String> getInputSchemata() {
-        List<String> result = new ArrayList<String>();
+        if (inputSchemata == null) {
+            inputSchemata = new ArrayList<String>();
 
-        for (Schema schema : configuredSchemata) {
-            result.add(schema.getInputSchema());
+            // [#1312] Allow for ommitting inputSchema configuration. Generate
+            // All schemata instead
+            if (configuredSchemata.size() == 1 && StringUtils.isBlank(configuredSchemata.get(0).getInputSchema())) {
+                try {
+                    for (SchemaDefinition schema : getSchemata0()) {
+                        inputSchemata.add(schema.getName());
+                    }
+                }
+                catch (SQLException e) {
+                    log.error("Could not load schemata", e);
+                }
+            }
+            else {
+                for (Schema schema : configuredSchemata) {
+                    inputSchemata.add(schema.getInputSchema());
+                }
+            }
         }
 
-        return result;
+        return inputSchemata;
     }
 
     @Override
@@ -626,6 +655,12 @@ public abstract class AbstractDatabase implements Database {
      */
     protected abstract void loadForeignKeys(DefaultRelations r) throws SQLException;
 
+    /**
+     * Retrieve ALL schemata from the database. This will be filtered in
+     * {@link #getSchemata()}
+     */
+    protected abstract List<SchemaDefinition> getSchemata0() throws SQLException;
+
     /**
      * Retrieve ALL sequences from the database. This will be filtered in
      * {@link #getTables(SchemaDefinition)}
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/ase/ASEDatabase.java b/jOOQ-meta/src/main/java/org/jooq/util/ase/ASEDatabase.java
index aa2f675b35..5efc56ae59 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/ase/ASEDatabase.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/ase/ASEDatabase.java
@@ -40,6 +40,7 @@ import static org.jooq.impl.Factory.concat;
 import static org.jooq.impl.Factory.field;
 import static org.jooq.impl.Factory.val;
 import static org.jooq.util.ase.sys.tables.Sysindexes.SYSINDEXES;
+import static org.jooq.util.ase.sys.tables.Sysusers.SYSUSERS;
 
 import java.sql.SQLException;
 import java.util.ArrayList;
@@ -63,6 +64,7 @@ import org.jooq.util.UDTDefinition;
 import org.jooq.util.ase.sys.DboFactory;
 import org.jooq.util.ase.sys.tables.Sysindexes;
 import org.jooq.util.ase.sys.tables.Sysreferences;
+import org.jooq.util.ase.sys.tables.Sysusers;
 
 /**
  * Sybase Adaptive Server implementation of {@link AbstractDatabase}
@@ -211,6 +213,21 @@ public class ASEDatabase extends AbstractDatabase {
         }
     }
 
+    @Override
+    protected List<SchemaDefinition> getSchemata0() throws SQLException {
+        List<SchemaDefinition> result = new ArrayList<SchemaDefinition>();
+
+        for (String name : create()
+                .select(Sysusers.NAME)
+                .from(SYSUSERS)
+                .fetch(Sysusers.NAME)) {
+
+            result.add(new SchemaDefinition(this, name, ""));
+        }
+
+        return result;
+    }
+
     @Override
     protected List<SequenceDefinition> getSequences0() throws SQLException {
         List<SequenceDefinition> result = new ArrayList<SequenceDefinition>();
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/ase/sys/Dbo.java b/jOOQ-meta/src/main/java/org/jooq/util/ase/sys/Dbo.java
index cc167ce487..660cebe1fb 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/ase/sys/Dbo.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/ase/sys/Dbo.java
@@ -6,11 +6,11 @@ package org.jooq.util.ase.sys;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class Dbo extends org.jooq.impl.SchemaImpl {
 
-	private static final long serialVersionUID = 1383637504;
+	private static final long serialVersionUID = -2008777836;
 
 	/**
 	 * The singleton instance of dbo
@@ -29,6 +29,7 @@ public class Dbo extends org.jooq.impl.SchemaImpl {
 		return java.util.Arrays.<org.jooq.Table<?>>asList(
 			org.jooq.util.ase.sys.tables.Sysindexes.SYSINDEXES,
 			org.jooq.util.ase.sys.tables.Sysobjects.SYSOBJECTS,
-			org.jooq.util.ase.sys.tables.Sysreferences.SYSREFERENCES);
+			org.jooq.util.ase.sys.tables.Sysreferences.SYSREFERENCES,
+			org.jooq.util.ase.sys.tables.Sysusers.SYSUSERS);
 	}
 }
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/ase/sys/DboFactory.java b/jOOQ-meta/src/main/java/org/jooq/util/ase/sys/DboFactory.java
index 8b6ff4dd89..1f9d95e1cc 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/ase/sys/DboFactory.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/ase/sys/DboFactory.java
@@ -6,11 +6,11 @@ package org.jooq.util.ase.sys;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class DboFactory extends org.jooq.util.ase.ASEFactory {
 
-	private static final long serialVersionUID = -1750129658;
+	private static final long serialVersionUID = 1180326851;
 
 	/**
 	 * Create a factory with a connection
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/ase/sys/Tables.java b/jOOQ-meta/src/main/java/org/jooq/util/ase/sys/Tables.java
index e0cbe06b4e..ff7b04ab22 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/ase/sys/Tables.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/ase/sys/Tables.java
@@ -8,7 +8,7 @@ package org.jooq.util.ase.sys;
  *
  * Convenience access to all tables in dbo
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public final class Tables {
 
@@ -27,6 +27,11 @@ public final class Tables {
 	 */
 	public static org.jooq.util.ase.sys.tables.Sysreferences SYSREFERENCES = org.jooq.util.ase.sys.tables.Sysreferences.SYSREFERENCES;
 
+	/**
+	 * The table dbo.sysusers
+	 */
+	public static org.jooq.util.ase.sys.tables.Sysusers SYSUSERS = org.jooq.util.ase.sys.tables.Sysusers.SYSUSERS;
+
 	/**
 	 * No instances
 	 */
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/ase/sys/tables/Sysindexes.java b/jOOQ-meta/src/main/java/org/jooq/util/ase/sys/tables/Sysindexes.java
index 0d7e0219fa..6a8e621ae4 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/ase/sys/tables/Sysindexes.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/ase/sys/tables/Sysindexes.java
@@ -6,11 +6,11 @@ package org.jooq.util.ase.sys.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class Sysindexes extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = 664930674;
+	private static final long serialVersionUID = -1728546129;
 
 	/**
 	 * The singleton instance of dbo.sysindexes
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/ase/sys/tables/Sysobjects.java b/jOOQ-meta/src/main/java/org/jooq/util/ase/sys/tables/Sysobjects.java
index 03803bdaa6..89b334a4b8 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/ase/sys/tables/Sysobjects.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/ase/sys/tables/Sysobjects.java
@@ -6,11 +6,11 @@ package org.jooq.util.ase.sys.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class Sysobjects extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = -1862765525;
+	private static final long serialVersionUID = 269485006;
 
 	/**
 	 * The singleton instance of dbo.sysobjects
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/ase/sys/tables/Sysreferences.java b/jOOQ-meta/src/main/java/org/jooq/util/ase/sys/tables/Sysreferences.java
index 068a733e7a..b314381787 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/ase/sys/tables/Sysreferences.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/ase/sys/tables/Sysreferences.java
@@ -6,11 +6,11 @@ package org.jooq.util.ase.sys.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class Sysreferences extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = -1354733426;
+	private static final long serialVersionUID = 1183364529;
 
 	/**
 	 * The singleton instance of dbo.sysreferences
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/ase/sys/tables/Sysusers.java b/jOOQ-meta/src/main/java/org/jooq/util/ase/sys/tables/Sysusers.java
new file mode 100644
index 0000000000..c272071522
--- /dev/null
+++ b/jOOQ-meta/src/main/java/org/jooq/util/ase/sys/tables/Sysusers.java
@@ -0,0 +1,64 @@
+/**
+ * This class is generated by jOOQ
+ */
+package org.jooq.util.ase.sys.tables;
+
+/**
+ * This class is generated by jOOQ.
+ */
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
+                            comments = "This class is generated by jOOQ")
+public class Sysusers extends org.jooq.impl.TableImpl<org.jooq.Record> {
+
+	private static final long serialVersionUID = 1948471539;
+
+	/**
+	 * The singleton instance of dbo.sysusers
+	 */
+	public static final org.jooq.util.ase.sys.tables.Sysusers SYSUSERS = new org.jooq.util.ase.sys.tables.Sysusers();
+
+	/**
+	 * The class holding records for this type
+	 */
+	private static final java.lang.Class<org.jooq.Record> __RECORD_TYPE = org.jooq.Record.class;
+
+	/**
+	 * The class holding records for this type
+	 */
+	@Override
+	public java.lang.Class<org.jooq.Record> getRecordType() {
+		return __RECORD_TYPE;
+	}
+
+	/**
+	 * An uncommented item
+	 */
+	public static final org.jooq.TableField<org.jooq.Record, java.lang.Integer> SUID = createField("suid", org.jooq.impl.SQLDataType.INTEGER, SYSUSERS);
+
+	/**
+	 * An uncommented item
+	 */
+	public static final org.jooq.TableField<org.jooq.Record, java.lang.Integer> UID = createField("uid", org.jooq.impl.SQLDataType.INTEGER, SYSUSERS);
+
+	/**
+	 * An uncommented item
+	 */
+	public static final org.jooq.TableField<org.jooq.Record, java.lang.Integer> GID = createField("gid", org.jooq.impl.SQLDataType.INTEGER, SYSUSERS);
+
+	/**
+	 * An uncommented item
+	 */
+	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> NAME = createField("name", org.jooq.impl.SQLDataType.VARCHAR, SYSUSERS);
+
+	/**
+	 * An uncommented item
+	 */
+	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> ENVIRON = createField("environ", org.jooq.impl.SQLDataType.VARCHAR, SYSUSERS);
+
+	/**
+	 * No further instances allowed
+	 */
+	private Sysusers() {
+		super("sysusers", org.jooq.util.ase.sys.Dbo.DBO);
+	}
+}
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/cubrid/CUBRIDDatabase.java b/jOOQ-meta/src/main/java/org/jooq/util/cubrid/CUBRIDDatabase.java
index 7ff72fde46..7828be07e9 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/cubrid/CUBRIDDatabase.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/cubrid/CUBRIDDatabase.java
@@ -43,6 +43,7 @@ import static org.jooq.util.cubrid.dba.Tables.DB_CLASS;
 import static org.jooq.util.cubrid.dba.Tables.DB_INDEX;
 import static org.jooq.util.cubrid.dba.Tables.DB_INDEX_KEY;
 import static org.jooq.util.cubrid.dba.Tables.DB_SERIAL;
+import static org.jooq.util.cubrid.dba.Tables.DB_USER;
 
 import java.math.BigInteger;
 import java.sql.DatabaseMetaData;
@@ -157,6 +158,21 @@ public class CUBRIDDatabase extends AbstractDatabase {
         }
     }
 
+    @Override
+    protected List<SchemaDefinition> getSchemata0() throws SQLException {
+        List<SchemaDefinition> result = new ArrayList<SchemaDefinition>();
+
+        for (String name : create()
+                .select(DB_USER.NAME)
+                .from(DB_USER)
+                .fetch(DB_USER.NAME)) {
+
+            result.add(new SchemaDefinition(this, name, ""));
+        }
+
+        return result;
+    }
+
     @Override
     protected List<SequenceDefinition> getSequences0() throws SQLException {
         List<SequenceDefinition> result = new ArrayList<SequenceDefinition>();
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/cubrid/dba/Dba.java b/jOOQ-meta/src/main/java/org/jooq/util/cubrid/dba/Dba.java
index ffd0b981bc..989cfb8d9d 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/cubrid/dba/Dba.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/cubrid/dba/Dba.java
@@ -6,11 +6,11 @@ package org.jooq.util.cubrid.dba;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.2.0"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class Dba extends org.jooq.impl.SchemaImpl {
 
-	private static final long serialVersionUID = 216675210;
+	private static final long serialVersionUID = 1086648763;
 
 	/**
 	 * The singleton instance of DBA
@@ -31,6 +31,7 @@ public class Dba extends org.jooq.impl.SchemaImpl {
 			org.jooq.util.cubrid.dba.tables.DbClass.DB_CLASS,
 			org.jooq.util.cubrid.dba.tables.DbIndex.DB_INDEX,
 			org.jooq.util.cubrid.dba.tables.DbIndexKey.DB_INDEX_KEY,
-			org.jooq.util.cubrid.dba.tables.DbSerial.DB_SERIAL);
+			org.jooq.util.cubrid.dba.tables.DbSerial.DB_SERIAL,
+			org.jooq.util.cubrid.dba.tables.DbUser.DB_USER);
 	}
 }
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/cubrid/dba/DbaFactory.java b/jOOQ-meta/src/main/java/org/jooq/util/cubrid/dba/DbaFactory.java
index 514d3729e2..82f1bfb148 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/cubrid/dba/DbaFactory.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/cubrid/dba/DbaFactory.java
@@ -6,11 +6,11 @@ package org.jooq.util.cubrid.dba;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.2.0"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class DbaFactory extends org.jooq.util.cubrid.CUBRIDFactory {
 
-	private static final long serialVersionUID = -166585026;
+	private static final long serialVersionUID = 1796518591;
 
 	/**
 	 * Create a factory with a connection
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/cubrid/dba/Tables.java b/jOOQ-meta/src/main/java/org/jooq/util/cubrid/dba/Tables.java
index 121c815091..2b8586b3fa 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/cubrid/dba/Tables.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/cubrid/dba/Tables.java
@@ -8,7 +8,7 @@ package org.jooq.util.cubrid.dba;
  *
  * Convenience access to all tables in DBA
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.2.0"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public final class Tables {
 
@@ -37,6 +37,11 @@ public final class Tables {
 	 */
 	public static org.jooq.util.cubrid.dba.tables.DbSerial DB_SERIAL = org.jooq.util.cubrid.dba.tables.DbSerial.DB_SERIAL;
 
+	/**
+	 * The table DBA.db_user
+	 */
+	public static org.jooq.util.cubrid.dba.tables.DbUser DB_USER = org.jooq.util.cubrid.dba.tables.DbUser.DB_USER;
+
 	/**
 	 * No instances
 	 */
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/cubrid/dba/tables/DbAttribute.java b/jOOQ-meta/src/main/java/org/jooq/util/cubrid/dba/tables/DbAttribute.java
index 836e41ba60..ed62dda82d 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/cubrid/dba/tables/DbAttribute.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/cubrid/dba/tables/DbAttribute.java
@@ -6,11 +6,11 @@ package org.jooq.util.cubrid.dba.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.2.0"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class DbAttribute extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = -1348144219;
+	private static final long serialVersionUID = 344989030;
 
 	/**
 	 * The singleton instance of DBA.db_attribute
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/cubrid/dba/tables/DbClass.java b/jOOQ-meta/src/main/java/org/jooq/util/cubrid/dba/tables/DbClass.java
index 4a02c63b2d..1e9a081629 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/cubrid/dba/tables/DbClass.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/cubrid/dba/tables/DbClass.java
@@ -6,11 +6,11 @@ package org.jooq.util.cubrid.dba.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.2.0"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class DbClass extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = 1215483532;
+	private static final long serialVersionUID = -1391625429;
 
 	/**
 	 * The singleton instance of DBA.db_class
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/cubrid/dba/tables/DbIndex.java b/jOOQ-meta/src/main/java/org/jooq/util/cubrid/dba/tables/DbIndex.java
index e8374a0579..58b81df925 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/cubrid/dba/tables/DbIndex.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/cubrid/dba/tables/DbIndex.java
@@ -6,11 +6,11 @@ package org.jooq.util.cubrid.dba.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.2.0"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class DbIndex extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = 1323614535;
+	private static final long serialVersionUID = -468760794;
 
 	/**
 	 * The singleton instance of DBA.db_index
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/cubrid/dba/tables/DbIndexKey.java b/jOOQ-meta/src/main/java/org/jooq/util/cubrid/dba/tables/DbIndexKey.java
index 30a3428a14..29c00dd9fd 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/cubrid/dba/tables/DbIndexKey.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/cubrid/dba/tables/DbIndexKey.java
@@ -6,11 +6,11 @@ package org.jooq.util.cubrid.dba.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.2.0"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class DbIndexKey extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = -1653020162;
+	private static final long serialVersionUID = -851934691;
 
 	/**
 	 * The singleton instance of DBA.db_index_key
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/cubrid/dba/tables/DbSerial.java b/jOOQ-meta/src/main/java/org/jooq/util/cubrid/dba/tables/DbSerial.java
index 478de90f77..534f8b2fba 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/cubrid/dba/tables/DbSerial.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/cubrid/dba/tables/DbSerial.java
@@ -6,11 +6,11 @@ package org.jooq.util.cubrid.dba.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.2.0"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class DbSerial extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = -1656488487;
+	private static final long serialVersionUID = 51483064;
 
 	/**
 	 * The singleton instance of DBA.db_serial
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/cubrid/dba/tables/DbUser.java b/jOOQ-meta/src/main/java/org/jooq/util/cubrid/dba/tables/DbUser.java
new file mode 100644
index 0000000000..b90b562e8d
--- /dev/null
+++ b/jOOQ-meta/src/main/java/org/jooq/util/cubrid/dba/tables/DbUser.java
@@ -0,0 +1,95 @@
+/**
+ * This class is generated by jOOQ
+ */
+package org.jooq.util.cubrid.dba.tables;
+
+/**
+ * This class is generated by jOOQ.
+ */
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
+                            comments = "This class is generated by jOOQ")
+public class DbUser extends org.jooq.impl.TableImpl<org.jooq.Record> {
+
+	private static final long serialVersionUID = -154927421;
+
+	/**
+	 * The singleton instance of DBA.db_user
+	 */
+	public static final org.jooq.util.cubrid.dba.tables.DbUser DB_USER = new org.jooq.util.cubrid.dba.tables.DbUser();
+
+	/**
+	 * The class holding records for this type
+	 */
+	private static final java.lang.Class<org.jooq.Record> __RECORD_TYPE = org.jooq.Record.class;
+
+	/**
+	 * The class holding records for this type
+	 */
+	@Override
+	public java.lang.Class<org.jooq.Record> getRecordType() {
+		return __RECORD_TYPE;
+	}
+
+	/**
+	 * An uncommented item
+	 */
+	public final org.jooq.TableField<org.jooq.Record, java.lang.String> NAME = createField("name", org.jooq.impl.SQLDataType.VARCHAR, this);
+
+	/**
+	 * An uncommented item
+	 */
+	public final org.jooq.TableField<org.jooq.Record, java.lang.Integer> ID = createField("id", org.jooq.impl.SQLDataType.INTEGER, this);
+
+	/**
+	 * An uncommented item
+	 * 
+	 * The SQL type of this item (OBJECT) could not be mapped.<br/>
+	 * Deserialising this field might not work!
+	 */
+	public final org.jooq.TableField<org.jooq.Record, java.lang.Object> PASSWORD = createField("password", org.jooq.impl.SQLDataType.OTHER, this);
+
+	/**
+	 * An uncommented item
+	 * 
+	 * The SQL type of this item (SET) could not be mapped.<br/>
+	 * Deserialising this field might not work!
+	 */
+	public final org.jooq.TableField<org.jooq.Record, java.lang.Object> DIRECT_GROUPS = createField("direct_groups", org.jooq.impl.SQLDataType.OTHER, this);
+
+	/**
+	 * An uncommented item
+	 * 
+	 * The SQL type of this item (SET) could not be mapped.<br/>
+	 * Deserialising this field might not work!
+	 */
+	public final org.jooq.TableField<org.jooq.Record, java.lang.Object> GROUPS = createField("groups", org.jooq.impl.SQLDataType.OTHER, this);
+
+	/**
+	 * An uncommented item
+	 * 
+	 * The SQL type of this item (OBJECT) could not be mapped.<br/>
+	 * Deserialising this field might not work!
+	 */
+	public final org.jooq.TableField<org.jooq.Record, java.lang.Object> AUTHORIZATION = createField("authorization", org.jooq.impl.SQLDataType.OTHER, this);
+
+	/**
+	 * An uncommented item
+	 * 
+	 * The SQL type of this item (SEQUENCE) could not be mapped.<br/>
+	 * Deserialising this field might not work!
+	 */
+	public final org.jooq.TableField<org.jooq.Record, java.lang.Object> TRIGGERS = createField("triggers", org.jooq.impl.SQLDataType.OTHER, this);
+
+	public DbUser() {
+		super("db_user", org.jooq.util.cubrid.dba.Dba.DBA);
+	}
+
+	public DbUser(java.lang.String alias) {
+		super(alias, org.jooq.util.cubrid.dba.Dba.DBA, org.jooq.util.cubrid.dba.tables.DbUser.DB_USER);
+	}
+
+	@Override
+	public org.jooq.util.cubrid.dba.tables.DbUser as(java.lang.String alias) {
+		return new org.jooq.util.cubrid.dba.tables.DbUser(alias);
+	}
+}
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/db2/DB2Database.java b/jOOQ-meta/src/main/java/org/jooq/util/db2/DB2Database.java
index 51c4175ded..d1d72164e2 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/db2/DB2Database.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/db2/DB2Database.java
@@ -38,18 +38,19 @@ package org.jooq.util.db2;
 import static org.jooq.impl.Factory.concat;
 import static org.jooq.impl.Factory.two;
 import static org.jooq.impl.Factory.val;
-import static org.jooq.util.db2.syscat.tables.Datatypes.DATATYPES;
+import static org.jooq.util.db2.syscat.Tables.DATATYPES;
+import static org.jooq.util.db2.syscat.Tables.FUNCTIONS;
+import static org.jooq.util.db2.syscat.Tables.KEYCOLUSE;
+import static org.jooq.util.db2.syscat.Tables.REFERENCES;
+import static org.jooq.util.db2.syscat.Tables.SCHEMATA;
+import static org.jooq.util.db2.syscat.Tables.SEQUENCES;
+import static org.jooq.util.db2.syscat.Tables.TABCONST;
+import static org.jooq.util.db2.syscat.Tables.TABLES;
 import static org.jooq.util.db2.syscat.tables.Functions.FUNCNAME;
 import static org.jooq.util.db2.syscat.tables.Functions.FUNCSCHEMA;
-import static org.jooq.util.db2.syscat.tables.Functions.FUNCTIONS;
-import static org.jooq.util.db2.syscat.tables.Keycoluse.KEYCOLUSE;
 import static org.jooq.util.db2.syscat.tables.Procedures.PROCEDURES;
 import static org.jooq.util.db2.syscat.tables.Procedures.PROCNAME;
 import static org.jooq.util.db2.syscat.tables.Procedures.PROCSCHEMA;
-import static org.jooq.util.db2.syscat.tables.References.REFERENCES;
-import static org.jooq.util.db2.syscat.tables.Sequences.SEQUENCES;
-import static org.jooq.util.db2.syscat.tables.Tabconst.TABCONST;
-import static org.jooq.util.db2.syscat.tables.Tables.TABLES;
 
 import java.sql.SQLException;
 import java.util.ArrayList;
@@ -76,6 +77,7 @@ import org.jooq.util.db2.syscat.SyscatFactory;
 import org.jooq.util.db2.syscat.tables.Datatypes;
 import org.jooq.util.db2.syscat.tables.Keycoluse;
 import org.jooq.util.db2.syscat.tables.References;
+import org.jooq.util.db2.syscat.tables.Schemata;
 import org.jooq.util.db2.syscat.tables.Sequences;
 import org.jooq.util.db2.syscat.tables.Tabconst;
 import org.jooq.util.db2.syscat.tables.Tables;
@@ -187,6 +189,21 @@ public class DB2Database extends AbstractDatabase {
         }
     }
 
+    @Override
+    protected List<SchemaDefinition> getSchemata0() throws SQLException {
+        List<SchemaDefinition> result = new ArrayList<SchemaDefinition>();
+
+        for (String name : create()
+                .select(Schemata.SCHEMANAME.trim())
+                .from(SCHEMATA)
+                .fetch(Schemata.SCHEMANAME.trim())) {
+
+            result.add(new SchemaDefinition(this, name, ""));
+        }
+
+        return result;
+    }
+
     @Override
     protected List<SequenceDefinition> getSequences0() throws SQLException {
         List<SequenceDefinition> result = new ArrayList<SequenceDefinition>();
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/Syscat.java b/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/Syscat.java
index d903b1aecf..9fdf787340 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/Syscat.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/Syscat.java
@@ -6,11 +6,11 @@ package org.jooq.util.db2.syscat;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class Syscat extends org.jooq.impl.SchemaImpl {
 
-	private static final long serialVersionUID = 1387661164;
+	private static final long serialVersionUID = 954463263;
 
 	/**
 	 * The singleton instance of SYSCAT
@@ -36,6 +36,7 @@ public class Syscat extends org.jooq.impl.SchemaImpl {
 			org.jooq.util.db2.syscat.tables.Procedures.PROCEDURES,
 			org.jooq.util.db2.syscat.tables.Procparms.PROCPARMS,
 			org.jooq.util.db2.syscat.tables.References.REFERENCES,
+			org.jooq.util.db2.syscat.tables.Schemata.SCHEMATA,
 			org.jooq.util.db2.syscat.tables.Sequences.SEQUENCES,
 			org.jooq.util.db2.syscat.tables.Tabconst.TABCONST,
 			org.jooq.util.db2.syscat.tables.Tables.TABLES);
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/SyscatFactory.java b/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/SyscatFactory.java
index dc31495769..962a68b896 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/SyscatFactory.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/SyscatFactory.java
@@ -6,11 +6,11 @@ package org.jooq.util.db2.syscat;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class SyscatFactory extends org.jooq.util.db2.DB2Factory {
 
-	private static final long serialVersionUID = -372754065;
+	private static final long serialVersionUID = -1392286126;
 
 	/**
 	 * Create a factory with a connection
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/Tables.java b/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/Tables.java
index 49b8baf734..d54ed6fcb5 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/Tables.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/Tables.java
@@ -8,7 +8,7 @@ package org.jooq.util.db2.syscat;
  *
  * Convenience access to all tables in SYSCAT
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public final class Tables {
 
@@ -57,6 +57,11 @@ public final class Tables {
 	 */
 	public static org.jooq.util.db2.syscat.tables.References REFERENCES = org.jooq.util.db2.syscat.tables.References.REFERENCES;
 
+	/**
+	 * The table SYSCAT.SCHEMATA
+	 */
+	public static org.jooq.util.db2.syscat.tables.Schemata SCHEMATA = org.jooq.util.db2.syscat.tables.Schemata.SCHEMATA;
+
 	/**
 	 * The table SYSCAT.SEQUENCES
 	 */
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/Attributes.java b/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/Attributes.java
index 43ee4dd0ec..cec65f3715 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/Attributes.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/Attributes.java
@@ -6,11 +6,11 @@ package org.jooq.util.db2.syscat.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class Attributes extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = 1544180123;
+	private static final long serialVersionUID = -1665246530;
 
 	/**
 	 * The singleton instance of SYSCAT.ATTRIBUTES
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/Columns.java b/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/Columns.java
index 4f29caf64d..04f066c646 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/Columns.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/Columns.java
@@ -6,11 +6,11 @@ package org.jooq.util.db2.syscat.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class Columns extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = 2033717233;
+	private static final long serialVersionUID = -1162728876;
 
 	/**
 	 * The singleton instance of SYSCAT.COLUMNS
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/Datatypes.java b/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/Datatypes.java
index 8e206eb9dd..660480b077 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/Datatypes.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/Datatypes.java
@@ -6,11 +6,11 @@ package org.jooq.util.db2.syscat.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class Datatypes extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = -678430722;
+	private static final long serialVersionUID = 1101322107;
 
 	/**
 	 * The singleton instance of SYSCAT.DATATYPES
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/Funcparms.java b/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/Funcparms.java
index 143e68758b..c28ea018a3 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/Funcparms.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/Funcparms.java
@@ -6,11 +6,11 @@ package org.jooq.util.db2.syscat.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class Funcparms extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = 1422623242;
+	private static final long serialVersionUID = -1036939001;
 
 	/**
 	 * The singleton instance of SYSCAT.FUNCPARMS
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/Functions.java b/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/Functions.java
index 95c7e4c879..ef6c8719a8 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/Functions.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/Functions.java
@@ -6,11 +6,11 @@ package org.jooq.util.db2.syscat.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class Functions extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = 1565733387;
+	private static final long serialVersionUID = 1838462254;
 
 	/**
 	 * The singleton instance of SYSCAT.FUNCTIONS
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/Keycoluse.java b/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/Keycoluse.java
index 4ef385f233..3b1e79e005 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/Keycoluse.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/Keycoluse.java
@@ -6,11 +6,11 @@ package org.jooq.util.db2.syscat.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class Keycoluse extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = -1024358622;
+	private static final long serialVersionUID = 1002319173;
 
 	/**
 	 * The singleton instance of SYSCAT.KEYCOLUSE
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/Procedures.java b/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/Procedures.java
index c5dfdced27..afad036016 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/Procedures.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/Procedures.java
@@ -6,11 +6,11 @@ package org.jooq.util.db2.syscat.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class Procedures extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = 1262378665;
+	private static final long serialVersionUID = -707072986;
 
 	/**
 	 * The singleton instance of SYSCAT.PROCEDURES
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/Procparms.java b/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/Procparms.java
index 8ced64d592..8a6047e36a 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/Procparms.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/Procparms.java
@@ -6,11 +6,11 @@ package org.jooq.util.db2.syscat.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class Procparms extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = -1518578228;
+	private static final long serialVersionUID = 1900169;
 
 	/**
 	 * The singleton instance of SYSCAT.PROCPARMS
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/References.java b/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/References.java
index 0b0b5d2321..350acbab4b 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/References.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/References.java
@@ -6,11 +6,11 @@ package org.jooq.util.db2.syscat.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class References extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = -98734711;
+	private static final long serialVersionUID = 1536265542;
 
 	/**
 	 * The singleton instance of SYSCAT.REFERENCES
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/Schemata.java b/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/Schemata.java
new file mode 100644
index 0000000000..54eacd69a0
--- /dev/null
+++ b/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/Schemata.java
@@ -0,0 +1,74 @@
+/**
+ * This class is generated by jOOQ
+ */
+package org.jooq.util.db2.syscat.tables;
+
+/**
+ * This class is generated by jOOQ.
+ */
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
+                            comments = "This class is generated by jOOQ")
+public class Schemata extends org.jooq.impl.TableImpl<org.jooq.Record> {
+
+	private static final long serialVersionUID = 1092308661;
+
+	/**
+	 * The singleton instance of SYSCAT.SCHEMATA
+	 */
+	public static final org.jooq.util.db2.syscat.tables.Schemata SCHEMATA = new org.jooq.util.db2.syscat.tables.Schemata();
+
+	/**
+	 * The class holding records for this type
+	 */
+	private static final java.lang.Class<org.jooq.Record> __RECORD_TYPE = org.jooq.Record.class;
+
+	/**
+	 * The class holding records for this type
+	 */
+	@Override
+	public java.lang.Class<org.jooq.Record> getRecordType() {
+		return __RECORD_TYPE;
+	}
+
+	/**
+	 * An uncommented item
+	 */
+	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> SCHEMANAME = createField("SCHEMANAME", org.jooq.impl.SQLDataType.VARCHAR, SCHEMATA);
+
+	/**
+	 * An uncommented item
+	 */
+	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> OWNER = createField("OWNER", org.jooq.impl.SQLDataType.VARCHAR, SCHEMATA);
+
+	/**
+	 * An uncommented item
+	 */
+	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> OWNERTYPE = createField("OWNERTYPE", org.jooq.impl.SQLDataType.CHAR, SCHEMATA);
+
+	/**
+	 * An uncommented item
+	 */
+	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> DEFINER = createField("DEFINER", org.jooq.impl.SQLDataType.VARCHAR, SCHEMATA);
+
+	/**
+	 * An uncommented item
+	 */
+	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> DEFINERTYPE = createField("DEFINERTYPE", org.jooq.impl.SQLDataType.CHAR, SCHEMATA);
+
+	/**
+	 * An uncommented item
+	 */
+	public static final org.jooq.TableField<org.jooq.Record, java.sql.Timestamp> CREATE_TIME = createField("CREATE_TIME", org.jooq.impl.SQLDataType.TIMESTAMP, SCHEMATA);
+
+	/**
+	 * An uncommented item
+	 */
+	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> REMARKS = createField("REMARKS", org.jooq.impl.SQLDataType.VARCHAR, SCHEMATA);
+
+	/**
+	 * No further instances allowed
+	 */
+	private Schemata() {
+		super("SCHEMATA", org.jooq.util.db2.syscat.Syscat.SYSCAT);
+	}
+}
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/Sequences.java b/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/Sequences.java
index 307bfa4013..3511ac319d 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/Sequences.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/Sequences.java
@@ -6,11 +6,11 @@ package org.jooq.util.db2.syscat.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class Sequences extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = 1706667636;
+	private static final long serialVersionUID = 1777710103;
 
 	/**
 	 * The singleton instance of SYSCAT.SEQUENCES
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/Tabconst.java b/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/Tabconst.java
index 87e2db04e1..6384d3b4ee 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/Tabconst.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/Tabconst.java
@@ -6,11 +6,11 @@ package org.jooq.util.db2.syscat.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class Tabconst extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = 1915033245;
+	private static final long serialVersionUID = -1245548070;
 
 	/**
 	 * The singleton instance of SYSCAT.TABCONST
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/Tables.java b/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/Tables.java
index 2590df434a..00b59a69b7 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/Tables.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/Tables.java
@@ -6,11 +6,11 @@ package org.jooq.util.db2.syscat.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class Tables extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = 1553584909;
+	private static final long serialVersionUID = 1679771594;
 
 	/**
 	 * The singleton instance of SYSCAT.TABLES
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/derby/DerbyDatabase.java b/jOOQ-meta/src/main/java/org/jooq/util/derby/DerbyDatabase.java
index 925b8fb0f9..c7d5095e5f 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/derby/DerbyDatabase.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/derby/DerbyDatabase.java
@@ -211,6 +211,21 @@ public class DerbyDatabase extends AbstractDatabase {
         return result;
     }
 
+    @Override
+    protected List<SchemaDefinition> getSchemata0() throws SQLException {
+        List<SchemaDefinition> result = new ArrayList<SchemaDefinition>();
+
+        for (String name : create()
+                .select(Sysschemas.SCHEMANAME)
+                .from(SYSSCHEMAS)
+                .fetch(Sysschemas.SCHEMANAME)) {
+
+            result.add(new SchemaDefinition(this, name, ""));
+        }
+
+        return result;
+    }
+
     @Override
     protected List<SequenceDefinition> getSequences0() throws SQLException {
         List<SequenceDefinition> result = new ArrayList<SequenceDefinition>();
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/h2/H2Database.java b/jOOQ-meta/src/main/java/org/jooq/util/h2/H2Database.java
index 4b6240692d..28442d50a1 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/h2/H2Database.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/h2/H2Database.java
@@ -38,6 +38,7 @@ package org.jooq.util.h2;
 import static org.jooq.util.h2.information_schema.tables.Constraints.CONSTRAINTS;
 import static org.jooq.util.h2.information_schema.tables.CrossReferences.CROSS_REFERENCES;
 import static org.jooq.util.h2.information_schema.tables.FunctionAliases.FUNCTION_ALIASES;
+import static org.jooq.util.h2.information_schema.tables.Schemata.SCHEMATA;
 import static org.jooq.util.h2.information_schema.tables.Sequences.SEQUENCES;
 import static org.jooq.util.h2.information_schema.tables.Tables.TABLES;
 import static org.jooq.util.h2.information_schema.tables.TypeInfo.TYPE_INFO;
@@ -65,6 +66,7 @@ import org.jooq.util.h2.information_schema.InformationSchemaFactory;
 import org.jooq.util.h2.information_schema.tables.Constraints;
 import org.jooq.util.h2.information_schema.tables.CrossReferences;
 import org.jooq.util.h2.information_schema.tables.FunctionAliases;
+import org.jooq.util.h2.information_schema.tables.Schemata;
 import org.jooq.util.h2.information_schema.tables.Sequences;
 import org.jooq.util.h2.information_schema.tables.Tables;
 import org.jooq.util.h2.information_schema.tables.TypeInfo;
@@ -173,6 +175,24 @@ public class H2Database extends AbstractDatabase {
         }
     }
 
+    @Override
+    protected List<SchemaDefinition> getSchemata0() throws SQLException {
+        List<SchemaDefinition> result = new ArrayList<SchemaDefinition>();
+
+        for (Record record : create().select(
+                    Schemata.SCHEMA_NAME,
+                    Schemata.REMARKS)
+                .from(SCHEMATA)
+                .fetch()) {
+
+            result.add(new SchemaDefinition(this,
+                record.getValue(Schemata.SCHEMA_NAME),
+                record.getValue(Schemata.REMARKS)));
+        }
+
+        return result;
+    }
+
     @Override
     protected List<SequenceDefinition> getSequences0() throws SQLException {
         List<SequenceDefinition> result = new ArrayList<SequenceDefinition>();
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/h2/information_schema/InformationSchema.java b/jOOQ-meta/src/main/java/org/jooq/util/h2/information_schema/InformationSchema.java
index 8fd4445d97..cf27c09c83 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/h2/information_schema/InformationSchema.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/h2/information_schema/InformationSchema.java
@@ -6,11 +6,11 @@ package org.jooq.util.h2.information_schema;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class InformationSchema extends org.jooq.impl.SchemaImpl {
 
-	private static final long serialVersionUID = 1888320696;
+	private static final long serialVersionUID = -652367162;
 
 	/**
 	 * The singleton instance of INFORMATION_SCHEMA
@@ -30,6 +30,7 @@ public class InformationSchema extends org.jooq.impl.SchemaImpl {
 			org.jooq.util.h2.information_schema.tables.FunctionColumns.FUNCTION_COLUMNS,
 			org.jooq.util.h2.information_schema.tables.Constraints.CONSTRAINTS,
 			org.jooq.util.h2.information_schema.tables.CrossReferences.CROSS_REFERENCES,
+			org.jooq.util.h2.information_schema.tables.Schemata.SCHEMATA,
 			org.jooq.util.h2.information_schema.tables.FunctionAliases.FUNCTION_ALIASES,
 			org.jooq.util.h2.information_schema.tables.Sequences.SEQUENCES,
 			org.jooq.util.h2.information_schema.tables.TypeInfo.TYPE_INFO,
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/h2/information_schema/InformationSchemaFactory.java b/jOOQ-meta/src/main/java/org/jooq/util/h2/information_schema/InformationSchemaFactory.java
index d26196f663..474d41a77d 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/h2/information_schema/InformationSchemaFactory.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/h2/information_schema/InformationSchemaFactory.java
@@ -6,11 +6,11 @@ package org.jooq.util.h2.information_schema;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class InformationSchemaFactory extends org.jooq.util.h2.H2Factory {
 
-	private static final long serialVersionUID = 1216829554;
+	private static final long serialVersionUID = -340832465;
 
 	/**
 	 * Create a factory with a connection
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/h2/information_schema/Tables.java b/jOOQ-meta/src/main/java/org/jooq/util/h2/information_schema/Tables.java
index 9cbd2b3d11..ce4fce4c0a 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/h2/information_schema/Tables.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/h2/information_schema/Tables.java
@@ -8,7 +8,7 @@ package org.jooq.util.h2.information_schema;
  *
  * Convenience access to all tables in INFORMATION_SCHEMA
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public final class Tables {
 
@@ -27,6 +27,11 @@ public final class Tables {
 	 */
 	public static org.jooq.util.h2.information_schema.tables.CrossReferences CROSS_REFERENCES = org.jooq.util.h2.information_schema.tables.CrossReferences.CROSS_REFERENCES;
 
+	/**
+	 * The table INFORMATION_SCHEMA.SCHEMATA
+	 */
+	public static org.jooq.util.h2.information_schema.tables.Schemata SCHEMATA = org.jooq.util.h2.information_schema.tables.Schemata.SCHEMATA;
+
 	/**
 	 * The table INFORMATION_SCHEMA.FUNCTION_ALIASES
 	 */
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/h2/information_schema/tables/Columns.java b/jOOQ-meta/src/main/java/org/jooq/util/h2/information_schema/tables/Columns.java
index ac121b5aa7..cd73d51919 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/h2/information_schema/tables/Columns.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/h2/information_schema/tables/Columns.java
@@ -6,11 +6,11 @@ package org.jooq.util.h2.information_schema.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class Columns extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = 344248416;
+	private static final long serialVersionUID = -806204669;
 
 	/**
 	 * The singleton instance of INFORMATION_SCHEMA.COLUMNS
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/h2/information_schema/tables/Constraints.java b/jOOQ-meta/src/main/java/org/jooq/util/h2/information_schema/tables/Constraints.java
index 4009fa2bac..07496f0cf9 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/h2/information_schema/tables/Constraints.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/h2/information_schema/tables/Constraints.java
@@ -6,11 +6,11 @@ package org.jooq.util.h2.information_schema.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class Constraints extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = -820225270;
+	private static final long serialVersionUID = -2089202361;
 
 	/**
 	 * The singleton instance of INFORMATION_SCHEMA.CONSTRAINTS
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/h2/information_schema/tables/CrossReferences.java b/jOOQ-meta/src/main/java/org/jooq/util/h2/information_schema/tables/CrossReferences.java
index da5c833c4b..73950fda41 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/h2/information_schema/tables/CrossReferences.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/h2/information_schema/tables/CrossReferences.java
@@ -6,11 +6,11 @@ package org.jooq.util.h2.information_schema.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class CrossReferences extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = 379859458;
+	private static final long serialVersionUID = 1959764581;
 
 	/**
 	 * The singleton instance of INFORMATION_SCHEMA.CROSS_REFERENCES
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/h2/information_schema/tables/FunctionAliases.java b/jOOQ-meta/src/main/java/org/jooq/util/h2/information_schema/tables/FunctionAliases.java
index fb5fe4565f..d7ded5c626 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/h2/information_schema/tables/FunctionAliases.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/h2/information_schema/tables/FunctionAliases.java
@@ -6,11 +6,11 @@ package org.jooq.util.h2.information_schema.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class FunctionAliases extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = -745022602;
+	private static final long serialVersionUID = 965480179;
 
 	/**
 	 * The singleton instance of INFORMATION_SCHEMA.FUNCTION_ALIASES
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/h2/information_schema/tables/FunctionColumns.java b/jOOQ-meta/src/main/java/org/jooq/util/h2/information_schema/tables/FunctionColumns.java
index 2a512890e3..f4e70d599c 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/h2/information_schema/tables/FunctionColumns.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/h2/information_schema/tables/FunctionColumns.java
@@ -6,11 +6,11 @@ package org.jooq.util.h2.information_schema.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class FunctionColumns extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = 2037193224;
+	private static final long serialVersionUID = 1195680875;
 
 	/**
 	 * The singleton instance of INFORMATION_SCHEMA.FUNCTION_COLUMNS
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/h2/information_schema/tables/Schemata.java b/jOOQ-meta/src/main/java/org/jooq/util/h2/information_schema/tables/Schemata.java
new file mode 100644
index 0000000000..6d0d1c71ca
--- /dev/null
+++ b/jOOQ-meta/src/main/java/org/jooq/util/h2/information_schema/tables/Schemata.java
@@ -0,0 +1,79 @@
+/**
+ * This class is generated by jOOQ
+ */
+package org.jooq.util.h2.information_schema.tables;
+
+/**
+ * This class is generated by jOOQ.
+ */
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
+                            comments = "This class is generated by jOOQ")
+public class Schemata extends org.jooq.impl.TableImpl<org.jooq.Record> {
+
+	private static final long serialVersionUID = -933683682;
+
+	/**
+	 * The singleton instance of INFORMATION_SCHEMA.SCHEMATA
+	 */
+	public static final org.jooq.util.h2.information_schema.tables.Schemata SCHEMATA = new org.jooq.util.h2.information_schema.tables.Schemata();
+
+	/**
+	 * The class holding records for this type
+	 */
+	private static final java.lang.Class<org.jooq.Record> __RECORD_TYPE = org.jooq.Record.class;
+
+	/**
+	 * The class holding records for this type
+	 */
+	@Override
+	public java.lang.Class<org.jooq.Record> getRecordType() {
+		return __RECORD_TYPE;
+	}
+
+	/**
+	 * An uncommented item
+	 */
+	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> CATALOG_NAME = createField("CATALOG_NAME", org.jooq.impl.SQLDataType.VARCHAR, SCHEMATA);
+
+	/**
+	 * An uncommented item
+	 */
+	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> SCHEMA_NAME = createField("SCHEMA_NAME", org.jooq.impl.SQLDataType.VARCHAR, SCHEMATA);
+
+	/**
+	 * An uncommented item
+	 */
+	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> SCHEMA_OWNER = createField("SCHEMA_OWNER", org.jooq.impl.SQLDataType.VARCHAR, SCHEMATA);
+
+	/**
+	 * An uncommented item
+	 */
+	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> DEFAULT_CHARACTER_SET_NAME = createField("DEFAULT_CHARACTER_SET_NAME", org.jooq.impl.SQLDataType.VARCHAR, SCHEMATA);
+
+	/**
+	 * An uncommented item
+	 */
+	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> DEFAULT_COLLATION_NAME = createField("DEFAULT_COLLATION_NAME", org.jooq.impl.SQLDataType.VARCHAR, SCHEMATA);
+
+	/**
+	 * An uncommented item
+	 */
+	public static final org.jooq.TableField<org.jooq.Record, java.lang.Boolean> IS_DEFAULT = createField("IS_DEFAULT", org.jooq.impl.SQLDataType.BOOLEAN, SCHEMATA);
+
+	/**
+	 * An uncommented item
+	 */
+	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> REMARKS = createField("REMARKS", org.jooq.impl.SQLDataType.VARCHAR, SCHEMATA);
+
+	/**
+	 * An uncommented item
+	 */
+	public static final org.jooq.TableField<org.jooq.Record, java.lang.Integer> ID = createField("ID", org.jooq.impl.SQLDataType.INTEGER, SCHEMATA);
+
+	/**
+	 * No further instances allowed
+	 */
+	private Schemata() {
+		super("SCHEMATA", org.jooq.util.h2.information_schema.InformationSchema.INFORMATION_SCHEMA);
+	}
+}
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/h2/information_schema/tables/Sequences.java b/jOOQ-meta/src/main/java/org/jooq/util/h2/information_schema/tables/Sequences.java
index dba468706a..7feab32c57 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/h2/information_schema/tables/Sequences.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/h2/information_schema/tables/Sequences.java
@@ -6,11 +6,11 @@ package org.jooq.util.h2.information_schema.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class Sequences extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = 726821903;
+	private static final long serialVersionUID = -1603626292;
 
 	/**
 	 * The singleton instance of INFORMATION_SCHEMA.SEQUENCES
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/h2/information_schema/tables/Tables.java b/jOOQ-meta/src/main/java/org/jooq/util/h2/information_schema/tables/Tables.java
index 5b1b0a776d..a6d3dd6579 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/h2/information_schema/tables/Tables.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/h2/information_schema/tables/Tables.java
@@ -6,11 +6,11 @@ package org.jooq.util.h2.information_schema.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class Tables extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = -909898387;
+	private static final long serialVersionUID = -1803714096;
 
 	/**
 	 * The singleton instance of INFORMATION_SCHEMA.TABLES
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/h2/information_schema/tables/TypeInfo.java b/jOOQ-meta/src/main/java/org/jooq/util/h2/information_schema/tables/TypeInfo.java
index e96efbc006..8f177a40b7 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/h2/information_schema/tables/TypeInfo.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/h2/information_schema/tables/TypeInfo.java
@@ -6,11 +6,11 @@ package org.jooq.util.h2.information_schema.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class TypeInfo extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = 1507222662;
+	private static final long serialVersionUID = -386106557;
 
 	/**
 	 * The singleton instance of INFORMATION_SCHEMA.TYPE_INFO
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/HSQLDBDatabase.java b/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/HSQLDBDatabase.java
index 000151f63e..c71a294b50 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/HSQLDBDatabase.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/HSQLDBDatabase.java
@@ -41,6 +41,7 @@ import static org.jooq.util.hsqldb.information_schema.Tables.ELEMENT_TYPES;
 import static org.jooq.util.hsqldb.information_schema.Tables.KEY_COLUMN_USAGE;
 import static org.jooq.util.hsqldb.information_schema.Tables.REFERENTIAL_CONSTRAINTS;
 import static org.jooq.util.hsqldb.information_schema.Tables.ROUTINES;
+import static org.jooq.util.hsqldb.information_schema.Tables.SCHEMATA;
 import static org.jooq.util.hsqldb.information_schema.Tables.SEQUENCES;
 import static org.jooq.util.hsqldb.information_schema.Tables.TABLES;
 import static org.jooq.util.hsqldb.information_schema.Tables.TABLE_CONSTRAINTS;
@@ -79,9 +80,6 @@ public class HSQLDBDatabase extends AbstractDatabase {
         return new HSQLDBFactory(getConnection());
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     protected void loadPrimaryKeys(DefaultRelations relations) throws SQLException {
         for (Record record : fetchKeys("PRIMARY KEY")) {
@@ -97,9 +95,6 @@ public class HSQLDBDatabase extends AbstractDatabase {
         }
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     protected void loadUniqueKeys(DefaultRelations relations) throws SQLException {
         for (Record record : fetchKeys("UNIQUE")) {
@@ -136,9 +131,6 @@ public class HSQLDBDatabase extends AbstractDatabase {
             .fetch();
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     protected void loadForeignKeys(DefaultRelations relations) throws SQLException {
         Result<Record> result = create()
@@ -179,9 +171,21 @@ public class HSQLDBDatabase extends AbstractDatabase {
         }
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    @Override
+    protected List<SchemaDefinition> getSchemata0() throws SQLException {
+        List<SchemaDefinition> result = new ArrayList<SchemaDefinition>();
+
+        for (String name : create()
+                .select(SCHEMATA.SCHEMA_NAME)
+                .from(SCHEMATA)
+                .fetch(SCHEMATA.SCHEMA_NAME)) {
+
+            result.add(new SchemaDefinition(this, name, ""));
+        }
+
+        return result;
+    }
+
     @Override
     protected List<SequenceDefinition> getSequences0() throws SQLException {
         List<SequenceDefinition> result = new ArrayList<SequenceDefinition>();
@@ -212,9 +216,6 @@ public class HSQLDBDatabase extends AbstractDatabase {
         return result;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     protected List<TableDefinition> getTables0() throws SQLException {
         List<TableDefinition> result = new ArrayList<TableDefinition>();
@@ -240,36 +241,24 @@ public class HSQLDBDatabase extends AbstractDatabase {
         return result;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     protected List<EnumDefinition> getEnums0() throws SQLException {
         List<EnumDefinition> result = new ArrayList<EnumDefinition>();
         return result;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     protected List<UDTDefinition> getUDTs0() throws SQLException {
         List<UDTDefinition> result = new ArrayList<UDTDefinition>();
         return result;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     protected List<ArrayDefinition> getArrays0() throws SQLException {
         List<ArrayDefinition> result = new ArrayList<ArrayDefinition>();
         return result;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     protected List<RoutineDefinition> getRoutines0() throws SQLException {
         List<RoutineDefinition> result = new ArrayList<RoutineDefinition>();
@@ -305,9 +294,6 @@ public class HSQLDBDatabase extends AbstractDatabase {
         return result;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     protected List<PackageDefinition> getPackages0() throws SQLException {
         List<PackageDefinition> result = new ArrayList<PackageDefinition>();
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/InformationSchema.java b/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/InformationSchema.java
index 1c60da4070..9c1d30d5bc 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/InformationSchema.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/InformationSchema.java
@@ -6,11 +6,11 @@ package org.jooq.util.hsqldb.information_schema;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class InformationSchema extends org.jooq.impl.SchemaImpl {
 
-	private static final long serialVersionUID = -1534414125;
+	private static final long serialVersionUID = 688591995;
 
 	/**
 	 * The singleton instance of INFORMATION_SCHEMA
@@ -34,6 +34,7 @@ public class InformationSchema extends org.jooq.impl.SchemaImpl {
 			org.jooq.util.hsqldb.information_schema.tables.Parameters.PARAMETERS,
 			org.jooq.util.hsqldb.information_schema.tables.ReferentialConstraints.REFERENTIAL_CONSTRAINTS,
 			org.jooq.util.hsqldb.information_schema.tables.Routines.ROUTINES,
+			org.jooq.util.hsqldb.information_schema.tables.Schemata.SCHEMATA,
 			org.jooq.util.hsqldb.information_schema.tables.Sequences.SEQUENCES,
 			org.jooq.util.hsqldb.information_schema.tables.Tables.TABLES,
 			org.jooq.util.hsqldb.information_schema.tables.TableConstraints.TABLE_CONSTRAINTS);
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/InformationSchemaFactory.java b/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/InformationSchemaFactory.java
index 0869e15af5..62d6da286b 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/InformationSchemaFactory.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/InformationSchemaFactory.java
@@ -6,11 +6,11 @@ package org.jooq.util.hsqldb.information_schema;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class InformationSchemaFactory extends org.jooq.util.hsqldb.HSQLDBFactory {
 
-	private static final long serialVersionUID = 1596782584;
+	private static final long serialVersionUID = 612688309;
 
 	/**
 	 * Create a factory with a connection
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/Tables.java b/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/Tables.java
index 724f1b8d30..e8a097f28e 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/Tables.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/Tables.java
@@ -8,7 +8,7 @@ package org.jooq.util.hsqldb.information_schema;
  *
  * Convenience access to all tables in INFORMATION_SCHEMA
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public final class Tables {
 
@@ -47,6 +47,11 @@ public final class Tables {
 	 */
 	public static org.jooq.util.hsqldb.information_schema.tables.Routines ROUTINES = org.jooq.util.hsqldb.information_schema.tables.Routines.ROUTINES;
 
+	/**
+	 * The table INFORMATION_SCHEMA.SCHEMATA
+	 */
+	public static org.jooq.util.hsqldb.information_schema.tables.Schemata SCHEMATA = org.jooq.util.hsqldb.information_schema.tables.Schemata.SCHEMATA;
+
 	/**
 	 * The table INFORMATION_SCHEMA.SEQUENCES
 	 */
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/tables/Columns.java b/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/tables/Columns.java
index 6179b8b3f7..4e7b332ea0 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/tables/Columns.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/tables/Columns.java
@@ -6,11 +6,11 @@ package org.jooq.util.hsqldb.information_schema.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class Columns extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = -173682921;
+	private static final long serialVersionUID = 730335754;
 
 	/**
 	 * The singleton instance of INFORMATION_SCHEMA.COLUMNS
@@ -265,17 +265,11 @@ public class Columns extends org.jooq.impl.TableImpl<org.jooq.Record> {
 	 */
 	public final org.jooq.TableField<org.jooq.Record, java.lang.Long> DECLARED_NUMERIC_SCALE = createField("DECLARED_NUMERIC_SCALE", org.jooq.impl.SQLDataType.BIGINT, this);
 
-	/**
-	 * No further instances allowed
-	 */
-	private Columns() {
+	public Columns() {
 		super("COLUMNS", org.jooq.util.hsqldb.information_schema.InformationSchema.INFORMATION_SCHEMA);
 	}
 
-	/**
-	 * No further instances allowed
-	 */
-	private Columns(java.lang.String alias) {
+	public Columns(java.lang.String alias) {
 		super(alias, org.jooq.util.hsqldb.information_schema.InformationSchema.INFORMATION_SCHEMA, org.jooq.util.hsqldb.information_schema.tables.Columns.COLUMNS);
 	}
 
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/tables/ConstraintColumnUsage.java b/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/tables/ConstraintColumnUsage.java
index 72fecad8ac..d5cd71a220 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/tables/ConstraintColumnUsage.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/tables/ConstraintColumnUsage.java
@@ -6,11 +6,11 @@ package org.jooq.util.hsqldb.information_schema.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class ConstraintColumnUsage extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = -1586142196;
+	private static final long serialVersionUID = -1433884199;
 
 	/**
 	 * The singleton instance of INFORMATION_SCHEMA.CONSTRAINT_COLUMN_USAGE
@@ -65,17 +65,11 @@ public class ConstraintColumnUsage extends org.jooq.impl.TableImpl<org.jooq.Reco
 	 */
 	public final org.jooq.TableField<org.jooq.Record, java.lang.String> CONSTRAINT_NAME = createField("CONSTRAINT_NAME", org.jooq.impl.SQLDataType.VARCHAR, this);
 
-	/**
-	 * No further instances allowed
-	 */
-	private ConstraintColumnUsage() {
+	public ConstraintColumnUsage() {
 		super("CONSTRAINT_COLUMN_USAGE", org.jooq.util.hsqldb.information_schema.InformationSchema.INFORMATION_SCHEMA);
 	}
 
-	/**
-	 * No further instances allowed
-	 */
-	private ConstraintColumnUsage(java.lang.String alias) {
+	public ConstraintColumnUsage(java.lang.String alias) {
 		super(alias, org.jooq.util.hsqldb.information_schema.InformationSchema.INFORMATION_SCHEMA, org.jooq.util.hsqldb.information_schema.tables.ConstraintColumnUsage.CONSTRAINT_COLUMN_USAGE);
 	}
 
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/tables/ElementTypes.java b/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/tables/ElementTypes.java
index 8400e47aec..5ca5c44062 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/tables/ElementTypes.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/tables/ElementTypes.java
@@ -6,11 +6,11 @@ package org.jooq.util.hsqldb.information_schema.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class ElementTypes extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = 398841598;
+	private static final long serialVersionUID = -1943758981;
 
 	/**
 	 * The singleton instance of INFORMATION_SCHEMA.ELEMENT_TYPES
@@ -185,17 +185,11 @@ public class ElementTypes extends org.jooq.impl.TableImpl<org.jooq.Record> {
 	 */
 	public final org.jooq.TableField<org.jooq.Record, java.lang.Long> DECLARED_NUMERIC_SCALE = createField("DECLARED_NUMERIC_SCALE", org.jooq.impl.SQLDataType.BIGINT, this);
 
-	/**
-	 * No further instances allowed
-	 */
-	private ElementTypes() {
+	public ElementTypes() {
 		super("ELEMENT_TYPES", org.jooq.util.hsqldb.information_schema.InformationSchema.INFORMATION_SCHEMA);
 	}
 
-	/**
-	 * No further instances allowed
-	 */
-	private ElementTypes(java.lang.String alias) {
+	public ElementTypes(java.lang.String alias) {
 		super(alias, org.jooq.util.hsqldb.information_schema.InformationSchema.INFORMATION_SCHEMA, org.jooq.util.hsqldb.information_schema.tables.ElementTypes.ELEMENT_TYPES);
 	}
 
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/tables/KeyColumnUsage.java b/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/tables/KeyColumnUsage.java
index c35826e90d..50340d6467 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/tables/KeyColumnUsage.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/tables/KeyColumnUsage.java
@@ -6,11 +6,11 @@ package org.jooq.util.hsqldb.information_schema.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class KeyColumnUsage extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = -1398228570;
+	private static final long serialVersionUID = -1468929901;
 
 	/**
 	 * The singleton instance of INFORMATION_SCHEMA.KEY_COLUMN_USAGE
@@ -75,17 +75,11 @@ public class KeyColumnUsage extends org.jooq.impl.TableImpl<org.jooq.Record> {
 	 */
 	public final org.jooq.TableField<org.jooq.Record, java.lang.Long> POSITION_IN_UNIQUE_CONSTRAINT = createField("POSITION_IN_UNIQUE_CONSTRAINT", org.jooq.impl.SQLDataType.BIGINT, this);
 
-	/**
-	 * No further instances allowed
-	 */
-	private KeyColumnUsage() {
+	public KeyColumnUsage() {
 		super("KEY_COLUMN_USAGE", org.jooq.util.hsqldb.information_schema.InformationSchema.INFORMATION_SCHEMA);
 	}
 
-	/**
-	 * No further instances allowed
-	 */
-	private KeyColumnUsage(java.lang.String alias) {
+	public KeyColumnUsage(java.lang.String alias) {
 		super(alias, org.jooq.util.hsqldb.information_schema.InformationSchema.INFORMATION_SCHEMA, org.jooq.util.hsqldb.information_schema.tables.KeyColumnUsage.KEY_COLUMN_USAGE);
 	}
 
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/tables/Parameters.java b/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/tables/Parameters.java
index 3804fed9af..d479c31660 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/tables/Parameters.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/tables/Parameters.java
@@ -6,11 +6,11 @@ package org.jooq.util.hsqldb.information_schema.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class Parameters extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = -1754858560;
+	private static final long serialVersionUID = 1543475117;
 
 	/**
 	 * The singleton instance of INFORMATION_SCHEMA.PARAMETERS
@@ -230,17 +230,11 @@ public class Parameters extends org.jooq.impl.TableImpl<org.jooq.Record> {
 	 */
 	public final org.jooq.TableField<org.jooq.Record, java.lang.Long> DECLARED_NUMERIC_SCALE = createField("DECLARED_NUMERIC_SCALE", org.jooq.impl.SQLDataType.BIGINT, this);
 
-	/**
-	 * No further instances allowed
-	 */
-	private Parameters() {
+	public Parameters() {
 		super("PARAMETERS", org.jooq.util.hsqldb.information_schema.InformationSchema.INFORMATION_SCHEMA);
 	}
 
-	/**
-	 * No further instances allowed
-	 */
-	private Parameters(java.lang.String alias) {
+	public Parameters(java.lang.String alias) {
 		super(alias, org.jooq.util.hsqldb.information_schema.InformationSchema.INFORMATION_SCHEMA, org.jooq.util.hsqldb.information_schema.tables.Parameters.PARAMETERS);
 	}
 
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/tables/ReferentialConstraints.java b/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/tables/ReferentialConstraints.java
index fcd343fc6c..a563486388 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/tables/ReferentialConstraints.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/tables/ReferentialConstraints.java
@@ -6,11 +6,11 @@ package org.jooq.util.hsqldb.information_schema.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class ReferentialConstraints extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = 131895180;
+	private static final long serialVersionUID = -1952528247;
 
 	/**
 	 * The singleton instance of INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS
@@ -75,17 +75,11 @@ public class ReferentialConstraints extends org.jooq.impl.TableImpl<org.jooq.Rec
 	 */
 	public final org.jooq.TableField<org.jooq.Record, java.lang.String> DELETE_RULE = createField("DELETE_RULE", org.jooq.impl.SQLDataType.VARCHAR, this);
 
-	/**
-	 * No further instances allowed
-	 */
-	private ReferentialConstraints() {
+	public ReferentialConstraints() {
 		super("REFERENTIAL_CONSTRAINTS", org.jooq.util.hsqldb.information_schema.InformationSchema.INFORMATION_SCHEMA);
 	}
 
-	/**
-	 * No further instances allowed
-	 */
-	private ReferentialConstraints(java.lang.String alias) {
+	public ReferentialConstraints(java.lang.String alias) {
 		super(alias, org.jooq.util.hsqldb.information_schema.InformationSchema.INFORMATION_SCHEMA, org.jooq.util.hsqldb.information_schema.tables.ReferentialConstraints.REFERENTIAL_CONSTRAINTS);
 	}
 
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/tables/Routines.java b/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/tables/Routines.java
index b62697e8d2..84f418441d 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/tables/Routines.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/tables/Routines.java
@@ -6,11 +6,11 @@ package org.jooq.util.hsqldb.information_schema.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class Routines extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = -1452312172;
+	private static final long serialVersionUID = -106550271;
 
 	/**
 	 * The singleton instance of INFORMATION_SCHEMA.ROUTINES
@@ -470,17 +470,11 @@ public class Routines extends org.jooq.impl.TableImpl<org.jooq.Record> {
 	 */
 	public final org.jooq.TableField<org.jooq.Record, java.lang.Long> RESULT_CAST_DECLARED_NUMERIC_SCALE = createField("RESULT_CAST_DECLARED_NUMERIC_SCALE", org.jooq.impl.SQLDataType.BIGINT, this);
 
-	/**
-	 * No further instances allowed
-	 */
-	private Routines() {
+	public Routines() {
 		super("ROUTINES", org.jooq.util.hsqldb.information_schema.InformationSchema.INFORMATION_SCHEMA);
 	}
 
-	/**
-	 * No further instances allowed
-	 */
-	private Routines(java.lang.String alias) {
+	public Routines(java.lang.String alias) {
 		super(alias, org.jooq.util.hsqldb.information_schema.InformationSchema.INFORMATION_SCHEMA, org.jooq.util.hsqldb.information_schema.tables.Routines.ROUTINES);
 	}
 
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/tables/Schemata.java b/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/tables/Schemata.java
new file mode 100644
index 0000000000..7fac6473a8
--- /dev/null
+++ b/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/tables/Schemata.java
@@ -0,0 +1,80 @@
+/**
+ * This class is generated by jOOQ
+ */
+package org.jooq.util.hsqldb.information_schema.tables;
+
+/**
+ * This class is generated by jOOQ.
+ */
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
+                            comments = "This class is generated by jOOQ")
+public class Schemata extends org.jooq.impl.TableImpl<org.jooq.Record> {
+
+	private static final long serialVersionUID = 2070767037;
+
+	/**
+	 * The singleton instance of INFORMATION_SCHEMA.SCHEMATA
+	 */
+	public static final org.jooq.util.hsqldb.information_schema.tables.Schemata SCHEMATA = new org.jooq.util.hsqldb.information_schema.tables.Schemata();
+
+	/**
+	 * The class holding records for this type
+	 */
+	private static final java.lang.Class<org.jooq.Record> __RECORD_TYPE = org.jooq.Record.class;
+
+	/**
+	 * The class holding records for this type
+	 */
+	@Override
+	public java.lang.Class<org.jooq.Record> getRecordType() {
+		return __RECORD_TYPE;
+	}
+
+	/**
+	 * An uncommented item
+	 */
+	public final org.jooq.TableField<org.jooq.Record, java.lang.String> CATALOG_NAME = createField("CATALOG_NAME", org.jooq.impl.SQLDataType.VARCHAR, this);
+
+	/**
+	 * An uncommented item
+	 */
+	public final org.jooq.TableField<org.jooq.Record, java.lang.String> SCHEMA_NAME = createField("SCHEMA_NAME", org.jooq.impl.SQLDataType.VARCHAR, this);
+
+	/**
+	 * An uncommented item
+	 */
+	public final org.jooq.TableField<org.jooq.Record, java.lang.String> SCHEMA_OWNER = createField("SCHEMA_OWNER", org.jooq.impl.SQLDataType.VARCHAR, this);
+
+	/**
+	 * An uncommented item
+	 */
+	public final org.jooq.TableField<org.jooq.Record, java.lang.String> DEFAULT_CHARACTER_SET_CATALOG = createField("DEFAULT_CHARACTER_SET_CATALOG", org.jooq.impl.SQLDataType.VARCHAR, this);
+
+	/**
+	 * An uncommented item
+	 */
+	public final org.jooq.TableField<org.jooq.Record, java.lang.String> DEFAULT_CHARACTER_SET_SCHEMA = createField("DEFAULT_CHARACTER_SET_SCHEMA", org.jooq.impl.SQLDataType.VARCHAR, this);
+
+	/**
+	 * An uncommented item
+	 */
+	public final org.jooq.TableField<org.jooq.Record, java.lang.String> DEFAULT_CHARACTER_SET_NAME = createField("DEFAULT_CHARACTER_SET_NAME", org.jooq.impl.SQLDataType.VARCHAR, this);
+
+	/**
+	 * An uncommented item
+	 */
+	public final org.jooq.TableField<org.jooq.Record, java.lang.String> SQL_PATH = createField("SQL_PATH", org.jooq.impl.SQLDataType.VARCHAR, this);
+
+	public Schemata() {
+		super("SCHEMATA", org.jooq.util.hsqldb.information_schema.InformationSchema.INFORMATION_SCHEMA);
+	}
+
+	public Schemata(java.lang.String alias) {
+		super(alias, org.jooq.util.hsqldb.information_schema.InformationSchema.INFORMATION_SCHEMA, org.jooq.util.hsqldb.information_schema.tables.Schemata.SCHEMATA);
+	}
+
+	@Override
+	public org.jooq.util.hsqldb.information_schema.tables.Schemata as(java.lang.String alias) {
+		return new org.jooq.util.hsqldb.information_schema.tables.Schemata(alias);
+	}
+}
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/tables/Sequences.java b/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/tables/Sequences.java
index d5eb38635d..28bdabb4b5 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/tables/Sequences.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/tables/Sequences.java
@@ -6,11 +6,11 @@ package org.jooq.util.hsqldb.information_schema.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class Sequences extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = -1921557034;
+	private static final long serialVersionUID = -616213725;
 
 	/**
 	 * The singleton instance of INFORMATION_SCHEMA.SEQUENCES
@@ -110,17 +110,11 @@ public class Sequences extends org.jooq.impl.TableImpl<org.jooq.Record> {
 	 */
 	public final org.jooq.TableField<org.jooq.Record, java.lang.String> NEXT_VALUE = createField("NEXT_VALUE", org.jooq.impl.SQLDataType.VARCHAR, this);
 
-	/**
-	 * No further instances allowed
-	 */
-	private Sequences() {
+	public Sequences() {
 		super("SEQUENCES", org.jooq.util.hsqldb.information_schema.InformationSchema.INFORMATION_SCHEMA);
 	}
 
-	/**
-	 * No further instances allowed
-	 */
-	private Sequences(java.lang.String alias) {
+	public Sequences(java.lang.String alias) {
 		super(alias, org.jooq.util.hsqldb.information_schema.InformationSchema.INFORMATION_SCHEMA, org.jooq.util.hsqldb.information_schema.tables.Sequences.SEQUENCES);
 	}
 
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/tables/TableConstraints.java b/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/tables/TableConstraints.java
index 825cad2cfd..3e9e68fb2e 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/tables/TableConstraints.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/tables/TableConstraints.java
@@ -6,11 +6,11 @@ package org.jooq.util.hsqldb.information_schema.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class TableConstraints extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = 1342081192;
+	private static final long serialVersionUID = -522229083;
 
 	/**
 	 * The singleton instance of INFORMATION_SCHEMA.TABLE_CONSTRAINTS
@@ -75,17 +75,11 @@ public class TableConstraints extends org.jooq.impl.TableImpl<org.jooq.Record> {
 	 */
 	public final org.jooq.TableField<org.jooq.Record, java.lang.String> INITIALLY_DEFERRED = createField("INITIALLY_DEFERRED", org.jooq.impl.SQLDataType.VARCHAR, this);
 
-	/**
-	 * No further instances allowed
-	 */
-	private TableConstraints() {
+	public TableConstraints() {
 		super("TABLE_CONSTRAINTS", org.jooq.util.hsqldb.information_schema.InformationSchema.INFORMATION_SCHEMA);
 	}
 
-	/**
-	 * No further instances allowed
-	 */
-	private TableConstraints(java.lang.String alias) {
+	public TableConstraints(java.lang.String alias) {
 		super(alias, org.jooq.util.hsqldb.information_schema.InformationSchema.INFORMATION_SCHEMA, org.jooq.util.hsqldb.information_schema.tables.TableConstraints.TABLE_CONSTRAINTS);
 	}
 
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/tables/Tables.java b/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/tables/Tables.java
index 410711f748..6f51f4dc89 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/tables/Tables.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/tables/Tables.java
@@ -6,11 +6,11 @@ package org.jooq.util.hsqldb.information_schema.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class Tables extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = -332419757;
+	private static final long serialVersionUID = -415539098;
 
 	/**
 	 * The singleton instance of INFORMATION_SCHEMA.TABLES
@@ -90,17 +90,11 @@ public class Tables extends org.jooq.impl.TableImpl<org.jooq.Record> {
 	 */
 	public final org.jooq.TableField<org.jooq.Record, java.lang.String> COMMIT_ACTION = createField("COMMIT_ACTION", org.jooq.impl.SQLDataType.VARCHAR, this);
 
-	/**
-	 * No further instances allowed
-	 */
-	private Tables() {
+	public Tables() {
 		super("TABLES", org.jooq.util.hsqldb.information_schema.InformationSchema.INFORMATION_SCHEMA);
 	}
 
-	/**
-	 * No further instances allowed
-	 */
-	private Tables(java.lang.String alias) {
+	public Tables(java.lang.String alias) {
 		super(alias, org.jooq.util.hsqldb.information_schema.InformationSchema.INFORMATION_SCHEMA, org.jooq.util.hsqldb.information_schema.tables.Tables.TABLES);
 	}
 
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/ingres/IngresDatabase.java b/jOOQ-meta/src/main/java/org/jooq/util/ingres/IngresDatabase.java
index 41bf22f5f8..5500662429 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/ingres/IngresDatabase.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/ingres/IngresDatabase.java
@@ -36,14 +36,15 @@
 package org.jooq.util.ingres;
 
 import static org.jooq.impl.Factory.trim;
-import static org.jooq.util.ingres.ingres.tables.IiconstraintIndexes.IICONSTRAINT_INDEXES;
-import static org.jooq.util.ingres.ingres.tables.Iiconstraints.IICONSTRAINTS;
-import static org.jooq.util.ingres.ingres.tables.IidbComments.IIDB_COMMENTS;
-import static org.jooq.util.ingres.ingres.tables.IiindexColumns.IIINDEX_COLUMNS;
-import static org.jooq.util.ingres.ingres.tables.Iiindexes.IIINDEXES;
-import static org.jooq.util.ingres.ingres.tables.IirefConstraints.IIREF_CONSTRAINTS;
-import static org.jooq.util.ingres.ingres.tables.Iisequences.IISEQUENCES;
-import static org.jooq.util.ingres.ingres.tables.Iitables.IITABLES;
+import static org.jooq.util.ingres.ingres.Tables.IICONSTRAINTS;
+import static org.jooq.util.ingres.ingres.Tables.IICONSTRAINT_INDEXES;
+import static org.jooq.util.ingres.ingres.Tables.IIDB_COMMENTS;
+import static org.jooq.util.ingres.ingres.Tables.IIINDEXES;
+import static org.jooq.util.ingres.ingres.Tables.IIINDEX_COLUMNS;
+import static org.jooq.util.ingres.ingres.Tables.IIREF_CONSTRAINTS;
+import static org.jooq.util.ingres.ingres.Tables.IISCHEMA;
+import static org.jooq.util.ingres.ingres.Tables.IISEQUENCES;
+import static org.jooq.util.ingres.ingres.Tables.IITABLES;
 
 import java.sql.SQLException;
 import java.util.ArrayList;
@@ -73,6 +74,7 @@ import org.jooq.util.ingres.ingres.tables.IidbComments;
 import org.jooq.util.ingres.ingres.tables.IiindexColumns;
 import org.jooq.util.ingres.ingres.tables.Iiindexes;
 import org.jooq.util.ingres.ingres.tables.IirefConstraints;
+import org.jooq.util.ingres.ingres.tables.Iischema;
 import org.jooq.util.ingres.ingres.tables.Iisequences;
 import org.jooq.util.ingres.ingres.tables.Iitables;
 
@@ -192,6 +194,21 @@ public class IngresDatabase extends AbstractDatabase {
         }
     }
 
+    @Override
+    protected List<SchemaDefinition> getSchemata0() throws SQLException {
+        List<SchemaDefinition> result = new ArrayList<SchemaDefinition>();
+
+        for (String name : create()
+                .select(trim(Iischema.SCHEMA_NAME))
+                .from(IISCHEMA)
+                .fetch(trim(Iischema.SCHEMA_NAME))) {
+
+            result.add(new SchemaDefinition(this, name, ""));
+        }
+
+        return result;
+    }
+
     @Override
     protected List<SequenceDefinition> getSequences0() throws SQLException {
         List<SequenceDefinition> result = new ArrayList<SequenceDefinition>();
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/$ingres.java b/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/$ingres.java
index 7e1d8a6594..eb300919c9 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/$ingres.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/$ingres.java
@@ -6,11 +6,11 @@ package org.jooq.util.ingres.ingres;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class $ingres extends org.jooq.impl.SchemaImpl {
 
-	private static final long serialVersionUID = 826778745;
+	private static final long serialVersionUID = 234779151;
 
 	/**
 	 * The singleton instance of $ingres
@@ -35,6 +35,7 @@ public class $ingres extends org.jooq.impl.SchemaImpl {
 			org.jooq.util.ingres.ingres.tables.IiindexColumns.IIINDEX_COLUMNS,
 			org.jooq.util.ingres.ingres.tables.Iiindexes.IIINDEXES,
 			org.jooq.util.ingres.ingres.tables.IirefConstraints.IIREF_CONSTRAINTS,
+			org.jooq.util.ingres.ingres.tables.Iischema.IISCHEMA,
 			org.jooq.util.ingres.ingres.tables.Iisequences.IISEQUENCES,
 			org.jooq.util.ingres.ingres.tables.Iitables.IITABLES);
 	}
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/$ingresFactory.java b/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/$ingresFactory.java
index 7c6635300b..8b34adcdb0 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/$ingresFactory.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/$ingresFactory.java
@@ -6,11 +6,11 @@ package org.jooq.util.ingres.ingres;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class $ingresFactory extends org.jooq.util.ingres.IngresFactory {
 
-	private static final long serialVersionUID = -365695075;
+	private static final long serialVersionUID = -706112998;
 
 	/**
 	 * Create a factory with a connection
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/Tables.java b/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/Tables.java
index 0051d20275..ea99ab18f9 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/Tables.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/Tables.java
@@ -8,7 +8,7 @@ package org.jooq.util.ingres.ingres;
  *
  * Convenience access to all tables in $ingres
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public final class Tables {
 
@@ -52,6 +52,11 @@ public final class Tables {
 	 */
 	public static org.jooq.util.ingres.ingres.tables.IirefConstraints IIREF_CONSTRAINTS = org.jooq.util.ingres.ingres.tables.IirefConstraints.IIREF_CONSTRAINTS;
 
+	/**
+	 * The table $ingres.iischema
+	 */
+	public static org.jooq.util.ingres.ingres.tables.Iischema IISCHEMA = org.jooq.util.ingres.ingres.tables.Iischema.IISCHEMA;
+
 	/**
 	 * The table $ingres.iisequences
 	 */
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/Iicolumns.java b/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/Iicolumns.java
index 3b272d1333..6a1301fab9 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/Iicolumns.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/Iicolumns.java
@@ -6,11 +6,11 @@ package org.jooq.util.ingres.ingres.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class Iicolumns extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = 399159632;
+	private static final long serialVersionUID = -1656823053;
 
 	/**
 	 * The singleton instance of $ingres.iicolumns
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/IiconstraintIndexes.java b/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/IiconstraintIndexes.java
index 523726b1a4..c51cb6f902 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/IiconstraintIndexes.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/IiconstraintIndexes.java
@@ -6,11 +6,11 @@ package org.jooq.util.ingres.ingres.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class IiconstraintIndexes extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = -1150393142;
+	private static final long serialVersionUID = 1510850887;
 
 	/**
 	 * The singleton instance of $ingres.iiconstraint_indexes
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/Iiconstraints.java b/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/Iiconstraints.java
index 8438abebfd..ef96b0a68d 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/Iiconstraints.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/Iiconstraints.java
@@ -6,11 +6,11 @@ package org.jooq.util.ingres.ingres.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class Iiconstraints extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = 1625126507;
+	private static final long serialVersionUID = -1937760754;
 
 	/**
 	 * The singleton instance of $ingres.iiconstraints
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/IidbComments.java b/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/IidbComments.java
index ac75b3722c..19f8892680 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/IidbComments.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/IidbComments.java
@@ -6,11 +6,11 @@ package org.jooq.util.ingres.ingres.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class IidbComments extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = 433892058;
+	private static final long serialVersionUID = -567029315;
 
 	/**
 	 * The singleton instance of $ingres.iidb_comments
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/IidbSubcomments.java b/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/IidbSubcomments.java
index b765434b53..2453e6d598 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/IidbSubcomments.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/IidbSubcomments.java
@@ -6,11 +6,11 @@ package org.jooq.util.ingres.ingres.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class IidbSubcomments extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = -554011227;
+	private static final long serialVersionUID = 2036963656;
 
 	/**
 	 * The singleton instance of $ingres.iidb_subcomments
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/IiindexColumns.java b/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/IiindexColumns.java
index fb654ee027..f64194de7a 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/IiindexColumns.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/IiindexColumns.java
@@ -6,11 +6,11 @@ package org.jooq.util.ingres.ingres.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class IiindexColumns extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = -235957163;
+	private static final long serialVersionUID = -1151911432;
 
 	/**
 	 * The singleton instance of $ingres.iiindex_columns
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/Iiindexes.java b/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/Iiindexes.java
index ca924ca4a1..f7c052b2f2 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/Iiindexes.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/Iiindexes.java
@@ -6,11 +6,11 @@ package org.jooq.util.ingres.ingres.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class Iiindexes extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = -1000725289;
+	private static final long serialVersionUID = -1955489580;
 
 	/**
 	 * The singleton instance of $ingres.iiindexes
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/IirefConstraints.java b/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/IirefConstraints.java
index b5a327e974..1abff88a29 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/IirefConstraints.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/IirefConstraints.java
@@ -6,11 +6,11 @@ package org.jooq.util.ingres.ingres.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class IirefConstraints extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = 1093351088;
+	private static final long serialVersionUID = -1717541779;
 
 	/**
 	 * The singleton instance of $ingres.iiref_constraints
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/Iischema.java b/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/Iischema.java
new file mode 100644
index 0000000000..be50176ac9
--- /dev/null
+++ b/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/Iischema.java
@@ -0,0 +1,59 @@
+/**
+ * This class is generated by jOOQ
+ */
+package org.jooq.util.ingres.ingres.tables;
+
+/**
+ * This class is generated by jOOQ.
+ */
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
+                            comments = "This class is generated by jOOQ")
+public class Iischema extends org.jooq.impl.TableImpl<org.jooq.Record> {
+
+	private static final long serialVersionUID = -861714426;
+
+	/**
+	 * The singleton instance of $ingres.iischema
+	 */
+	public static final org.jooq.util.ingres.ingres.tables.Iischema IISCHEMA = new org.jooq.util.ingres.ingres.tables.Iischema();
+
+	/**
+	 * The class holding records for this type
+	 */
+	private static final java.lang.Class<org.jooq.Record> __RECORD_TYPE = org.jooq.Record.class;
+
+	/**
+	 * The class holding records for this type
+	 */
+	@Override
+	public java.lang.Class<org.jooq.Record> getRecordType() {
+		return __RECORD_TYPE;
+	}
+
+	/**
+	 * An uncommented item
+	 */
+	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> SCHEMA_NAME = createField("schema_name", org.jooq.impl.SQLDataType.CHAR, IISCHEMA);
+
+	/**
+	 * An uncommented item
+	 */
+	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> SCHEMA_OWNER = createField("schema_owner", org.jooq.impl.SQLDataType.CHAR, IISCHEMA);
+
+	/**
+	 * An uncommented item
+	 */
+	public static final org.jooq.TableField<org.jooq.Record, java.lang.Integer> SCHEMA_ID = createField("schema_id", org.jooq.impl.SQLDataType.INTEGER, IISCHEMA);
+
+	/**
+	 * An uncommented item
+	 */
+	public static final org.jooq.TableField<org.jooq.Record, java.lang.Integer> SCHEMA_IDX = createField("schema_idx", org.jooq.impl.SQLDataType.INTEGER, IISCHEMA);
+
+	/**
+	 * No further instances allowed
+	 */
+	private Iischema() {
+		super("iischema", org.jooq.util.ingres.ingres.$ingres.$INGRES);
+	}
+}
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/Iisequences.java b/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/Iisequences.java
index 8795784419..c5d8295574 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/Iisequences.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/Iisequences.java
@@ -6,11 +6,11 @@ package org.jooq.util.ingres.ingres.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class Iisequences extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = -280129123;
+	private static final long serialVersionUID = -157414528;
 
 	/**
 	 * The singleton instance of $ingres.iisequences
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/Iitables.java b/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/Iitables.java
index e9c3c9102b..c06aecfc88 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/Iitables.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/Iitables.java
@@ -6,11 +6,11 @@ package org.jooq.util.ingres.ingres.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class Iitables extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = -1753068701;
+	private static final long serialVersionUID = -1953759392;
 
 	/**
 	 * The singleton instance of $ingres.iitables
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/mysql/MySQLDatabase.java b/jOOQ-meta/src/main/java/org/jooq/util/mysql/MySQLDatabase.java
index 9a5c215f41..98f8c8eab3 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/mysql/MySQLDatabase.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/mysql/MySQLDatabase.java
@@ -36,11 +36,12 @@
 
 package org.jooq.util.mysql;
 
-import static org.jooq.util.mysql.information_schema.tables.Columns.COLUMNS;
-import static org.jooq.util.mysql.information_schema.tables.KeyColumnUsage.KEY_COLUMN_USAGE;
-import static org.jooq.util.mysql.information_schema.tables.ReferentialConstraints.REFERENTIAL_CONSTRAINTS;
-import static org.jooq.util.mysql.information_schema.tables.TableConstraints.TABLE_CONSTRAINTS;
-import static org.jooq.util.mysql.information_schema.tables.Tables.TABLES;
+import static org.jooq.util.mysql.information_schema.Tables.COLUMNS;
+import static org.jooq.util.mysql.information_schema.Tables.KEY_COLUMN_USAGE;
+import static org.jooq.util.mysql.information_schema.Tables.REFERENTIAL_CONSTRAINTS;
+import static org.jooq.util.mysql.information_schema.Tables.SCHEMATA;
+import static org.jooq.util.mysql.information_schema.Tables.TABLES;
+import static org.jooq.util.mysql.information_schema.Tables.TABLE_CONSTRAINTS;
 import static org.jooq.util.mysql.mysql.tables.Proc.DB;
 import static org.jooq.util.mysql.mysql.tables.Proc.PROC;
 
@@ -66,6 +67,7 @@ import org.jooq.util.UDTDefinition;
 import org.jooq.util.mysql.information_schema.tables.Columns;
 import org.jooq.util.mysql.information_schema.tables.KeyColumnUsage;
 import org.jooq.util.mysql.information_schema.tables.ReferentialConstraints;
+import org.jooq.util.mysql.information_schema.tables.Schemata;
 import org.jooq.util.mysql.information_schema.tables.TableConstraints;
 import org.jooq.util.mysql.information_schema.tables.Tables;
 import org.jooq.util.mysql.mysql.tables.Proc;
@@ -174,6 +176,21 @@ public class MySQLDatabase extends AbstractDatabase {
         }
     }
 
+    @Override
+    protected List<SchemaDefinition> getSchemata0() throws SQLException {
+        List<SchemaDefinition> result = new ArrayList<SchemaDefinition>();
+
+        for (String name : create()
+                .select(Schemata.SCHEMA_NAME)
+                .from(SCHEMATA)
+                .fetch(Schemata.SCHEMA_NAME)) {
+
+            result.add(new SchemaDefinition(this, name, ""));
+        }
+
+        return result;
+    }
+
     @Override
     protected List<SequenceDefinition> getSequences0() throws SQLException {
         List<SequenceDefinition> result = new ArrayList<SequenceDefinition>();
@@ -243,7 +260,7 @@ public class MySQLDatabase extends AbstractDatabase {
                 ColumnDefinition columnDefinition = tableDefinition.getColumn(column);
 
                 if (columnDefinition != null) {
-                	
+
                 	// [#1137] Avoid generating enum classes for enum types that
                 	// are explicitly forced to another type
                     if (getConfiguredForcedType(columnDefinition) == null) {
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/InformationSchema.java b/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/InformationSchema.java
index 5d00c2fb5a..2faf27f81b 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/InformationSchema.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/InformationSchema.java
@@ -6,11 +6,11 @@ package org.jooq.util.mysql.information_schema;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class InformationSchema extends org.jooq.impl.SchemaImpl {
 
-	private static final long serialVersionUID = 1515994441;
+	private static final long serialVersionUID = 1202806093;
 
 	/**
 	 * The singleton instance of information_schema
@@ -30,6 +30,7 @@ public class InformationSchema extends org.jooq.impl.SchemaImpl {
 			org.jooq.util.mysql.information_schema.tables.Columns.COLUMNS,
 			org.jooq.util.mysql.information_schema.tables.KeyColumnUsage.KEY_COLUMN_USAGE,
 			org.jooq.util.mysql.information_schema.tables.ReferentialConstraints.REFERENTIAL_CONSTRAINTS,
+			org.jooq.util.mysql.information_schema.tables.Schemata.SCHEMATA,
 			org.jooq.util.mysql.information_schema.tables.Tables.TABLES,
 			org.jooq.util.mysql.information_schema.tables.TableConstraints.TABLE_CONSTRAINTS);
 	}
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/InformationSchemaFactory.java b/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/InformationSchemaFactory.java
index d7c6da0942..b3e13e8827 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/InformationSchemaFactory.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/InformationSchemaFactory.java
@@ -6,11 +6,11 @@ package org.jooq.util.mysql.information_schema;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class InformationSchemaFactory extends org.jooq.util.mysql.MySQLFactory {
 
-	private static final long serialVersionUID = -515696430;
+	private static final long serialVersionUID = -1777054257;
 
 	/**
 	 * Create a factory with a connection
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/Tables.java b/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/Tables.java
index 4d964fa6d2..6a4e6c32c7 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/Tables.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/Tables.java
@@ -8,7 +8,7 @@ package org.jooq.util.mysql.information_schema;
  *
  * Convenience access to all tables in information_schema
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public final class Tables {
 
@@ -27,6 +27,11 @@ public final class Tables {
 	 */
 	public static org.jooq.util.mysql.information_schema.tables.ReferentialConstraints REFERENTIAL_CONSTRAINTS = org.jooq.util.mysql.information_schema.tables.ReferentialConstraints.REFERENTIAL_CONSTRAINTS;
 
+	/**
+	 * The table information_schema.SCHEMATA
+	 */
+	public static org.jooq.util.mysql.information_schema.tables.Schemata SCHEMATA = org.jooq.util.mysql.information_schema.tables.Schemata.SCHEMATA;
+
 	/**
 	 * The table information_schema.TABLES
 	 */
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/tables/Columns.java b/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/tables/Columns.java
index 4ede642887..0d33226058 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/tables/Columns.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/tables/Columns.java
@@ -6,11 +6,11 @@ package org.jooq.util.mysql.information_schema.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class Columns extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = -473450104;
+	private static final long serialVersionUID = -1648345275;
 
 	/**
 	 * The singleton instance of information_schema.COLUMNS
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/tables/KeyColumnUsage.java b/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/tables/KeyColumnUsage.java
index d8ae2c83b3..a028499c7c 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/tables/KeyColumnUsage.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/tables/KeyColumnUsage.java
@@ -6,11 +6,11 @@ package org.jooq.util.mysql.information_schema.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class KeyColumnUsage extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = -1224002655;
+	private static final long serialVersionUID = 1925558878;
 
 	/**
 	 * The singleton instance of information_schema.KEY_COLUMN_USAGE
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/tables/ReferentialConstraints.java b/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/tables/ReferentialConstraints.java
index 061ae2e3de..8af8eba7f2 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/tables/ReferentialConstraints.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/tables/ReferentialConstraints.java
@@ -6,11 +6,11 @@ package org.jooq.util.mysql.information_schema.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class ReferentialConstraints extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = 55957718;
+	private static final long serialVersionUID = 1019556307;
 
 	/**
 	 * The singleton instance of information_schema.REFERENTIAL_CONSTRAINTS
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/tables/Schemata.java b/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/tables/Schemata.java
new file mode 100644
index 0000000000..76ae079fc3
--- /dev/null
+++ b/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/tables/Schemata.java
@@ -0,0 +1,64 @@
+/**
+ * This class is generated by jOOQ
+ */
+package org.jooq.util.mysql.information_schema.tables;
+
+/**
+ * This class is generated by jOOQ.
+ */
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
+                            comments = "This class is generated by jOOQ")
+public class Schemata extends org.jooq.impl.TableImpl<org.jooq.Record> {
+
+	private static final long serialVersionUID = -842759611;
+
+	/**
+	 * The singleton instance of information_schema.SCHEMATA
+	 */
+	public static final org.jooq.util.mysql.information_schema.tables.Schemata SCHEMATA = new org.jooq.util.mysql.information_schema.tables.Schemata();
+
+	/**
+	 * The class holding records for this type
+	 */
+	private static final java.lang.Class<org.jooq.Record> __RECORD_TYPE = org.jooq.Record.class;
+
+	/**
+	 * The class holding records for this type
+	 */
+	@Override
+	public java.lang.Class<org.jooq.Record> getRecordType() {
+		return __RECORD_TYPE;
+	}
+
+	/**
+	 * An uncommented item
+	 */
+	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> CATALOG_NAME = createField("CATALOG_NAME", org.jooq.impl.SQLDataType.VARCHAR, SCHEMATA);
+
+	/**
+	 * An uncommented item
+	 */
+	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> SCHEMA_NAME = createField("SCHEMA_NAME", org.jooq.impl.SQLDataType.VARCHAR, SCHEMATA);
+
+	/**
+	 * An uncommented item
+	 */
+	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> DEFAULT_CHARACTER_SET_NAME = createField("DEFAULT_CHARACTER_SET_NAME", org.jooq.impl.SQLDataType.VARCHAR, SCHEMATA);
+
+	/**
+	 * An uncommented item
+	 */
+	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> DEFAULT_COLLATION_NAME = createField("DEFAULT_COLLATION_NAME", org.jooq.impl.SQLDataType.VARCHAR, SCHEMATA);
+
+	/**
+	 * An uncommented item
+	 */
+	public static final org.jooq.TableField<org.jooq.Record, java.lang.String> SQL_PATH = createField("SQL_PATH", org.jooq.impl.SQLDataType.VARCHAR, SCHEMATA);
+
+	/**
+	 * No further instances allowed
+	 */
+	private Schemata() {
+		super("SCHEMATA", org.jooq.util.mysql.information_schema.InformationSchema.INFORMATION_SCHEMA);
+	}
+}
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/tables/TableConstraints.java b/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/tables/TableConstraints.java
index c86438dadf..39a35ff670 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/tables/TableConstraints.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/tables/TableConstraints.java
@@ -6,11 +6,11 @@ package org.jooq.util.mysql.information_schema.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class TableConstraints extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = -1287073714;
+	private static final long serialVersionUID = -1623096079;
 
 	/**
 	 * The singleton instance of information_schema.TABLE_CONSTRAINTS
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/tables/Tables.java b/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/tables/Tables.java
index 1259206282..e7efa6bdf6 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/tables/Tables.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/tables/Tables.java
@@ -6,11 +6,11 @@ package org.jooq.util.mysql.information_schema.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class Tables extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = -722007800;
+	private static final long serialVersionUID = 553216517;
 
 	/**
 	 * The singleton instance of information_schema.TABLES
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/oracle/OracleDatabase.java b/jOOQ-meta/src/main/java/org/jooq/util/oracle/OracleDatabase.java
index 1199fca8a3..a2254d7848 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/oracle/OracleDatabase.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/oracle/OracleDatabase.java
@@ -43,6 +43,7 @@ import static org.jooq.util.oracle.sys.Tables.ALL_OBJECTS;
 import static org.jooq.util.oracle.sys.Tables.ALL_SEQUENCES;
 import static org.jooq.util.oracle.sys.Tables.ALL_TAB_COMMENTS;
 import static org.jooq.util.oracle.sys.Tables.ALL_TYPES;
+import static org.jooq.util.oracle.sys.Tables.ALL_USERS;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
@@ -172,6 +173,21 @@ public class OracleDatabase extends AbstractDatabase {
         }
     }
 
+    @Override
+    protected List<SchemaDefinition> getSchemata0() throws SQLException {
+        List<SchemaDefinition> result = new ArrayList<SchemaDefinition>();
+
+        for (String name : create()
+                .selectDistinct(ALL_USERS.USERNAME)
+                .from(ALL_USERS)
+                .fetch(ALL_USERS.USERNAME)) {
+
+            result.add(new SchemaDefinition(this, name, ""));
+        }
+
+        return result;
+    }
+
     /**
      * {@inheritDoc}
      */
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/Sys.java b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/Sys.java
index f43914e62a..5844cf922a 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/Sys.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/Sys.java
@@ -6,11 +6,11 @@ package org.jooq.util.oracle.sys;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class Sys extends org.jooq.impl.SchemaImpl {
 
-	private static final long serialVersionUID = -2003889206;
+	private static final long serialVersionUID = 1503809982;
 
 	/**
 	 * The singleton instance of SYS
@@ -38,6 +38,7 @@ public class Sys extends org.jooq.impl.SchemaImpl {
 			org.jooq.util.oracle.sys.tables.AllTabCols.ALL_TAB_COLS,
 			org.jooq.util.oracle.sys.tables.AllTabComments.ALL_TAB_COMMENTS,
 			org.jooq.util.oracle.sys.tables.AllTypeAttrs.ALL_TYPE_ATTRS,
-			org.jooq.util.oracle.sys.tables.AllTypes.ALL_TYPES);
+			org.jooq.util.oracle.sys.tables.AllTypes.ALL_TYPES,
+			org.jooq.util.oracle.sys.tables.AllUsers.ALL_USERS);
 	}
 }
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/SysFactory.java b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/SysFactory.java
index 759156a546..381dbdd662 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/SysFactory.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/SysFactory.java
@@ -6,11 +6,11 @@ package org.jooq.util.oracle.sys;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class SysFactory extends org.jooq.util.oracle.OracleFactory {
 
-	private static final long serialVersionUID = 1588893751;
+	private static final long serialVersionUID = -1512813004;
 
 	/**
 	 * Create a factory with a connection
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/Tables.java b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/Tables.java
index 71d273d896..9769a80039 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/Tables.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/Tables.java
@@ -8,7 +8,7 @@ package org.jooq.util.oracle.sys;
  *
  * Convenience access to all tables in SYS
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public final class Tables {
 
@@ -72,6 +72,11 @@ public final class Tables {
 	 */
 	public static org.jooq.util.oracle.sys.tables.AllTypes ALL_TYPES = org.jooq.util.oracle.sys.tables.AllTypes.ALL_TYPES;
 
+	/**
+	 * Information about all users of the database
+	 */
+	public static org.jooq.util.oracle.sys.tables.AllUsers ALL_USERS = org.jooq.util.oracle.sys.tables.AllUsers.ALL_USERS;
+
 	/**
 	 * No instances
 	 */
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllArguments.java b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllArguments.java
index 6aee2ba13e..e24ea25cf1 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllArguments.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllArguments.java
@@ -8,11 +8,11 @@ package org.jooq.util.oracle.sys.tables;
  *
  * Arguments in object accessible to the user
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class AllArguments extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = 766409551;
+	private static final long serialVersionUID = -593371790;
 
 	/**
 	 * The singleton instance of SYS.ALL_ARGUMENTS
@@ -167,17 +167,11 @@ public class AllArguments extends org.jooq.impl.TableImpl<org.jooq.Record> {
 	 */
 	public final org.jooq.TableField<org.jooq.Record, java.lang.String> CHAR_USED = createField("CHAR_USED", org.jooq.impl.SQLDataType.VARCHAR, this);
 
-	/**
-	 * No further instances allowed
-	 */
-	private AllArguments() {
+	public AllArguments() {
 		super("ALL_ARGUMENTS", org.jooq.util.oracle.sys.Sys.SYS);
 	}
 
-	/**
-	 * No further instances allowed
-	 */
-	private AllArguments(java.lang.String alias) {
+	public AllArguments(java.lang.String alias) {
 		super(alias, org.jooq.util.oracle.sys.Sys.SYS, org.jooq.util.oracle.sys.tables.AllArguments.ALL_ARGUMENTS);
 	}
 
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllColComments.java b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllColComments.java
index fc5964eb53..45ae8c4a3f 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllColComments.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllColComments.java
@@ -8,11 +8,11 @@ package org.jooq.util.oracle.sys.tables;
  *
  * Comments on columns of accessible tables and views
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class AllColComments extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = 354918751;
+	private static final long serialVersionUID = -731363694;
 
 	/**
 	 * The singleton instance of SYS.ALL_COL_COMMENTS
@@ -52,17 +52,11 @@ public class AllColComments extends org.jooq.impl.TableImpl<org.jooq.Record> {
 	 */
 	public final org.jooq.TableField<org.jooq.Record, java.lang.String> COMMENTS = createField("COMMENTS", org.jooq.impl.SQLDataType.VARCHAR, this);
 
-	/**
-	 * No further instances allowed
-	 */
-	private AllColComments() {
+	public AllColComments() {
 		super("ALL_COL_COMMENTS", org.jooq.util.oracle.sys.Sys.SYS);
 	}
 
-	/**
-	 * No further instances allowed
-	 */
-	private AllColComments(java.lang.String alias) {
+	public AllColComments(java.lang.String alias) {
 		super(alias, org.jooq.util.oracle.sys.Sys.SYS, org.jooq.util.oracle.sys.tables.AllColComments.ALL_COL_COMMENTS);
 	}
 
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllCollTypes.java b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllCollTypes.java
index 8318018960..3dd57ce86d 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllCollTypes.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllCollTypes.java
@@ -8,11 +8,11 @@ package org.jooq.util.oracle.sys.tables;
  *
  * Description of named collection types accessible to the user
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class AllCollTypes extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = -1534142998;
+	private static final long serialVersionUID = -2014095779;
 
 	/**
 	 * The singleton instance of SYS.ALL_COLL_TYPES
@@ -104,17 +104,11 @@ binary precision of the FLOAT element
 	 */
 	public final org.jooq.TableField<org.jooq.Record, java.lang.String> CHAR_USED = createField("CHAR_USED", org.jooq.impl.SQLDataType.VARCHAR, this);
 
-	/**
-	 * No further instances allowed
-	 */
-	private AllCollTypes() {
+	public AllCollTypes() {
 		super("ALL_COLL_TYPES", org.jooq.util.oracle.sys.Sys.SYS);
 	}
 
-	/**
-	 * No further instances allowed
-	 */
-	private AllCollTypes(java.lang.String alias) {
+	public AllCollTypes(java.lang.String alias) {
 		super(alias, org.jooq.util.oracle.sys.Sys.SYS, org.jooq.util.oracle.sys.tables.AllCollTypes.ALL_COLL_TYPES);
 	}
 
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllConsColumns.java b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllConsColumns.java
index bac7a4e303..fca2e4718a 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllConsColumns.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllConsColumns.java
@@ -8,11 +8,11 @@ package org.jooq.util.oracle.sys.tables;
  *
  * Information about accessible columns in constraint definitions
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class AllConsColumns extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = -708290058;
+	private static final long serialVersionUID = 1678303875;
 
 	/**
 	 * The singleton instance of SYS.ALL_CONS_COLUMNS
@@ -57,17 +57,11 @@ public class AllConsColumns extends org.jooq.impl.TableImpl<org.jooq.Record> {
 	 */
 	public final org.jooq.TableField<org.jooq.Record, java.math.BigDecimal> POSITION = createField("POSITION", org.jooq.impl.SQLDataType.NUMERIC, this);
 
-	/**
-	 * No further instances allowed
-	 */
-	private AllConsColumns() {
+	public AllConsColumns() {
 		super("ALL_CONS_COLUMNS", org.jooq.util.oracle.sys.Sys.SYS);
 	}
 
-	/**
-	 * No further instances allowed
-	 */
-	private AllConsColumns(java.lang.String alias) {
+	public AllConsColumns(java.lang.String alias) {
 		super(alias, org.jooq.util.oracle.sys.Sys.SYS, org.jooq.util.oracle.sys.tables.AllConsColumns.ALL_CONS_COLUMNS);
 	}
 
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllConstraints.java b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllConstraints.java
index 682cab7cb8..961ac047e6 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllConstraints.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllConstraints.java
@@ -8,11 +8,11 @@ package org.jooq.util.oracle.sys.tables;
  *
  * Constraint definitions on accessible tables
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class AllConstraints extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = -323067263;
+	private static final long serialVersionUID = 446957732;
 
 	/**
 	 * The singleton instance of SYS.ALL_CONSTRAINTS
@@ -132,17 +132,11 @@ public class AllConstraints extends org.jooq.impl.TableImpl<org.jooq.Record> {
 	 */
 	public final org.jooq.TableField<org.jooq.Record, java.lang.String> VIEW_RELATED = createField("VIEW_RELATED", org.jooq.impl.SQLDataType.VARCHAR, this);
 
-	/**
-	 * No further instances allowed
-	 */
-	private AllConstraints() {
+	public AllConstraints() {
 		super("ALL_CONSTRAINTS", org.jooq.util.oracle.sys.Sys.SYS);
 	}
 
-	/**
-	 * No further instances allowed
-	 */
-	private AllConstraints(java.lang.String alias) {
+	public AllConstraints(java.lang.String alias) {
 		super(alias, org.jooq.util.oracle.sys.Sys.SYS, org.jooq.util.oracle.sys.tables.AllConstraints.ALL_CONSTRAINTS);
 	}
 
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllObjects.java b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllObjects.java
index 0695220ac4..c2105225ff 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllObjects.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllObjects.java
@@ -8,11 +8,11 @@ package org.jooq.util.oracle.sys.tables;
  *
  * Objects accessible to the user
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class AllObjects extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = 137778950;
+	private static final long serialVersionUID = -1937295293;
 
 	/**
 	 * The singleton instance of SYS.ALL_OBJECTS
@@ -107,17 +107,11 @@ public class AllObjects extends org.jooq.impl.TableImpl<org.jooq.Record> {
 	 */
 	public final org.jooq.TableField<org.jooq.Record, java.lang.String> EDITION_NAME = createField("EDITION_NAME", org.jooq.impl.SQLDataType.VARCHAR, this);
 
-	/**
-	 * No further instances allowed
-	 */
-	private AllObjects() {
+	public AllObjects() {
 		super("ALL_OBJECTS", org.jooq.util.oracle.sys.Sys.SYS);
 	}
 
-	/**
-	 * No further instances allowed
-	 */
-	private AllObjects(java.lang.String alias) {
+	public AllObjects(java.lang.String alias) {
 		super(alias, org.jooq.util.oracle.sys.Sys.SYS, org.jooq.util.oracle.sys.tables.AllObjects.ALL_OBJECTS);
 	}
 
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllProcedures.java b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllProcedures.java
index a374de9b92..0b7f4f7584 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllProcedures.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllProcedures.java
@@ -8,11 +8,11 @@ package org.jooq.util.oracle.sys.tables;
  *
  * Functions/procedures/packages/types/triggers available to the user
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class AllProcedures extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = 2039929463;
+	private static final long serialVersionUID = 50718836;
 
 	/**
 	 * The singleton instance of SYS.ALL_PROCEDURES
@@ -107,17 +107,11 @@ public class AllProcedures extends org.jooq.impl.TableImpl<org.jooq.Record> {
 	 */
 	public final org.jooq.TableField<org.jooq.Record, java.lang.String> AUTHID = createField("AUTHID", org.jooq.impl.SQLDataType.VARCHAR, this);
 
-	/**
-	 * No further instances allowed
-	 */
-	private AllProcedures() {
+	public AllProcedures() {
 		super("ALL_PROCEDURES", org.jooq.util.oracle.sys.Sys.SYS);
 	}
 
-	/**
-	 * No further instances allowed
-	 */
-	private AllProcedures(java.lang.String alias) {
+	public AllProcedures(java.lang.String alias) {
 		super(alias, org.jooq.util.oracle.sys.Sys.SYS, org.jooq.util.oracle.sys.tables.AllProcedures.ALL_PROCEDURES);
 	}
 
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllSequences.java b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllSequences.java
index 3ffbde4cb2..cf7126fd43 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllSequences.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllSequences.java
@@ -8,11 +8,11 @@ package org.jooq.util.oracle.sys.tables;
  *
  * Description of SEQUENCEs accessible to the user
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class AllSequences extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = -1227013911;
+	private static final long serialVersionUID = 218635558;
 
 	/**
 	 * The singleton instance of SYS.ALL_SEQUENCES
@@ -77,17 +77,11 @@ public class AllSequences extends org.jooq.impl.TableImpl<org.jooq.Record> {
 	 */
 	public final org.jooq.TableField<org.jooq.Record, java.math.BigDecimal> LAST_NUMBER = createField("LAST_NUMBER", org.jooq.impl.SQLDataType.NUMERIC, this);
 
-	/**
-	 * No further instances allowed
-	 */
-	private AllSequences() {
+	public AllSequences() {
 		super("ALL_SEQUENCES", org.jooq.util.oracle.sys.Sys.SYS);
 	}
 
-	/**
-	 * No further instances allowed
-	 */
-	private AllSequences(java.lang.String alias) {
+	public AllSequences(java.lang.String alias) {
 		super(alias, org.jooq.util.oracle.sys.Sys.SYS, org.jooq.util.oracle.sys.tables.AllSequences.ALL_SEQUENCES);
 	}
 
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllTabCols.java b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllTabCols.java
index e7eb24d1f0..40604c53b2 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllTabCols.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllTabCols.java
@@ -8,11 +8,11 @@ package org.jooq.util.oracle.sys.tables;
  *
  * Columns of user's tables, views and clusters
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class AllTabCols extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = -434173049;
+	private static final long serialVersionUID = 831744570;
 
 	/**
 	 * The singleton instance of SYS.ALL_TAB_COLS
@@ -212,17 +212,11 @@ public class AllTabCols extends org.jooq.impl.TableImpl<org.jooq.Record> {
 	 */
 	public final org.jooq.TableField<org.jooq.Record, java.lang.String> QUALIFIED_COL_NAME = createField("QUALIFIED_COL_NAME", org.jooq.impl.SQLDataType.VARCHAR, this);
 
-	/**
-	 * No further instances allowed
-	 */
-	private AllTabCols() {
+	public AllTabCols() {
 		super("ALL_TAB_COLS", org.jooq.util.oracle.sys.Sys.SYS);
 	}
 
-	/**
-	 * No further instances allowed
-	 */
-	private AllTabCols(java.lang.String alias) {
+	public AllTabCols(java.lang.String alias) {
 		super(alias, org.jooq.util.oracle.sys.Sys.SYS, org.jooq.util.oracle.sys.tables.AllTabCols.ALL_TAB_COLS);
 	}
 
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllTabComments.java b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllTabComments.java
index a3fc42340c..42b1515402 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllTabComments.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllTabComments.java
@@ -8,11 +8,11 @@ package org.jooq.util.oracle.sys.tables;
  *
  * Comments on tables and views accessible to the user
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class AllTabComments extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = 2106465;
+	private static final long serialVersionUID = -2132342956;
 
 	/**
 	 * The singleton instance of SYS.ALL_TAB_COMMENTS
@@ -52,17 +52,11 @@ public class AllTabComments extends org.jooq.impl.TableImpl<org.jooq.Record> {
 	 */
 	public final org.jooq.TableField<org.jooq.Record, java.lang.String> COMMENTS = createField("COMMENTS", org.jooq.impl.SQLDataType.VARCHAR, this);
 
-	/**
-	 * No further instances allowed
-	 */
-	private AllTabComments() {
+	public AllTabComments() {
 		super("ALL_TAB_COMMENTS", org.jooq.util.oracle.sys.Sys.SYS);
 	}
 
-	/**
-	 * No further instances allowed
-	 */
-	private AllTabComments(java.lang.String alias) {
+	public AllTabComments(java.lang.String alias) {
 		super(alias, org.jooq.util.oracle.sys.Sys.SYS, org.jooq.util.oracle.sys.tables.AllTabComments.ALL_TAB_COMMENTS);
 	}
 
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllTypeAttrs.java b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllTypeAttrs.java
index 893b3fec46..86336a6a31 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllTypeAttrs.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllTypeAttrs.java
@@ -8,11 +8,11 @@ package org.jooq.util.oracle.sys.tables;
  *
  * Description of attributes of types accessible to the user
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class AllTypeAttrs extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = 1378271050;
+	private static final long serialVersionUID = 1814817559;
 
 	/**
 	 * The singleton instance of SYS.ALL_TYPE_ATTRS
@@ -100,17 +100,11 @@ type specification or CREATE TYPE statement (not to be used as ID number)
 	 */
 	public final org.jooq.TableField<org.jooq.Record, java.lang.String> CHAR_USED = createField("CHAR_USED", org.jooq.impl.SQLDataType.VARCHAR, this);
 
-	/**
-	 * No further instances allowed
-	 */
-	private AllTypeAttrs() {
+	public AllTypeAttrs() {
 		super("ALL_TYPE_ATTRS", org.jooq.util.oracle.sys.Sys.SYS);
 	}
 
-	/**
-	 * No further instances allowed
-	 */
-	private AllTypeAttrs(java.lang.String alias) {
+	public AllTypeAttrs(java.lang.String alias) {
 		super(alias, org.jooq.util.oracle.sys.Sys.SYS, org.jooq.util.oracle.sys.tables.AllTypeAttrs.ALL_TYPE_ATTRS);
 	}
 
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllTypes.java b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllTypes.java
index e4691fa036..b8626fe7cc 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllTypes.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllTypes.java
@@ -8,11 +8,11 @@ package org.jooq.util.oracle.sys.tables;
  *
  * Description of types accessible to the user
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class AllTypes extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = 1461505327;
+	private static final long serialVersionUID = -499083732;
 
 	/**
 	 * The singleton instance of SYS.ALL_TYPES
@@ -107,17 +107,11 @@ public class AllTypes extends org.jooq.impl.TableImpl<org.jooq.Record> {
 	 */
 	public final org.jooq.TableField<org.jooq.Record, byte[]> TYPEID = createField("TYPEID", org.jooq.impl.SQLDataType.BLOB, this);
 
-	/**
-	 * No further instances allowed
-	 */
-	private AllTypes() {
+	public AllTypes() {
 		super("ALL_TYPES", org.jooq.util.oracle.sys.Sys.SYS);
 	}
 
-	/**
-	 * No further instances allowed
-	 */
-	private AllTypes(java.lang.String alias) {
+	public AllTypes(java.lang.String alias) {
 		super(alias, org.jooq.util.oracle.sys.Sys.SYS, org.jooq.util.oracle.sys.tables.AllTypes.ALL_TYPES);
 	}
 
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllUsers.java b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllUsers.java
new file mode 100644
index 0000000000..d7ae909045
--- /dev/null
+++ b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/AllUsers.java
@@ -0,0 +1,62 @@
+/**
+ * This class is generated by jOOQ
+ */
+package org.jooq.util.oracle.sys.tables;
+
+/**
+ * This class is generated by jOOQ.
+ *
+ * Information about all users of the database
+ */
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
+                            comments = "This class is generated by jOOQ")
+public class AllUsers extends org.jooq.impl.TableImpl<org.jooq.Record> {
+
+	private static final long serialVersionUID = -896221969;
+
+	/**
+	 * The singleton instance of SYS.ALL_USERS
+	 */
+	public static final org.jooq.util.oracle.sys.tables.AllUsers ALL_USERS = new org.jooq.util.oracle.sys.tables.AllUsers();
+
+	/**
+	 * The class holding records for this type
+	 */
+	private static final java.lang.Class<org.jooq.Record> __RECORD_TYPE = org.jooq.Record.class;
+
+	/**
+	 * The class holding records for this type
+	 */
+	@Override
+	public java.lang.Class<org.jooq.Record> getRecordType() {
+		return __RECORD_TYPE;
+	}
+
+	/**
+	 * Name of the user
+	 */
+	public final org.jooq.TableField<org.jooq.Record, java.lang.String> USERNAME = createField("USERNAME", org.jooq.impl.SQLDataType.VARCHAR, this);
+
+	/**
+	 * ID number of the user
+	 */
+	public final org.jooq.TableField<org.jooq.Record, java.math.BigDecimal> USER_ID = createField("USER_ID", org.jooq.impl.SQLDataType.NUMERIC, this);
+
+	/**
+	 * User creation date
+	 */
+	public final org.jooq.TableField<org.jooq.Record, java.sql.Date> CREATED = createField("CREATED", org.jooq.impl.SQLDataType.DATE, this);
+
+	public AllUsers() {
+		super("ALL_USERS", org.jooq.util.oracle.sys.Sys.SYS);
+	}
+
+	public AllUsers(java.lang.String alias) {
+		super(alias, org.jooq.util.oracle.sys.Sys.SYS, org.jooq.util.oracle.sys.tables.AllUsers.ALL_USERS);
+	}
+
+	@Override
+	public org.jooq.util.oracle.sys.tables.AllUsers as(java.lang.String alias) {
+		return new org.jooq.util.oracle.sys.tables.AllUsers(alias);
+	}
+}
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/udt/records/OraMiningNumberNtRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/udt/records/OraMiningNumberNtRecord.java
index b91257c7cb..c46825f0f6 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/udt/records/OraMiningNumberNtRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/udt/records/OraMiningNumberNtRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.oracle.sys.udt.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class OraMiningNumberNtRecord extends org.jooq.impl.ArrayRecordImpl<java.math.BigDecimal> {
 
-	private static final long serialVersionUID = 1398345589;
+	private static final long serialVersionUID = -1708656270;
 
 	public OraMiningNumberNtRecord(org.jooq.Configuration configuration) {
 		super(org.jooq.util.oracle.sys.Sys.SYS, "ORA_MINING_NUMBER_NT", org.jooq.impl.SQLDataType.NUMERIC, configuration);
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/udt/records/OraMiningVarchar2NtRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/udt/records/OraMiningVarchar2NtRecord.java
index b22343e4c9..830a96f6b9 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/udt/records/OraMiningVarchar2NtRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/udt/records/OraMiningVarchar2NtRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.oracle.sys.udt.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class OraMiningVarchar2NtRecord extends org.jooq.impl.ArrayRecordImpl<java.lang.String> {
 
-	private static final long serialVersionUID = -155688449;
+	private static final long serialVersionUID = 860071740;
 
 	public OraMiningVarchar2NtRecord(org.jooq.Configuration configuration) {
 		super(org.jooq.util.oracle.sys.Sys.SYS, "ORA_MINING_VARCHAR2_NT", org.jooq.impl.SQLDataType.VARCHAR, configuration);
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/postgres/PostgresDatabase.java b/jOOQ-meta/src/main/java/org/jooq/util/postgres/PostgresDatabase.java
index acfb43ac7f..acb381c409 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/postgres/PostgresDatabase.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/PostgresDatabase.java
@@ -46,6 +46,7 @@ import static org.jooq.util.postgres.information_schema.Tables.KEY_COLUMN_USAGE;
 import static org.jooq.util.postgres.information_schema.Tables.PARAMETERS;
 import static org.jooq.util.postgres.information_schema.Tables.REFERENTIAL_CONSTRAINTS;
 import static org.jooq.util.postgres.information_schema.Tables.ROUTINES;
+import static org.jooq.util.postgres.information_schema.Tables.SCHEMATA;
 import static org.jooq.util.postgres.information_schema.Tables.SEQUENCES;
 import static org.jooq.util.postgres.information_schema.Tables.TABLES;
 import static org.jooq.util.postgres.information_schema.Tables.TABLE_CONSTRAINTS;
@@ -207,6 +208,21 @@ public class PostgresDatabase extends AbstractDatabase {
         return result;
     }
 
+    @Override
+    protected List<SchemaDefinition> getSchemata0() throws SQLException {
+        List<SchemaDefinition> result = new ArrayList<SchemaDefinition>();
+
+        for (String name : create()
+                .select(SCHEMATA.SCHEMA_NAME)
+                .from(SCHEMATA)
+                .fetch(SCHEMATA.SCHEMA_NAME)) {
+
+            result.add(new SchemaDefinition(this, name, ""));
+        }
+
+        return result;
+    }
+
     @Override
     protected List<SequenceDefinition> getSequences0() throws SQLException {
         List<SequenceDefinition> result = new ArrayList<SequenceDefinition>();
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/InformationSchema.java b/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/InformationSchema.java
index e51247d37f..623734666a 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/InformationSchema.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/InformationSchema.java
@@ -6,11 +6,11 @@ package org.jooq.util.postgres.information_schema;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class InformationSchema extends org.jooq.impl.SchemaImpl {
 
-	private static final long serialVersionUID = -41433549;
+	private static final long serialVersionUID = -1703119320;
 
 	/**
 	 * The singleton instance of information_schema
@@ -34,6 +34,7 @@ public class InformationSchema extends org.jooq.impl.SchemaImpl {
 			org.jooq.util.postgres.information_schema.tables.Parameters.PARAMETERS,
 			org.jooq.util.postgres.information_schema.tables.ReferentialConstraints.REFERENTIAL_CONSTRAINTS,
 			org.jooq.util.postgres.information_schema.tables.Routines.ROUTINES,
+			org.jooq.util.postgres.information_schema.tables.Schemata.SCHEMATA,
 			org.jooq.util.postgres.information_schema.tables.Sequences.SEQUENCES,
 			org.jooq.util.postgres.information_schema.tables.TableConstraints.TABLE_CONSTRAINTS,
 			org.jooq.util.postgres.information_schema.tables.Tables.TABLES);
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/InformationSchemaFactory.java b/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/InformationSchemaFactory.java
index 4b13216412..1dd125eeb4 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/InformationSchemaFactory.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/InformationSchemaFactory.java
@@ -6,11 +6,11 @@ package org.jooq.util.postgres.information_schema;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class InformationSchemaFactory extends org.jooq.util.postgres.PostgresFactory {
 
-	private static final long serialVersionUID = -749061501;
+	private static final long serialVersionUID = -218300992;
 
 	/**
 	 * Create a factory with a connection
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/Tables.java b/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/Tables.java
index 140096a11f..eb72774d4a 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/Tables.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/Tables.java
@@ -8,7 +8,7 @@ package org.jooq.util.postgres.information_schema;
  *
  * Convenience access to all tables in information_schema
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public final class Tables {
 
@@ -47,6 +47,11 @@ public final class Tables {
 	 */
 	public static org.jooq.util.postgres.information_schema.tables.Routines ROUTINES = org.jooq.util.postgres.information_schema.tables.Routines.ROUTINES;
 
+	/**
+	 * The table information_schema.schemata
+	 */
+	public static org.jooq.util.postgres.information_schema.tables.Schemata SCHEMATA = org.jooq.util.postgres.information_schema.tables.Schemata.SCHEMATA;
+
 	/**
 	 * The table information_schema.sequences
 	 */
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/tables/Attributes.java b/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/tables/Attributes.java
index 41b3ee6abb..baf20b064a 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/tables/Attributes.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/tables/Attributes.java
@@ -6,11 +6,11 @@ package org.jooq.util.postgres.information_schema.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class Attributes extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = -1137587038;
+	private static final long serialVersionUID = -2035012785;
 
 	/**
 	 * The singleton instance of information_schema.attributes
@@ -185,17 +185,11 @@ public class Attributes extends org.jooq.impl.TableImpl<org.jooq.Record> {
 	 */
 	public final org.jooq.TableField<org.jooq.Record, java.lang.String> IS_DERIVED_REFERENCE_ATTRIBUTE = createField("is_derived_reference_attribute", org.jooq.impl.SQLDataType.VARCHAR, this);
 
-	/**
-	 * No further instances allowed
-	 */
-	private Attributes() {
+	public Attributes() {
 		super("attributes", org.jooq.util.postgres.information_schema.InformationSchema.INFORMATION_SCHEMA);
 	}
 
-	/**
-	 * No further instances allowed
-	 */
-	private Attributes(java.lang.String alias) {
+	public Attributes(java.lang.String alias) {
 		super(alias, org.jooq.util.postgres.information_schema.InformationSchema.INFORMATION_SCHEMA, org.jooq.util.postgres.information_schema.tables.Attributes.ATTRIBUTES);
 	}
 
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/tables/Columns.java b/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/tables/Columns.java
index 76da343998..ae9ea35505 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/tables/Columns.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/tables/Columns.java
@@ -6,11 +6,11 @@ package org.jooq.util.postgres.information_schema.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class Columns extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = -1744083245;
+	private static final long serialVersionUID = -1449466938;
 
 	/**
 	 * The singleton instance of information_schema.columns
@@ -250,17 +250,11 @@ public class Columns extends org.jooq.impl.TableImpl<org.jooq.Record> {
 	 */
 	public final org.jooq.TableField<org.jooq.Record, java.lang.String> IS_UPDATABLE = createField("is_updatable", org.jooq.impl.SQLDataType.VARCHAR, this);
 
-	/**
-	 * No further instances allowed
-	 */
-	private Columns() {
+	public Columns() {
 		super("columns", org.jooq.util.postgres.information_schema.InformationSchema.INFORMATION_SCHEMA);
 	}
 
-	/**
-	 * No further instances allowed
-	 */
-	private Columns(java.lang.String alias) {
+	public Columns(java.lang.String alias) {
 		super(alias, org.jooq.util.postgres.information_schema.InformationSchema.INFORMATION_SCHEMA, org.jooq.util.postgres.information_schema.tables.Columns.COLUMNS);
 	}
 
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/tables/ConstraintColumnUsage.java b/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/tables/ConstraintColumnUsage.java
index a3b5118bf4..74873708d8 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/tables/ConstraintColumnUsage.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/tables/ConstraintColumnUsage.java
@@ -6,11 +6,11 @@ package org.jooq.util.postgres.information_schema.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class ConstraintColumnUsage extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = 1455273794;
+	private static final long serialVersionUID = 1803784143;
 
 	/**
 	 * The singleton instance of information_schema.constraint_column_usage
@@ -65,17 +65,11 @@ public class ConstraintColumnUsage extends org.jooq.impl.TableImpl<org.jooq.Reco
 	 */
 	public final org.jooq.TableField<org.jooq.Record, java.lang.String> CONSTRAINT_NAME = createField("constraint_name", org.jooq.impl.SQLDataType.VARCHAR, this);
 
-	/**
-	 * No further instances allowed
-	 */
-	private ConstraintColumnUsage() {
+	public ConstraintColumnUsage() {
 		super("constraint_column_usage", org.jooq.util.postgres.information_schema.InformationSchema.INFORMATION_SCHEMA);
 	}
 
-	/**
-	 * No further instances allowed
-	 */
-	private ConstraintColumnUsage(java.lang.String alias) {
+	public ConstraintColumnUsage(java.lang.String alias) {
 		super(alias, org.jooq.util.postgres.information_schema.InformationSchema.INFORMATION_SCHEMA, org.jooq.util.postgres.information_schema.tables.ConstraintColumnUsage.CONSTRAINT_COLUMN_USAGE);
 	}
 
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/tables/KeyColumnUsage.java b/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/tables/KeyColumnUsage.java
index 52993c8186..7c1c0eaa75 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/tables/KeyColumnUsage.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/tables/KeyColumnUsage.java
@@ -6,11 +6,11 @@ package org.jooq.util.postgres.information_schema.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class KeyColumnUsage extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = 1442149778;
+	private static final long serialVersionUID = 1076836159;
 
 	/**
 	 * The singleton instance of information_schema.key_column_usage
@@ -75,17 +75,11 @@ public class KeyColumnUsage extends org.jooq.impl.TableImpl<org.jooq.Record> {
 	 */
 	public final org.jooq.TableField<org.jooq.Record, java.lang.Integer> POSITION_IN_UNIQUE_CONSTRAINT = createField("position_in_unique_constraint", org.jooq.impl.SQLDataType.INTEGER, this);
 
-	/**
-	 * No further instances allowed
-	 */
-	private KeyColumnUsage() {
+	public KeyColumnUsage() {
 		super("key_column_usage", org.jooq.util.postgres.information_schema.InformationSchema.INFORMATION_SCHEMA);
 	}
 
-	/**
-	 * No further instances allowed
-	 */
-	private KeyColumnUsage(java.lang.String alias) {
+	public KeyColumnUsage(java.lang.String alias) {
 		super(alias, org.jooq.util.postgres.information_schema.InformationSchema.INFORMATION_SCHEMA, org.jooq.util.postgres.information_schema.tables.KeyColumnUsage.KEY_COLUMN_USAGE);
 	}
 
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/tables/Parameters.java b/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/tables/Parameters.java
index 10e1c69628..a88cdff7e1 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/tables/Parameters.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/tables/Parameters.java
@@ -6,11 +6,11 @@ package org.jooq.util.postgres.information_schema.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class Parameters extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = -1336731788;
+	private static final long serialVersionUID = 1311358497;
 
 	/**
 	 * The singleton instance of information_schema.parameters
@@ -185,17 +185,11 @@ public class Parameters extends org.jooq.impl.TableImpl<org.jooq.Record> {
 	 */
 	public final org.jooq.TableField<org.jooq.Record, java.lang.String> DTD_IDENTIFIER = createField("dtd_identifier", org.jooq.impl.SQLDataType.VARCHAR, this);
 
-	/**
-	 * No further instances allowed
-	 */
-	private Parameters() {
+	public Parameters() {
 		super("parameters", org.jooq.util.postgres.information_schema.InformationSchema.INFORMATION_SCHEMA);
 	}
 
-	/**
-	 * No further instances allowed
-	 */
-	private Parameters(java.lang.String alias) {
+	public Parameters(java.lang.String alias) {
 		super(alias, org.jooq.util.postgres.information_schema.InformationSchema.INFORMATION_SCHEMA, org.jooq.util.postgres.information_schema.tables.Parameters.PARAMETERS);
 	}
 
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/tables/ReferentialConstraints.java b/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/tables/ReferentialConstraints.java
index 16d38d6fdf..233354217a 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/tables/ReferentialConstraints.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/tables/ReferentialConstraints.java
@@ -6,11 +6,11 @@ package org.jooq.util.postgres.information_schema.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class ReferentialConstraints extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = -977220222;
+	private static final long serialVersionUID = 2106777407;
 
 	/**
 	 * The singleton instance of information_schema.referential_constraints
@@ -75,17 +75,11 @@ public class ReferentialConstraints extends org.jooq.impl.TableImpl<org.jooq.Rec
 	 */
 	public final org.jooq.TableField<org.jooq.Record, java.lang.String> DELETE_RULE = createField("delete_rule", org.jooq.impl.SQLDataType.VARCHAR, this);
 
-	/**
-	 * No further instances allowed
-	 */
-	private ReferentialConstraints() {
+	public ReferentialConstraints() {
 		super("referential_constraints", org.jooq.util.postgres.information_schema.InformationSchema.INFORMATION_SCHEMA);
 	}
 
-	/**
-	 * No further instances allowed
-	 */
-	private ReferentialConstraints(java.lang.String alias) {
+	public ReferentialConstraints(java.lang.String alias) {
 		super(alias, org.jooq.util.postgres.information_schema.InformationSchema.INFORMATION_SCHEMA, org.jooq.util.postgres.information_schema.tables.ReferentialConstraints.REFERENTIAL_CONSTRAINTS);
 	}
 
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/tables/Routines.java b/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/tables/Routines.java
index 93c90861b1..d8341437dc 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/tables/Routines.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/tables/Routines.java
@@ -6,11 +6,11 @@ package org.jooq.util.postgres.information_schema.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class Routines extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = -559240587;
+	private static final long serialVersionUID = -2081424798;
 
 	/**
 	 * The singleton instance of information_schema.routines
@@ -440,17 +440,11 @@ public class Routines extends org.jooq.impl.TableImpl<org.jooq.Record> {
 	 */
 	public final org.jooq.TableField<org.jooq.Record, java.lang.String> RESULT_CAST_DTD_IDENTIFIER = createField("result_cast_dtd_identifier", org.jooq.impl.SQLDataType.VARCHAR, this);
 
-	/**
-	 * No further instances allowed
-	 */
-	private Routines() {
+	public Routines() {
 		super("routines", org.jooq.util.postgres.information_schema.InformationSchema.INFORMATION_SCHEMA);
 	}
 
-	/**
-	 * No further instances allowed
-	 */
-	private Routines(java.lang.String alias) {
+	public Routines(java.lang.String alias) {
 		super(alias, org.jooq.util.postgres.information_schema.InformationSchema.INFORMATION_SCHEMA, org.jooq.util.postgres.information_schema.tables.Routines.ROUTINES);
 	}
 
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/tables/Schemata.java b/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/tables/Schemata.java
new file mode 100644
index 0000000000..cba4e3fa0d
--- /dev/null
+++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/tables/Schemata.java
@@ -0,0 +1,80 @@
+/**
+ * This class is generated by jOOQ
+ */
+package org.jooq.util.postgres.information_schema.tables;
+
+/**
+ * This class is generated by jOOQ.
+ */
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
+                            comments = "This class is generated by jOOQ")
+public class Schemata extends org.jooq.impl.TableImpl<org.jooq.Record> {
+
+	private static final long serialVersionUID = 1562782707;
+
+	/**
+	 * The singleton instance of information_schema.schemata
+	 */
+	public static final org.jooq.util.postgres.information_schema.tables.Schemata SCHEMATA = new org.jooq.util.postgres.information_schema.tables.Schemata();
+
+	/**
+	 * The class holding records for this type
+	 */
+	private static final java.lang.Class<org.jooq.Record> __RECORD_TYPE = org.jooq.Record.class;
+
+	/**
+	 * The class holding records for this type
+	 */
+	@Override
+	public java.lang.Class<org.jooq.Record> getRecordType() {
+		return __RECORD_TYPE;
+	}
+
+	/**
+	 * An uncommented item
+	 */
+	public final org.jooq.TableField<org.jooq.Record, java.lang.String> CATALOG_NAME = createField("catalog_name", org.jooq.impl.SQLDataType.VARCHAR, this);
+
+	/**
+	 * An uncommented item
+	 */
+	public final org.jooq.TableField<org.jooq.Record, java.lang.String> SCHEMA_NAME = createField("schema_name", org.jooq.impl.SQLDataType.VARCHAR, this);
+
+	/**
+	 * An uncommented item
+	 */
+	public final org.jooq.TableField<org.jooq.Record, java.lang.String> SCHEMA_OWNER = createField("schema_owner", org.jooq.impl.SQLDataType.VARCHAR, this);
+
+	/**
+	 * An uncommented item
+	 */
+	public final org.jooq.TableField<org.jooq.Record, java.lang.String> DEFAULT_CHARACTER_SET_CATALOG = createField("default_character_set_catalog", org.jooq.impl.SQLDataType.VARCHAR, this);
+
+	/**
+	 * An uncommented item
+	 */
+	public final org.jooq.TableField<org.jooq.Record, java.lang.String> DEFAULT_CHARACTER_SET_SCHEMA = createField("default_character_set_schema", org.jooq.impl.SQLDataType.VARCHAR, this);
+
+	/**
+	 * An uncommented item
+	 */
+	public final org.jooq.TableField<org.jooq.Record, java.lang.String> DEFAULT_CHARACTER_SET_NAME = createField("default_character_set_name", org.jooq.impl.SQLDataType.VARCHAR, this);
+
+	/**
+	 * An uncommented item
+	 */
+	public final org.jooq.TableField<org.jooq.Record, java.lang.String> SQL_PATH = createField("sql_path", org.jooq.impl.SQLDataType.VARCHAR, this);
+
+	public Schemata() {
+		super("schemata", org.jooq.util.postgres.information_schema.InformationSchema.INFORMATION_SCHEMA);
+	}
+
+	public Schemata(java.lang.String alias) {
+		super(alias, org.jooq.util.postgres.information_schema.InformationSchema.INFORMATION_SCHEMA, org.jooq.util.postgres.information_schema.tables.Schemata.SCHEMATA);
+	}
+
+	@Override
+	public org.jooq.util.postgres.information_schema.tables.Schemata as(java.lang.String alias) {
+		return new org.jooq.util.postgres.information_schema.tables.Schemata(alias);
+	}
+}
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/tables/Sequences.java b/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/tables/Sequences.java
index 47e97b8f48..7739a95f00 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/tables/Sequences.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/tables/Sequences.java
@@ -6,11 +6,11 @@ package org.jooq.util.postgres.information_schema.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class Sequences extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = 1106417154;
+	private static final long serialVersionUID = 1452802575;
 
 	/**
 	 * The singleton instance of information_schema.sequences
@@ -85,17 +85,11 @@ public class Sequences extends org.jooq.impl.TableImpl<org.jooq.Record> {
 	 */
 	public final org.jooq.TableField<org.jooq.Record, java.lang.String> CYCLE_OPTION = createField("cycle_option", org.jooq.impl.SQLDataType.VARCHAR, this);
 
-	/**
-	 * No further instances allowed
-	 */
-	private Sequences() {
+	public Sequences() {
 		super("sequences", org.jooq.util.postgres.information_schema.InformationSchema.INFORMATION_SCHEMA);
 	}
 
-	/**
-	 * No further instances allowed
-	 */
-	private Sequences(java.lang.String alias) {
+	public Sequences(java.lang.String alias) {
 		super(alias, org.jooq.util.postgres.information_schema.InformationSchema.INFORMATION_SCHEMA, org.jooq.util.postgres.information_schema.tables.Sequences.SEQUENCES);
 	}
 
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/tables/TableConstraints.java b/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/tables/TableConstraints.java
index 0c6031bcc7..7a1b23ad10 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/tables/TableConstraints.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/tables/TableConstraints.java
@@ -6,11 +6,11 @@ package org.jooq.util.postgres.information_schema.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class TableConstraints extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = -676936346;
+	private static final long serialVersionUID = 517453859;
 
 	/**
 	 * The singleton instance of information_schema.table_constraints
@@ -75,17 +75,11 @@ public class TableConstraints extends org.jooq.impl.TableImpl<org.jooq.Record> {
 	 */
 	public final org.jooq.TableField<org.jooq.Record, java.lang.String> INITIALLY_DEFERRED = createField("initially_deferred", org.jooq.impl.SQLDataType.VARCHAR, this);
 
-	/**
-	 * No further instances allowed
-	 */
-	private TableConstraints() {
+	public TableConstraints() {
 		super("table_constraints", org.jooq.util.postgres.information_schema.InformationSchema.INFORMATION_SCHEMA);
 	}
 
-	/**
-	 * No further instances allowed
-	 */
-	private TableConstraints(java.lang.String alias) {
+	public TableConstraints(java.lang.String alias) {
 		super(alias, org.jooq.util.postgres.information_schema.InformationSchema.INFORMATION_SCHEMA, org.jooq.util.postgres.information_schema.tables.TableConstraints.TABLE_CONSTRAINTS);
 	}
 
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/tables/Tables.java b/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/tables/Tables.java
index 218c919622..d26b55bccf 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/tables/Tables.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/tables/Tables.java
@@ -6,11 +6,11 @@ package org.jooq.util.postgres.information_schema.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class Tables extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = -621093537;
+	private static final long serialVersionUID = -299469390;
 
 	/**
 	 * The singleton instance of information_schema.tables
@@ -90,17 +90,11 @@ public class Tables extends org.jooq.impl.TableImpl<org.jooq.Record> {
 	 */
 	public final org.jooq.TableField<org.jooq.Record, java.lang.String> COMMIT_ACTION = createField("commit_action", org.jooq.impl.SQLDataType.VARCHAR, this);
 
-	/**
-	 * No further instances allowed
-	 */
-	private Tables() {
+	public Tables() {
 		super("tables", org.jooq.util.postgres.information_schema.InformationSchema.INFORMATION_SCHEMA);
 	}
 
-	/**
-	 * No further instances allowed
-	 */
-	private Tables(java.lang.String alias) {
+	public Tables(java.lang.String alias) {
 		super(alias, org.jooq.util.postgres.information_schema.InformationSchema.INFORMATION_SCHEMA, org.jooq.util.postgres.information_schema.tables.Tables.TABLES);
 	}
 
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/sqlite/SQLiteDatabase.java b/jOOQ-meta/src/main/java/org/jooq/util/sqlite/SQLiteDatabase.java
index dbfaecb92f..e3557cc608 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/sqlite/SQLiteDatabase.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/sqlite/SQLiteDatabase.java
@@ -52,6 +52,7 @@ import org.jooq.util.DefaultRelations;
 import org.jooq.util.EnumDefinition;
 import org.jooq.util.PackageDefinition;
 import org.jooq.util.RoutineDefinition;
+import org.jooq.util.SchemaDefinition;
 import org.jooq.util.SequenceDefinition;
 import org.jooq.util.TableDefinition;
 import org.jooq.util.UDTDefinition;
@@ -164,6 +165,13 @@ public class SQLiteDatabase extends AbstractDatabase {
         }
     }
 
+    @Override
+    protected List<SchemaDefinition> getSchemata0() throws SQLException {
+        List<SchemaDefinition> result = new ArrayList<SchemaDefinition>();
+        result.add(new SchemaDefinition(this, "", ""));
+        return result;
+    }
+
     @Override
     protected List<SequenceDefinition> getSequences0() throws SQLException {
         List<SequenceDefinition> result = new ArrayList<SequenceDefinition>();
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/SQLServerDatabase.java b/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/SQLServerDatabase.java
index dd1b6f3062..83f29159c9 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/SQLServerDatabase.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/SQLServerDatabase.java
@@ -39,6 +39,7 @@ package org.jooq.util.sqlserver;
 import static org.jooq.util.sqlserver.information_schema.Tables.KEY_COLUMN_USAGE;
 import static org.jooq.util.sqlserver.information_schema.Tables.REFERENTIAL_CONSTRAINTS;
 import static org.jooq.util.sqlserver.information_schema.Tables.ROUTINES;
+import static org.jooq.util.sqlserver.information_schema.Tables.SCHEMATA;
 import static org.jooq.util.sqlserver.information_schema.Tables.TABLES;
 import static org.jooq.util.sqlserver.information_schema.Tables.TABLE_CONSTRAINTS;
 
@@ -77,9 +78,6 @@ public class SQLServerDatabase extends AbstractDatabase {
         return new SQLServerFactory(getConnection());
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     protected void loadPrimaryKeys(DefaultRelations relations) throws SQLException {
         for (Record record : fetchKeys("PRIMARY KEY")) {
@@ -95,9 +93,6 @@ public class SQLServerDatabase extends AbstractDatabase {
         }
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     protected void loadUniqueKeys(DefaultRelations relations) throws SQLException {
         for (Record record : fetchKeys("UNIQUE")) {
@@ -134,9 +129,6 @@ public class SQLServerDatabase extends AbstractDatabase {
             .fetch();
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     protected void loadForeignKeys(DefaultRelations relations) throws SQLException {
         Result<Record> result = create()
@@ -177,17 +169,26 @@ public class SQLServerDatabase extends AbstractDatabase {
         }
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    @Override
+    protected List<SchemaDefinition> getSchemata0() throws SQLException {
+        List<SchemaDefinition> result = new ArrayList<SchemaDefinition>();
+
+        for (String name : create()
+                .select(SCHEMATA.SCHEMA_NAME)
+                .from(SCHEMATA)
+                .fetch(SCHEMATA.SCHEMA_NAME)) {
+
+            result.add(new SchemaDefinition(this, name, ""));
+        }
+
+        return result;
+    }
+
     @Override
     protected List<SequenceDefinition> getSequences0() throws SQLException {
         return Collections.emptyList();
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     protected List<TableDefinition> getTables0() throws SQLException {
         List<TableDefinition> result = new ArrayList<TableDefinition>();
@@ -213,27 +214,18 @@ public class SQLServerDatabase extends AbstractDatabase {
         return result;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     protected List<EnumDefinition> getEnums0() throws SQLException {
         List<EnumDefinition> result = new ArrayList<EnumDefinition>();
         return result;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     protected List<UDTDefinition> getUDTs0() throws SQLException {
         List<UDTDefinition> result = new ArrayList<UDTDefinition>();
         return result;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     protected List<ArrayDefinition> getArrays0() throws SQLException {
         List<ArrayDefinition> result = new ArrayList<ArrayDefinition>();
@@ -274,9 +266,6 @@ public class SQLServerDatabase extends AbstractDatabase {
         return result;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     protected List<PackageDefinition> getPackages0() throws SQLException {
         List<PackageDefinition> result = new ArrayList<PackageDefinition>();
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/information_schema/InformationSchema.java b/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/information_schema/InformationSchema.java
index 04d10361aa..53e1c4b324 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/information_schema/InformationSchema.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/information_schema/InformationSchema.java
@@ -6,11 +6,11 @@ package org.jooq.util.sqlserver.information_schema;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class InformationSchema extends org.jooq.impl.SchemaImpl {
 
-	private static final long serialVersionUID = 1945717581;
+	private static final long serialVersionUID = -761346686;
 
 	/**
 	 * The singleton instance of INFORMATION_SCHEMA
@@ -33,6 +33,7 @@ public class InformationSchema extends org.jooq.impl.SchemaImpl {
 			org.jooq.util.sqlserver.information_schema.tables.Parameters.PARAMETERS,
 			org.jooq.util.sqlserver.information_schema.tables.ReferentialConstraints.REFERENTIAL_CONSTRAINTS,
 			org.jooq.util.sqlserver.information_schema.tables.Routines.ROUTINES,
+			org.jooq.util.sqlserver.information_schema.tables.Schemata.SCHEMATA,
 			org.jooq.util.sqlserver.information_schema.tables.Sequences.SEQUENCES,
 			org.jooq.util.sqlserver.information_schema.tables.Tables.TABLES,
 			org.jooq.util.sqlserver.information_schema.tables.TableConstraints.TABLE_CONSTRAINTS);
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/information_schema/InformationSchemaFactory.java b/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/information_schema/InformationSchemaFactory.java
index 260abacd64..fd80a01080 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/information_schema/InformationSchemaFactory.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/information_schema/InformationSchemaFactory.java
@@ -6,11 +6,11 @@ package org.jooq.util.sqlserver.information_schema;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class InformationSchemaFactory extends org.jooq.util.hsqldb.HSQLDBFactory {
 
-	private static final long serialVersionUID = -615142229;
+	private static final long serialVersionUID = -1599236504;
 
 	/**
 	 * Create a factory with a connection
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/information_schema/Tables.java b/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/information_schema/Tables.java
index ca4803fe02..be87729e54 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/information_schema/Tables.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/information_schema/Tables.java
@@ -8,7 +8,7 @@ package org.jooq.util.sqlserver.information_schema;
  *
  * Convenience access to all tables in INFORMATION_SCHEMA
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public final class Tables {
 
@@ -42,6 +42,11 @@ public final class Tables {
 	 */
 	public static org.jooq.util.sqlserver.information_schema.tables.Routines ROUTINES = org.jooq.util.sqlserver.information_schema.tables.Routines.ROUTINES;
 
+	/**
+	 * The table INFORMATION_SCHEMA.SCHEMATA
+	 */
+	public static org.jooq.util.sqlserver.information_schema.tables.Schemata SCHEMATA = org.jooq.util.sqlserver.information_schema.tables.Schemata.SCHEMATA;
+
 	/**
 	 * The table INFORMATION_SCHEMA.SEQUENCES
 	 */
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/information_schema/tables/Columns.java b/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/information_schema/tables/Columns.java
index c36a3d2f0c..fb85a3f4f4 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/information_schema/tables/Columns.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/information_schema/tables/Columns.java
@@ -6,11 +6,11 @@ package org.jooq.util.sqlserver.information_schema.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class Columns extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = 185365021;
+	private static final long serialVersionUID = 606499034;
 
 	/**
 	 * The singleton instance of INFORMATION_SCHEMA.COLUMNS
@@ -265,17 +265,11 @@ public class Columns extends org.jooq.impl.TableImpl<org.jooq.Record> {
 	 */
 	public final org.jooq.TableField<org.jooq.Record, java.lang.Long> DECLARED_NUMERIC_SCALE = createField("DECLARED_NUMERIC_SCALE", org.jooq.impl.SQLDataType.BIGINT, this);
 
-	/**
-	 * No further instances allowed
-	 */
-	private Columns() {
+	public Columns() {
 		super("COLUMNS", org.jooq.util.sqlserver.information_schema.InformationSchema.INFORMATION_SCHEMA);
 	}
 
-	/**
-	 * No further instances allowed
-	 */
-	private Columns(java.lang.String alias) {
+	public Columns(java.lang.String alias) {
 		super(alias, org.jooq.util.sqlserver.information_schema.InformationSchema.INFORMATION_SCHEMA, org.jooq.util.sqlserver.information_schema.tables.Columns.COLUMNS);
 	}
 
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/information_schema/tables/ConstraintColumnUsage.java b/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/information_schema/tables/ConstraintColumnUsage.java
index c5f66cbda1..806fedc6b9 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/information_schema/tables/ConstraintColumnUsage.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/information_schema/tables/ConstraintColumnUsage.java
@@ -6,11 +6,11 @@ package org.jooq.util.sqlserver.information_schema.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class ConstraintColumnUsage extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = 733263102;
+	private static final long serialVersionUID = -2079839455;
 
 	/**
 	 * The singleton instance of INFORMATION_SCHEMA.CONSTRAINT_COLUMN_USAGE
@@ -65,17 +65,11 @@ public class ConstraintColumnUsage extends org.jooq.impl.TableImpl<org.jooq.Reco
 	 */
 	public final org.jooq.TableField<org.jooq.Record, java.lang.String> CONSTRAINT_NAME = createField("CONSTRAINT_NAME", org.jooq.impl.SQLDataType.VARCHAR, this);
 
-	/**
-	 * No further instances allowed
-	 */
-	private ConstraintColumnUsage() {
+	public ConstraintColumnUsage() {
 		super("CONSTRAINT_COLUMN_USAGE", org.jooq.util.sqlserver.information_schema.InformationSchema.INFORMATION_SCHEMA);
 	}
 
-	/**
-	 * No further instances allowed
-	 */
-	private ConstraintColumnUsage(java.lang.String alias) {
+	public ConstraintColumnUsage(java.lang.String alias) {
 		super(alias, org.jooq.util.sqlserver.information_schema.InformationSchema.INFORMATION_SCHEMA, org.jooq.util.sqlserver.information_schema.tables.ConstraintColumnUsage.CONSTRAINT_COLUMN_USAGE);
 	}
 
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/information_schema/tables/KeyColumnUsage.java b/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/information_schema/tables/KeyColumnUsage.java
index 0f3b496785..767c9d2107 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/information_schema/tables/KeyColumnUsage.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/information_schema/tables/KeyColumnUsage.java
@@ -6,11 +6,11 @@ package org.jooq.util.sqlserver.information_schema.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class KeyColumnUsage extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = -1230130788;
+	private static final long serialVersionUID = 562750207;
 
 	/**
 	 * The singleton instance of INFORMATION_SCHEMA.KEY_COLUMN_USAGE
@@ -75,17 +75,11 @@ public class KeyColumnUsage extends org.jooq.impl.TableImpl<org.jooq.Record> {
 	 */
 	public final org.jooq.TableField<org.jooq.Record, java.lang.Long> POSITION_IN_UNIQUE_CONSTRAINT = createField("POSITION_IN_UNIQUE_CONSTRAINT", org.jooq.impl.SQLDataType.BIGINT, this);
 
-	/**
-	 * No further instances allowed
-	 */
-	private KeyColumnUsage() {
+	public KeyColumnUsage() {
 		super("KEY_COLUMN_USAGE", org.jooq.util.sqlserver.information_schema.InformationSchema.INFORMATION_SCHEMA);
 	}
 
-	/**
-	 * No further instances allowed
-	 */
-	private KeyColumnUsage(java.lang.String alias) {
+	public KeyColumnUsage(java.lang.String alias) {
 		super(alias, org.jooq.util.sqlserver.information_schema.InformationSchema.INFORMATION_SCHEMA, org.jooq.util.sqlserver.information_schema.tables.KeyColumnUsage.KEY_COLUMN_USAGE);
 	}
 
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/information_schema/tables/Parameters.java b/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/information_schema/tables/Parameters.java
index 895fac2c4e..93ecc8aca7 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/information_schema/tables/Parameters.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/information_schema/tables/Parameters.java
@@ -6,11 +6,11 @@ package org.jooq.util.sqlserver.information_schema.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class Parameters extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = -1994625982;
+	private static final long serialVersionUID = 1376392357;
 
 	/**
 	 * The singleton instance of INFORMATION_SCHEMA.PARAMETERS
@@ -230,17 +230,11 @@ public class Parameters extends org.jooq.impl.TableImpl<org.jooq.Record> {
 	 */
 	public final org.jooq.TableField<org.jooq.Record, java.lang.Long> DECLARED_NUMERIC_SCALE = createField("DECLARED_NUMERIC_SCALE", org.jooq.impl.SQLDataType.BIGINT, this);
 
-	/**
-	 * No further instances allowed
-	 */
-	private Parameters() {
+	public Parameters() {
 		super("PARAMETERS", org.jooq.util.sqlserver.information_schema.InformationSchema.INFORMATION_SCHEMA);
 	}
 
-	/**
-	 * No further instances allowed
-	 */
-	private Parameters(java.lang.String alias) {
+	public Parameters(java.lang.String alias) {
 		super(alias, org.jooq.util.sqlserver.information_schema.InformationSchema.INFORMATION_SCHEMA, org.jooq.util.sqlserver.information_schema.tables.Parameters.PARAMETERS);
 	}
 
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/information_schema/tables/ReferentialConstraints.java b/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/information_schema/tables/ReferentialConstraints.java
index 81f3c5cda4..c6a0a580a6 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/information_schema/tables/ReferentialConstraints.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/information_schema/tables/ReferentialConstraints.java
@@ -6,11 +6,11 @@ package org.jooq.util.sqlserver.information_schema.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class ReferentialConstraints extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = -28313106;
+	private static final long serialVersionUID = -1528223007;
 
 	/**
 	 * The singleton instance of INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS
@@ -75,17 +75,11 @@ public class ReferentialConstraints extends org.jooq.impl.TableImpl<org.jooq.Rec
 	 */
 	public final org.jooq.TableField<org.jooq.Record, java.lang.String> DELETE_RULE = createField("DELETE_RULE", org.jooq.impl.SQLDataType.VARCHAR, this);
 
-	/**
-	 * No further instances allowed
-	 */
-	private ReferentialConstraints() {
+	public ReferentialConstraints() {
 		super("REFERENTIAL_CONSTRAINTS", org.jooq.util.sqlserver.information_schema.InformationSchema.INFORMATION_SCHEMA);
 	}
 
-	/**
-	 * No further instances allowed
-	 */
-	private ReferentialConstraints(java.lang.String alias) {
+	public ReferentialConstraints(java.lang.String alias) {
 		super(alias, org.jooq.util.sqlserver.information_schema.InformationSchema.INFORMATION_SCHEMA, org.jooq.util.sqlserver.information_schema.tables.ReferentialConstraints.REFERENTIAL_CONSTRAINTS);
 	}
 
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/information_schema/tables/Routines.java b/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/information_schema/tables/Routines.java
index 482f57e8b4..a49b922de7 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/information_schema/tables/Routines.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/information_schema/tables/Routines.java
@@ -6,11 +6,11 @@ package org.jooq.util.sqlserver.information_schema.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class Routines extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = -876586578;
+	private static final long serialVersionUID = -341577839;
 
 	/**
 	 * The singleton instance of INFORMATION_SCHEMA.ROUTINES
@@ -470,17 +470,11 @@ public class Routines extends org.jooq.impl.TableImpl<org.jooq.Record> {
 	 */
 	public final org.jooq.TableField<org.jooq.Record, java.lang.Long> RESULT_CAST_DECLARED_NUMERIC_SCALE = createField("RESULT_CAST_DECLARED_NUMERIC_SCALE", org.jooq.impl.SQLDataType.BIGINT, this);
 
-	/**
-	 * No further instances allowed
-	 */
-	private Routines() {
+	public Routines() {
 		super("ROUTINES", org.jooq.util.sqlserver.information_schema.InformationSchema.INFORMATION_SCHEMA);
 	}
 
-	/**
-	 * No further instances allowed
-	 */
-	private Routines(java.lang.String alias) {
+	public Routines(java.lang.String alias) {
 		super(alias, org.jooq.util.sqlserver.information_schema.InformationSchema.INFORMATION_SCHEMA, org.jooq.util.sqlserver.information_schema.tables.Routines.ROUTINES);
 	}
 
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/information_schema/tables/Schemata.java b/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/information_schema/tables/Schemata.java
new file mode 100644
index 0000000000..6c499158da
--- /dev/null
+++ b/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/information_schema/tables/Schemata.java
@@ -0,0 +1,80 @@
+/**
+ * This class is generated by jOOQ
+ */
+package org.jooq.util.sqlserver.information_schema.tables;
+
+/**
+ * This class is generated by jOOQ.
+ */
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
+                            comments = "This class is generated by jOOQ")
+public class Schemata extends org.jooq.impl.TableImpl<org.jooq.Record> {
+
+	private static final long serialVersionUID = 1619338325;
+
+	/**
+	 * The singleton instance of INFORMATION_SCHEMA.SCHEMATA
+	 */
+	public static final org.jooq.util.sqlserver.information_schema.tables.Schemata SCHEMATA = new org.jooq.util.sqlserver.information_schema.tables.Schemata();
+
+	/**
+	 * The class holding records for this type
+	 */
+	private static final java.lang.Class<org.jooq.Record> __RECORD_TYPE = org.jooq.Record.class;
+
+	/**
+	 * The class holding records for this type
+	 */
+	@Override
+	public java.lang.Class<org.jooq.Record> getRecordType() {
+		return __RECORD_TYPE;
+	}
+
+	/**
+	 * An uncommented item
+	 */
+	public final org.jooq.TableField<org.jooq.Record, java.lang.String> CATALOG_NAME = createField("CATALOG_NAME", org.jooq.impl.SQLDataType.VARCHAR, this);
+
+	/**
+	 * An uncommented item
+	 */
+	public final org.jooq.TableField<org.jooq.Record, java.lang.String> SCHEMA_NAME = createField("SCHEMA_NAME", org.jooq.impl.SQLDataType.VARCHAR, this);
+
+	/**
+	 * An uncommented item
+	 */
+	public final org.jooq.TableField<org.jooq.Record, java.lang.String> SCHEMA_OWNER = createField("SCHEMA_OWNER", org.jooq.impl.SQLDataType.VARCHAR, this);
+
+	/**
+	 * An uncommented item
+	 */
+	public final org.jooq.TableField<org.jooq.Record, java.lang.String> DEFAULT_CHARACTER_SET_CATALOG = createField("DEFAULT_CHARACTER_SET_CATALOG", org.jooq.impl.SQLDataType.VARCHAR, this);
+
+	/**
+	 * An uncommented item
+	 */
+	public final org.jooq.TableField<org.jooq.Record, java.lang.String> DEFAULT_CHARACTER_SET_SCHEMA = createField("DEFAULT_CHARACTER_SET_SCHEMA", org.jooq.impl.SQLDataType.VARCHAR, this);
+
+	/**
+	 * An uncommented item
+	 */
+	public final org.jooq.TableField<org.jooq.Record, java.lang.String> DEFAULT_CHARACTER_SET_NAME = createField("DEFAULT_CHARACTER_SET_NAME", org.jooq.impl.SQLDataType.VARCHAR, this);
+
+	/**
+	 * An uncommented item
+	 */
+	public final org.jooq.TableField<org.jooq.Record, java.lang.String> SQL_PATH = createField("SQL_PATH", org.jooq.impl.SQLDataType.VARCHAR, this);
+
+	public Schemata() {
+		super("SCHEMATA", org.jooq.util.sqlserver.information_schema.InformationSchema.INFORMATION_SCHEMA);
+	}
+
+	public Schemata(java.lang.String alias) {
+		super(alias, org.jooq.util.sqlserver.information_schema.InformationSchema.INFORMATION_SCHEMA, org.jooq.util.sqlserver.information_schema.tables.Schemata.SCHEMATA);
+	}
+
+	@Override
+	public org.jooq.util.sqlserver.information_schema.tables.Schemata as(java.lang.String alias) {
+		return new org.jooq.util.sqlserver.information_schema.tables.Schemata(alias);
+	}
+}
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/information_schema/tables/Sequences.java b/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/information_schema/tables/Sequences.java
index e2ae4a7834..092da94c67 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/information_schema/tables/Sequences.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/information_schema/tables/Sequences.java
@@ -6,11 +6,11 @@ package org.jooq.util.sqlserver.information_schema.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class Sequences extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = 770627700;
+	private static final long serialVersionUID = 2104312599;
 
 	/**
 	 * The singleton instance of INFORMATION_SCHEMA.SEQUENCES
@@ -110,17 +110,11 @@ public class Sequences extends org.jooq.impl.TableImpl<org.jooq.Record> {
 	 */
 	public final org.jooq.TableField<org.jooq.Record, java.lang.String> NEXT_VALUE = createField("NEXT_VALUE", org.jooq.impl.SQLDataType.VARCHAR, this);
 
-	/**
-	 * No further instances allowed
-	 */
-	private Sequences() {
+	public Sequences() {
 		super("SEQUENCES", org.jooq.util.sqlserver.information_schema.InformationSchema.INFORMATION_SCHEMA);
 	}
 
-	/**
-	 * No further instances allowed
-	 */
-	private Sequences(java.lang.String alias) {
+	public Sequences(java.lang.String alias) {
 		super(alias, org.jooq.util.sqlserver.information_schema.InformationSchema.INFORMATION_SCHEMA, org.jooq.util.sqlserver.information_schema.tables.Sequences.SEQUENCES);
 	}
 
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/information_schema/tables/TableConstraints.java b/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/information_schema/tables/TableConstraints.java
index 4de956537d..a52d57a54b 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/information_schema/tables/TableConstraints.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/information_schema/tables/TableConstraints.java
@@ -6,11 +6,11 @@ package org.jooq.util.sqlserver.information_schema.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class TableConstraints extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = -2008093826;
+	private static final long serialVersionUID = -983621775;
 
 	/**
 	 * The singleton instance of INFORMATION_SCHEMA.TABLE_CONSTRAINTS
@@ -75,17 +75,11 @@ public class TableConstraints extends org.jooq.impl.TableImpl<org.jooq.Record> {
 	 */
 	public final org.jooq.TableField<org.jooq.Record, java.lang.String> INITIALLY_DEFERRED = createField("INITIALLY_DEFERRED", org.jooq.impl.SQLDataType.VARCHAR, this);
 
-	/**
-	 * No further instances allowed
-	 */
-	private TableConstraints() {
+	public TableConstraints() {
 		super("TABLE_CONSTRAINTS", org.jooq.util.sqlserver.information_schema.InformationSchema.INFORMATION_SCHEMA);
 	}
 
-	/**
-	 * No further instances allowed
-	 */
-	private TableConstraints(java.lang.String alias) {
+	public TableConstraints(java.lang.String alias) {
 		super(alias, org.jooq.util.sqlserver.information_schema.InformationSchema.INFORMATION_SCHEMA, org.jooq.util.sqlserver.information_schema.tables.TableConstraints.TABLE_CONSTRAINTS);
 	}
 
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/information_schema/tables/Tables.java b/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/information_schema/tables/Tables.java
index e40dc4bd71..9f625c65af 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/information_schema/tables/Tables.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/information_schema/tables/Tables.java
@@ -6,11 +6,11 @@ package org.jooq.util.sqlserver.information_schema.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class Tables extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = 785864513;
+	private static final long serialVersionUID = 846492222;
 
 	/**
 	 * The singleton instance of INFORMATION_SCHEMA.TABLES
@@ -90,17 +90,11 @@ public class Tables extends org.jooq.impl.TableImpl<org.jooq.Record> {
 	 */
 	public final org.jooq.TableField<org.jooq.Record, java.lang.String> COMMIT_ACTION = createField("COMMIT_ACTION", org.jooq.impl.SQLDataType.VARCHAR, this);
 
-	/**
-	 * No further instances allowed
-	 */
-	private Tables() {
+	public Tables() {
 		super("TABLES", org.jooq.util.sqlserver.information_schema.InformationSchema.INFORMATION_SCHEMA);
 	}
 
-	/**
-	 * No further instances allowed
-	 */
-	private Tables(java.lang.String alias) {
+	public Tables(java.lang.String alias) {
 		super(alias, org.jooq.util.sqlserver.information_schema.InformationSchema.INFORMATION_SCHEMA, org.jooq.util.sqlserver.information_schema.tables.Tables.TABLES);
 	}
 
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/sybase/SybaseDatabase.java b/jOOQ-meta/src/main/java/org/jooq/util/sybase/SybaseDatabase.java
index f909467bda..351fbb825c 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/sybase/SybaseDatabase.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/sybase/SybaseDatabase.java
@@ -39,6 +39,7 @@ import static org.jooq.util.sybase.sys.Tables.SYSPROCEDURE;
 import static org.jooq.util.sybase.sys.Tables.SYSSEQUENCE;
 import static org.jooq.util.sybase.sys.Tables.SYSTABCOL;
 import static org.jooq.util.sybase.sys.Tables.SYSTABLE;
+import static org.jooq.util.sybase.sys.Tables.SYSUSER;
 
 import java.sql.SQLException;
 import java.util.ArrayList;
@@ -208,6 +209,20 @@ public class SybaseDatabase extends AbstractDatabase {
             }
         }
     }
+    @Override
+    protected List<SchemaDefinition> getSchemata0() throws SQLException {
+        List<SchemaDefinition> result = new ArrayList<SchemaDefinition>();
+
+        for (String name : create()
+                .select(SYSUSER.USER_NAME)
+                .from(SYSUSER)
+                .fetch(SYSUSER.USER_NAME)) {
+
+            result.add(new SchemaDefinition(this, name, ""));
+        }
+
+        return result;
+    }
 
     @Override
     protected List<SequenceDefinition> getSequences0() throws SQLException {
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/Sys.java b/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/Sys.java
index f1f6f35607..e2dea57ad8 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/Sys.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/Sys.java
@@ -6,14 +6,14 @@ package org.jooq.util.sybase.sys;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class Sys extends org.jooq.impl.SchemaImpl {
 
-	private static final long serialVersionUID = 807182600;
+	private static final long serialVersionUID = -400800318;
 
 	/**
-	 * The singleton instance of sys
+	 * The singleton instance of SYS
 	 */
 	public static final Sys SYS = new Sys();
 
@@ -21,7 +21,7 @@ public class Sys extends org.jooq.impl.SchemaImpl {
 	 * No further instances allowed
 	 */
 	private Sys() {
-		super("sys");
+		super("SYS");
 	}
 
 	@Override
@@ -30,6 +30,7 @@ public class Sys extends org.jooq.impl.SchemaImpl {
 			org.jooq.util.sybase.sys.tables.Sysidxcol.SYSIDXCOL,
 			org.jooq.util.sybase.sys.tables.Sysfkey.SYSFKEY,
 			org.jooq.util.sybase.sys.tables.Sysdomain.SYSDOMAIN,
+			org.jooq.util.sybase.sys.tables.Sysuser.SYSUSER,
 			org.jooq.util.sybase.sys.tables.Sysview.SYSVIEW,
 			org.jooq.util.sybase.sys.tables.Syssequence.SYSSEQUENCE,
 			org.jooq.util.sybase.sys.tables.Systab.SYSTAB,
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/SysFactory.java b/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/SysFactory.java
index b983199cef..fc18dadee4 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/SysFactory.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/SysFactory.java
@@ -6,11 +6,11 @@ package org.jooq.util.sybase.sys;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class SysFactory extends org.jooq.util.sybase.SybaseFactory {
 
-	private static final long serialVersionUID = -1738541104;
+	private static final long serialVersionUID = -545280563;
 
 	/**
 	 * Create a factory with a connection
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/Tables.java b/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/Tables.java
index 4bda64379a..a3ee4dcf89 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/Tables.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/Tables.java
@@ -6,64 +6,69 @@ package org.jooq.util.sybase.sys;
 /**
  * This class is generated by jOOQ.
  *
- * Convenience access to all tables in sys
+ * Convenience access to all tables in SYS
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public final class Tables {
 
 	/**
-	 * The table sys.SYSIDXCOL
+	 * The table SYS.SYSIDXCOL
 	 */
 	public static org.jooq.util.sybase.sys.tables.Sysidxcol SYSIDXCOL = org.jooq.util.sybase.sys.tables.Sysidxcol.SYSIDXCOL;
 
 	/**
-	 * The table sys.SYSFKEY
+	 * The table SYS.SYSFKEY
 	 */
 	public static org.jooq.util.sybase.sys.tables.Sysfkey SYSFKEY = org.jooq.util.sybase.sys.tables.Sysfkey.SYSFKEY;
 
 	/**
-	 * The table sys.SYSDOMAIN
+	 * The table SYS.SYSDOMAIN
 	 */
 	public static org.jooq.util.sybase.sys.tables.Sysdomain SYSDOMAIN = org.jooq.util.sybase.sys.tables.Sysdomain.SYSDOMAIN;
 
 	/**
-	 * The table sys.SYSVIEW
+	 * The table SYS.SYSUSER
+	 */
+	public static org.jooq.util.sybase.sys.tables.Sysuser SYSUSER = org.jooq.util.sybase.sys.tables.Sysuser.SYSUSER;
+
+	/**
+	 * The table SYS.SYSVIEW
 	 */
 	public static org.jooq.util.sybase.sys.tables.Sysview SYSVIEW = org.jooq.util.sybase.sys.tables.Sysview.SYSVIEW;
 
 	/**
-	 * The table sys.SYSSEQUENCE
+	 * The table SYS.SYSSEQUENCE
 	 */
 	public static org.jooq.util.sybase.sys.tables.Syssequence SYSSEQUENCE = org.jooq.util.sybase.sys.tables.Syssequence.SYSSEQUENCE;
 
 	/**
-	 * The table sys.SYSTAB
+	 * The table SYS.SYSTAB
 	 */
 	public static org.jooq.util.sybase.sys.tables.Systab SYSTAB = org.jooq.util.sybase.sys.tables.Systab.SYSTAB;
 
 	/**
-	 * The table sys.SYSTABCOL
+	 * The table SYS.SYSTABCOL
 	 */
 	public static org.jooq.util.sybase.sys.tables.Systabcol SYSTABCOL = org.jooq.util.sybase.sys.tables.Systabcol.SYSTABCOL;
 
 	/**
-	 * The table sys.SYSIDX
+	 * The table SYS.SYSIDX
 	 */
 	public static org.jooq.util.sybase.sys.tables.Sysidx SYSIDX = org.jooq.util.sybase.sys.tables.Sysidx.SYSIDX;
 
 	/**
-	 * The table sys.SYSTABLE
+	 * The table SYS.SYSTABLE
 	 */
 	public static org.jooq.util.sybase.sys.tables.Systable SYSTABLE = org.jooq.util.sybase.sys.tables.Systable.SYSTABLE;
 
 	/**
-	 * The table sys.SYSPROCEDURE
+	 * The table SYS.SYSPROCEDURE
 	 */
 	public static org.jooq.util.sybase.sys.tables.Sysprocedure SYSPROCEDURE = org.jooq.util.sybase.sys.tables.Sysprocedure.SYSPROCEDURE;
 
 	/**
-	 * The table sys.SYSPROCPARM
+	 * The table SYS.SYSPROCPARM
 	 */
 	public static org.jooq.util.sybase.sys.tables.Sysprocparm SYSPROCPARM = org.jooq.util.sybase.sys.tables.Sysprocparm.SYSPROCPARM;
 
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/Sysdomain.java b/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/Sysdomain.java
index 25883e5bec..6f861734cd 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/Sysdomain.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/Sysdomain.java
@@ -6,14 +6,14 @@ package org.jooq.util.sybase.sys.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class Sysdomain extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = 924391205;
+	private static final long serialVersionUID = -1472447438;
 
 	/**
-	 * The singleton instance of sys.SYSDOMAIN
+	 * The singleton instance of SYS.SYSDOMAIN
 	 */
 	public static final org.jooq.util.sybase.sys.tables.Sysdomain SYSDOMAIN = new org.jooq.util.sybase.sys.tables.Sysdomain();
 
@@ -50,17 +50,11 @@ public class Sysdomain extends org.jooq.impl.TableImpl<org.jooq.Record> {
 	 */
 	public final org.jooq.TableField<org.jooq.Record, java.lang.Short> PRECISION = createField("precision", org.jooq.impl.SQLDataType.SMALLINT, this);
 
-	/**
-	 * No further instances allowed
-	 */
-	private Sysdomain() {
+	public Sysdomain() {
 		super("SYSDOMAIN", org.jooq.util.sybase.sys.Sys.SYS);
 	}
 
-	/**
-	 * No further instances allowed
-	 */
-	private Sysdomain(java.lang.String alias) {
+	public Sysdomain(java.lang.String alias) {
 		super(alias, org.jooq.util.sybase.sys.Sys.SYS, org.jooq.util.sybase.sys.tables.Sysdomain.SYSDOMAIN);
 	}
 
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/Sysfkey.java b/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/Sysfkey.java
index f0a336e762..31544333c7 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/Sysfkey.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/Sysfkey.java
@@ -6,14 +6,14 @@ package org.jooq.util.sybase.sys.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class Sysfkey extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = 2010955502;
+	private static final long serialVersionUID = 365692859;
 
 	/**
-	 * The singleton instance of sys.SYSFKEY
+	 * The singleton instance of SYS.SYSFKEY
 	 */
 	public static final org.jooq.util.sybase.sys.tables.Sysfkey SYSFKEY = new org.jooq.util.sybase.sys.tables.Sysfkey();
 
@@ -65,17 +65,11 @@ public class Sysfkey extends org.jooq.impl.TableImpl<org.jooq.Record> {
 	 */
 	public final org.jooq.TableField<org.jooq.Record, java.lang.String> NULLS = createField("nulls", org.jooq.impl.SQLDataType.CHAR, this);
 
-	/**
-	 * No further instances allowed
-	 */
-	private Sysfkey() {
+	public Sysfkey() {
 		super("SYSFKEY", org.jooq.util.sybase.sys.Sys.SYS);
 	}
 
-	/**
-	 * No further instances allowed
-	 */
-	private Sysfkey(java.lang.String alias) {
+	public Sysfkey(java.lang.String alias) {
 		super(alias, org.jooq.util.sybase.sys.Sys.SYS, org.jooq.util.sybase.sys.tables.Sysfkey.SYSFKEY);
 	}
 
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/Sysidx.java b/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/Sysidx.java
index 83365aad4a..584e1f46bd 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/Sysidx.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/Sysidx.java
@@ -6,14 +6,14 @@ package org.jooq.util.sybase.sys.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class Sysidx extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = -1888048987;
+	private static final long serialVersionUID = -1878401416;
 
 	/**
-	 * The singleton instance of sys.SYSIDX
+	 * The singleton instance of SYS.SYSIDX
 	 */
 	public static final org.jooq.util.sybase.sys.tables.Sysidx SYSIDX = new org.jooq.util.sybase.sys.tables.Sysidx();
 
@@ -80,17 +80,11 @@ public class Sysidx extends org.jooq.impl.TableImpl<org.jooq.Record> {
 	 */
 	public final org.jooq.TableField<org.jooq.Record, java.lang.Short> FILE_ID = createField("file_id", org.jooq.impl.SQLDataType.SMALLINT, this);
 
-	/**
-	 * No further instances allowed
-	 */
-	private Sysidx() {
+	public Sysidx() {
 		super("SYSIDX", org.jooq.util.sybase.sys.Sys.SYS);
 	}
 
-	/**
-	 * No further instances allowed
-	 */
-	private Sysidx(java.lang.String alias) {
+	public Sysidx(java.lang.String alias) {
 		super(alias, org.jooq.util.sybase.sys.Sys.SYS, org.jooq.util.sybase.sys.tables.Sysidx.SYSIDX);
 	}
 
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/Sysidxcol.java b/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/Sysidxcol.java
index f1b8bced21..a4787c4348 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/Sysidxcol.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/Sysidxcol.java
@@ -6,14 +6,14 @@ package org.jooq.util.sybase.sys.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class Sysidxcol extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = -2143357849;
+	private static final long serialVersionUID = 2135002612;
 
 	/**
-	 * The singleton instance of sys.SYSIDXCOL
+	 * The singleton instance of SYS.SYSIDXCOL
 	 */
 	public static final org.jooq.util.sybase.sys.tables.Sysidxcol SYSIDXCOL = new org.jooq.util.sybase.sys.tables.Sysidxcol();
 
@@ -60,17 +60,11 @@ public class Sysidxcol extends org.jooq.impl.TableImpl<org.jooq.Record> {
 	 */
 	public final org.jooq.TableField<org.jooq.Record, java.lang.Integer> PRIMARY_COLUMN_ID = createField("primary_column_id", org.jooq.impl.SQLDataType.INTEGER, this);
 
-	/**
-	 * No further instances allowed
-	 */
-	private Sysidxcol() {
+	public Sysidxcol() {
 		super("SYSIDXCOL", org.jooq.util.sybase.sys.Sys.SYS);
 	}
 
-	/**
-	 * No further instances allowed
-	 */
-	private Sysidxcol(java.lang.String alias) {
+	public Sysidxcol(java.lang.String alias) {
 		super(alias, org.jooq.util.sybase.sys.Sys.SYS, org.jooq.util.sybase.sys.tables.Sysidxcol.SYSIDXCOL);
 	}
 
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/Sysprocedure.java b/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/Sysprocedure.java
index 93e16668fe..2adf71a5c7 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/Sysprocedure.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/Sysprocedure.java
@@ -6,14 +6,14 @@ package org.jooq.util.sybase.sys.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class Sysprocedure extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = -986257447;
+	private static final long serialVersionUID = 909855468;
 
 	/**
-	 * The singleton instance of sys.SYSPROCEDURE
+	 * The singleton instance of SYS.SYSPROCEDURE
 	 */
 	public static final org.jooq.util.sybase.sys.tables.Sysprocedure SYSPROCEDURE = new org.jooq.util.sybase.sys.tables.Sysprocedure();
 
@@ -90,17 +90,11 @@ public class Sysprocedure extends org.jooq.impl.TableImpl<org.jooq.Record> {
 	 */
 	public final org.jooq.TableField<org.jooq.Record, byte[]> STATS = createField("stats", org.jooq.impl.SQLDataType.LONGVARBINARY, this);
 
-	/**
-	 * No further instances allowed
-	 */
-	private Sysprocedure() {
+	public Sysprocedure() {
 		super("SYSPROCEDURE", org.jooq.util.sybase.sys.Sys.SYS);
 	}
 
-	/**
-	 * No further instances allowed
-	 */
-	private Sysprocedure(java.lang.String alias) {
+	public Sysprocedure(java.lang.String alias) {
 		super(alias, org.jooq.util.sybase.sys.Sys.SYS, org.jooq.util.sybase.sys.tables.Sysprocedure.SYSPROCEDURE);
 	}
 
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/Sysprocparm.java b/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/Sysprocparm.java
index 9df65d2eaf..a307cf0e3e 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/Sysprocparm.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/Sysprocparm.java
@@ -6,14 +6,14 @@ package org.jooq.util.sybase.sys.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class Sysprocparm extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = -1915636413;
+	private static final long serialVersionUID = 1267528374;
 
 	/**
-	 * The singleton instance of sys.SYSPROCPARM
+	 * The singleton instance of SYS.SYSPROCPARM
 	 */
 	public static final org.jooq.util.sybase.sys.tables.Sysprocparm SYSPROCPARM = new org.jooq.util.sybase.sys.tables.Sysprocparm();
 
@@ -95,17 +95,11 @@ public class Sysprocparm extends org.jooq.impl.TableImpl<org.jooq.Record> {
 	 */
 	public final org.jooq.TableField<org.jooq.Record, java.lang.String> BASE_TYPE_STR = createField("base_type_str", org.jooq.impl.SQLDataType.VARCHAR, this);
 
-	/**
-	 * No further instances allowed
-	 */
-	private Sysprocparm() {
+	public Sysprocparm() {
 		super("SYSPROCPARM", org.jooq.util.sybase.sys.Sys.SYS);
 	}
 
-	/**
-	 * No further instances allowed
-	 */
-	private Sysprocparm(java.lang.String alias) {
+	public Sysprocparm(java.lang.String alias) {
 		super(alias, org.jooq.util.sybase.sys.Sys.SYS, org.jooq.util.sybase.sys.tables.Sysprocparm.SYSPROCPARM);
 	}
 
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/Syssequence.java b/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/Syssequence.java
index 2ad4f2826a..171b86df4e 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/Syssequence.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/Syssequence.java
@@ -6,14 +6,14 @@ package org.jooq.util.sybase.sys.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class Syssequence extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = -1976477654;
+	private static final long serialVersionUID = 1006985271;
 
 	/**
-	 * The singleton instance of sys.SYSSEQUENCE
+	 * The singleton instance of SYS.SYSSEQUENCE
 	 */
 	public static final org.jooq.util.sybase.sys.tables.Syssequence SYSSEQUENCE = new org.jooq.util.sybase.sys.tables.Syssequence();
 
@@ -80,17 +80,11 @@ public class Syssequence extends org.jooq.impl.TableImpl<org.jooq.Record> {
 	 */
 	public final org.jooq.TableField<org.jooq.Record, java.lang.String> SEQUENCE_NAME = createField("sequence_name", org.jooq.impl.SQLDataType.CHAR, this);
 
-	/**
-	 * No further instances allowed
-	 */
-	private Syssequence() {
+	public Syssequence() {
 		super("SYSSEQUENCE", org.jooq.util.sybase.sys.Sys.SYS);
 	}
 
-	/**
-	 * No further instances allowed
-	 */
-	private Syssequence(java.lang.String alias) {
+	public Syssequence(java.lang.String alias) {
 		super(alias, org.jooq.util.sybase.sys.Sys.SYS, org.jooq.util.sybase.sys.tables.Syssequence.SYSSEQUENCE);
 	}
 
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/Systab.java b/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/Systab.java
index 41668676ef..5992812185 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/Systab.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/Systab.java
@@ -6,14 +6,14 @@ package org.jooq.util.sybase.sys.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class Systab extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = 1581887505;
+	private static final long serialVersionUID = -1456344130;
 
 	/**
-	 * The singleton instance of sys.SYSTAB
+	 * The singleton instance of SYS.SYSTAB
 	 */
 	public static final org.jooq.util.sybase.sys.tables.Systab SYSTAB = new org.jooq.util.sybase.sys.tables.Systab();
 
@@ -140,17 +140,11 @@ public class Systab extends org.jooq.impl.TableImpl<org.jooq.Record> {
 	 */
 	public final org.jooq.TableField<org.jooq.Record, java.lang.String> TABLE_TYPE_STR = createField("table_type_str", org.jooq.impl.SQLDataType.CHAR, this);
 
-	/**
-	 * No further instances allowed
-	 */
-	private Systab() {
+	public Systab() {
 		super("SYSTAB", org.jooq.util.sybase.sys.Sys.SYS);
 	}
 
-	/**
-	 * No further instances allowed
-	 */
-	private Systab(java.lang.String alias) {
+	public Systab(java.lang.String alias) {
 		super(alias, org.jooq.util.sybase.sys.Sys.SYS, org.jooq.util.sybase.sys.tables.Systab.SYSTAB);
 	}
 
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/Systabcol.java b/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/Systabcol.java
index be02ccc951..2ae87270a8 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/Systabcol.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/Systabcol.java
@@ -6,14 +6,14 @@ package org.jooq.util.sybase.sys.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class Systabcol extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = -481237229;
+	private static final long serialVersionUID = -1343302074;
 
 	/**
-	 * The singleton instance of sys.SYSTABCOL
+	 * The singleton instance of SYS.SYSTABCOL
 	 */
 	public static final org.jooq.util.sybase.sys.tables.Systabcol SYSTABCOL = new org.jooq.util.sybase.sys.tables.Systabcol();
 
@@ -120,17 +120,11 @@ public class Systabcol extends org.jooq.impl.TableImpl<org.jooq.Record> {
 	 */
 	public final org.jooq.TableField<org.jooq.Record, java.lang.String> BASE_TYPE_STR = createField("base_type_str", org.jooq.impl.SQLDataType.VARCHAR, this);
 
-	/**
-	 * No further instances allowed
-	 */
-	private Systabcol() {
+	public Systabcol() {
 		super("SYSTABCOL", org.jooq.util.sybase.sys.Sys.SYS);
 	}
 
-	/**
-	 * No further instances allowed
-	 */
-	private Systabcol(java.lang.String alias) {
+	public Systabcol(java.lang.String alias) {
 		super(alias, org.jooq.util.sybase.sys.Sys.SYS, org.jooq.util.sybase.sys.tables.Systabcol.SYSTABCOL);
 	}
 
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/Systable.java b/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/Systable.java
index d03f3a9c11..5698d187d9 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/Systable.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/Systable.java
@@ -6,14 +6,14 @@ package org.jooq.util.sybase.sys.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class Systable extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = -724081457;
+	private static final long serialVersionUID = 576298530;
 
 	/**
-	 * The singleton instance of sys.SYSTABLE
+	 * The singleton instance of SYS.SYSTABLE
 	 */
 	public static final org.jooq.util.sybase.sys.tables.Systable SYSTABLE = new org.jooq.util.sybase.sys.tables.Systable();
 
@@ -160,17 +160,11 @@ public class Systable extends org.jooq.impl.TableImpl<org.jooq.Record> {
 	 */
 	public final org.jooq.TableField<org.jooq.Record, java.lang.String> ENCRYPTED = createField("encrypted", org.jooq.impl.SQLDataType.CHAR, this);
 
-	/**
-	 * No further instances allowed
-	 */
-	private Systable() {
+	public Systable() {
 		super("SYSTABLE", org.jooq.util.sybase.sys.Sys.SYS);
 	}
 
-	/**
-	 * No further instances allowed
-	 */
-	private Systable(java.lang.String alias) {
+	public Systable(java.lang.String alias) {
 		super(alias, org.jooq.util.sybase.sys.Sys.SYS, org.jooq.util.sybase.sys.tables.Systable.SYSTABLE);
 	}
 
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/Sysuser.java b/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/Sysuser.java
new file mode 100644
index 0000000000..43619bf3b6
--- /dev/null
+++ b/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/Sysuser.java
@@ -0,0 +1,90 @@
+/**
+ * This class is generated by jOOQ
+ */
+package org.jooq.util.sybase.sys.tables;
+
+/**
+ * This class is generated by jOOQ.
+ */
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
+                            comments = "This class is generated by jOOQ")
+public class Sysuser extends org.jooq.impl.TableImpl<org.jooq.Record> {
+
+	private static final long serialVersionUID = -1599839547;
+
+	/**
+	 * The singleton instance of SYS.SYSUSER
+	 */
+	public static final org.jooq.util.sybase.sys.tables.Sysuser SYSUSER = new org.jooq.util.sybase.sys.tables.Sysuser();
+
+	/**
+	 * The class holding records for this type
+	 */
+	private static final java.lang.Class<org.jooq.Record> __RECORD_TYPE = org.jooq.Record.class;
+
+	/**
+	 * The class holding records for this type
+	 */
+	@Override
+	public java.lang.Class<org.jooq.Record> getRecordType() {
+		return __RECORD_TYPE;
+	}
+
+	/**
+	 * An uncommented item
+	 */
+	public final org.jooq.TableField<org.jooq.Record, java.lang.Integer> USER_ID = createField("user_id", org.jooq.impl.SQLDataType.INTEGER, this);
+
+	/**
+	 * An uncommented item
+	 */
+	public final org.jooq.TableField<org.jooq.Record, java.lang.Long> OBJECT_ID = createField("object_id", org.jooq.impl.SQLDataType.BIGINT, this);
+
+	/**
+	 * An uncommented item
+	 */
+	public final org.jooq.TableField<org.jooq.Record, java.lang.String> USER_NAME = createField("user_name", org.jooq.impl.SQLDataType.CHAR, this);
+
+	/**
+	 * An uncommented item
+	 */
+	public final org.jooq.TableField<org.jooq.Record, byte[]> PASSWORD = createField("password", org.jooq.impl.SQLDataType.BINARY, this);
+
+	/**
+	 * An uncommented item
+	 */
+	public final org.jooq.TableField<org.jooq.Record, java.lang.Long> LOGIN_POLICY_ID = createField("login_policy_id", org.jooq.impl.SQLDataType.BIGINT, this);
+
+	/**
+	 * An uncommented item
+	 */
+	public final org.jooq.TableField<org.jooq.Record, java.lang.Byte> EXPIRE_PASSWORD_ON_LOGIN = createField("expire_password_on_login", org.jooq.impl.SQLDataType.TINYINT, this);
+
+	/**
+	 * An uncommented item
+	 */
+	public final org.jooq.TableField<org.jooq.Record, java.sql.Timestamp> PASSWORD_CREATION_TIME = createField("password_creation_time", org.jooq.impl.SQLDataType.TIMESTAMP, this);
+
+	/**
+	 * An uncommented item
+	 */
+	public final org.jooq.TableField<org.jooq.Record, java.lang.Integer> FAILED_LOGIN_ATTEMPTS = createField("failed_login_attempts", org.jooq.impl.SQLDataType.INTEGER, this);
+
+	/**
+	 * An uncommented item
+	 */
+	public final org.jooq.TableField<org.jooq.Record, java.sql.Timestamp> LAST_LOGIN_TIME = createField("last_login_time", org.jooq.impl.SQLDataType.TIMESTAMP, this);
+
+	public Sysuser() {
+		super("SYSUSER", org.jooq.util.sybase.sys.Sys.SYS);
+	}
+
+	public Sysuser(java.lang.String alias) {
+		super(alias, org.jooq.util.sybase.sys.Sys.SYS, org.jooq.util.sybase.sys.tables.Sysuser.SYSUSER);
+	}
+
+	@Override
+	public org.jooq.util.sybase.sys.tables.Sysuser as(java.lang.String alias) {
+		return new org.jooq.util.sybase.sys.tables.Sysuser(alias);
+	}
+}
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/Sysview.java b/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/Sysview.java
index 9caeb57abb..bf10ea29d9 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/Sysview.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/Sysview.java
@@ -6,14 +6,14 @@ package org.jooq.util.sybase.sys.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.3.0"},
                             comments = "This class is generated by jOOQ")
 public class Sysview extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = -967800213;
+	private static final long serialVersionUID = 1736444830;
 
 	/**
-	 * The singleton instance of sys.SYSVIEW
+	 * The singleton instance of SYS.SYSVIEW
 	 */
 	public static final org.jooq.util.sybase.sys.tables.Sysview SYSVIEW = new org.jooq.util.sybase.sys.tables.Sysview();
 
@@ -70,17 +70,11 @@ public class Sysview extends org.jooq.impl.TableImpl<org.jooq.Record> {
 	 */
 	public final org.jooq.TableField<org.jooq.Record, java.lang.Long> MV_LAST_REFRESHED_TSN = createField("mv_last_refreshed_tsn", org.jooq.impl.SQLDataType.BIGINT, this);
 
-	/**
-	 * No further instances allowed
-	 */
-	private Sysview() {
+	public Sysview() {
 		super("SYSVIEW", org.jooq.util.sybase.sys.Sys.SYS);
 	}
 
-	/**
-	 * No further instances allowed
-	 */
-	private Sysview(java.lang.String alias) {
+	public Sysview(java.lang.String alias) {
 		super(alias, org.jooq.util.sybase.sys.Sys.SYS, org.jooq.util.sybase.sys.tables.Sysview.SYSVIEW);
 	}
 
diff --git a/jOOQ-test/configuration/org/jooq/configuration/espen/h2/information_schema.properties b/jOOQ-test/configuration/org/jooq/configuration/espen/h2/information_schema.properties
index b964284a21..9c689f93c0 100644
--- a/jOOQ-test/configuration/org/jooq/configuration/espen/h2/information_schema.properties
+++ b/jOOQ-test/configuration/org/jooq/configuration/espen/h2/information_schema.properties
@@ -7,7 +7,7 @@ jdbc.Password=
 
 generator=org.jooq.util.DefaultGenerator
 generator.database=org.jooq.util.h2.H2Database
-generator.database.includes=TABLES,COLUMNS,CONSTRAINTS,CROSS_REFERENCES,TYPE_INFO,FUNCTION_ALIASES,FUNCTION_COLUMNS,SEQUENCES
+generator.database.includes=SCHEMATA,TABLES,COLUMNS,CONSTRAINTS,CROSS_REFERENCES,TYPE_INFO,FUNCTION_ALIASES,FUNCTION_COLUMNS,SEQUENCES
 generator.database.excludes=
 generator.generate.deprecated=false
 generator.generate.instance-fields=false
diff --git a/jOOQ-test/configuration/org/jooq/configuration/espen/hsqldb/information_schema.properties b/jOOQ-test/configuration/org/jooq/configuration/espen/hsqldb/information_schema.properties
index a581c18082..a65775ae3d 100644
--- a/jOOQ-test/configuration/org/jooq/configuration/espen/hsqldb/information_schema.properties
+++ b/jOOQ-test/configuration/org/jooq/configuration/espen/hsqldb/information_schema.properties
@@ -7,7 +7,7 @@ jdbc.Password=
 
 generator=org.jooq.util.DefaultGenerator
 generator.database=org.jooq.util.hsqldb.HSQLDBDatabase
-generator.database.includes=TABLES,COLUMNS,REFERENTIAL_CONSTRAINTS,TABLE_CONSTRAINTS,CONSTRAINT_COLUMN_USAGE,KEY_COLUMN_USAGE,ROUTINES,PARAMETERS,SEQUENCES,ELEMENT_TYPES
+generator.database.includes=SCHEMATA,TABLES,COLUMNS,REFERENTIAL_CONSTRAINTS,TABLE_CONSTRAINTS,CONSTRAINT_COLUMN_USAGE,KEY_COLUMN_USAGE,ROUTINES,PARAMETERS,SEQUENCES,ELEMENT_TYPES
 generator.database.excludes=
 generator.generate.deprecated=false
 generator.generate.instance-fields=true
diff --git a/jOOQ-test/configuration/org/jooq/configuration/lukas/ase/sys.properties b/jOOQ-test/configuration/org/jooq/configuration/lukas/ase/sys.properties
index 1638d86191..9454aba352 100644
--- a/jOOQ-test/configuration/org/jooq/configuration/lukas/ase/sys.properties
+++ b/jOOQ-test/configuration/org/jooq/configuration/lukas/ase/sys.properties
@@ -7,7 +7,7 @@ jdbc.Password=
 
 generator=org.jooq.util.DefaultGenerator
 generator.database=org.jooq.util.ase.ASEDatabase
-generator.database.includes=sysindexes,sysobjects,sysreferences
+generator.database.includes=sysusers,sysindexes,sysobjects,sysreferences
 generator.database.excludes=
 generator.generate.records=false
 generator.generate.deprecated=false
diff --git a/jOOQ-test/configuration/org/jooq/configuration/lukas/cubrid/dba.xml b/jOOQ-test/configuration/org/jooq/configuration/lukas/cubrid/dba.xml
index 74f1c1513d..e965f21553 100644
--- a/jOOQ-test/configuration/org/jooq/configuration/lukas/cubrid/dba.xml
+++ b/jOOQ-test/configuration/org/jooq/configuration/lukas/cubrid/dba.xml
@@ -10,7 +10,7 @@
         <name>org.jooq.util.DefaultGenerator</name>
         <database>
             <name>org.jooq.util.cubrid.CUBRIDDatabase</name>
-            <includes>db_class,db_attribute,db_index,db_index_key,db_serial</includes>
+            <includes>db_user,db_class,db_attribute,db_index,db_index_key,db_serial</includes>
             <excludes></excludes>
             <inputSchema>DBA</inputSchema>
         </database>
diff --git a/jOOQ-test/configuration/org/jooq/configuration/lukas/db2/syscat.properties b/jOOQ-test/configuration/org/jooq/configuration/lukas/db2/syscat.properties
index cd80037cb5..a669da333e 100644
--- a/jOOQ-test/configuration/org/jooq/configuration/lukas/db2/syscat.properties
+++ b/jOOQ-test/configuration/org/jooq/configuration/lukas/db2/syscat.properties
@@ -7,7 +7,7 @@ jdbc.Password=password
 
 generator=org.jooq.util.DefaultGenerator
 generator.database=org.jooq.util.db2.DB2Database
-generator.database.includes=TABLES,COLUMNS,TABCONST,KEYCOLUSE,REFERENCES,PROCEDURES,PROCPARMS,FUNCTIONS,FUNCPARMS,DATATYPES,ATTRIBUTES,SEQUENCES
+generator.database.includes=SCHEMATA,TABLES,COLUMNS,TABCONST,KEYCOLUSE,REFERENCES,PROCEDURES,PROCPARMS,FUNCTIONS,FUNCPARMS,DATATYPES,ATTRIBUTES,SEQUENCES
 generator.database.excludes=
 generator.generate.records=false
 generator.generate.deprecated=false
diff --git a/jOOQ-test/configuration/org/jooq/configuration/lukas/h2/information_schema.properties b/jOOQ-test/configuration/org/jooq/configuration/lukas/h2/information_schema.properties
index b964284a21..9c689f93c0 100644
--- a/jOOQ-test/configuration/org/jooq/configuration/lukas/h2/information_schema.properties
+++ b/jOOQ-test/configuration/org/jooq/configuration/lukas/h2/information_schema.properties
@@ -7,7 +7,7 @@ jdbc.Password=
 
 generator=org.jooq.util.DefaultGenerator
 generator.database=org.jooq.util.h2.H2Database
-generator.database.includes=TABLES,COLUMNS,CONSTRAINTS,CROSS_REFERENCES,TYPE_INFO,FUNCTION_ALIASES,FUNCTION_COLUMNS,SEQUENCES
+generator.database.includes=SCHEMATA,TABLES,COLUMNS,CONSTRAINTS,CROSS_REFERENCES,TYPE_INFO,FUNCTION_ALIASES,FUNCTION_COLUMNS,SEQUENCES
 generator.database.excludes=
 generator.generate.deprecated=false
 generator.generate.instance-fields=false
diff --git a/jOOQ-test/configuration/org/jooq/configuration/lukas/h2/library.xml b/jOOQ-test/configuration/org/jooq/configuration/lukas/h2/library.xml
index a90aa1d948..39c87342a1 100644
--- a/jOOQ-test/configuration/org/jooq/configuration/lukas/h2/library.xml
+++ b/jOOQ-test/configuration/org/jooq/configuration/lukas/h2/library.xml
@@ -3,7 +3,6 @@
     <jdbc>
         <driver>org.h2.Driver</driver>
         <url>jdbc:h2:~/test</url>
-        <schema>PUBLIC</schema>
         <user>sa</user>
         <password></password>
     </jdbc>
@@ -15,6 +14,7 @@
             <excludes>T_BOOK_DETAILS,SYSTEM_SEQUENCE.*</excludes>
             <dateAsTimestamp>false</dateAsTimestamp>
             <unsignedTypes>true</unsignedTypes>
+            <inputSchema>PUBLIC</inputSchema>
             <masterDataTables>
                 <masterDataTable>
                     <name>T_LANGUAGE</name>
diff --git a/jOOQ-test/configuration/org/jooq/configuration/lukas/hsqldb/information_schema.properties b/jOOQ-test/configuration/org/jooq/configuration/lukas/hsqldb/information_schema.properties
index f9d2f37bae..6efdbf271f 100644
--- a/jOOQ-test/configuration/org/jooq/configuration/lukas/hsqldb/information_schema.properties
+++ b/jOOQ-test/configuration/org/jooq/configuration/lukas/hsqldb/information_schema.properties
@@ -7,7 +7,7 @@ jdbc.Password=
 
 generator=org.jooq.util.DefaultGenerator
 generator.database=org.jooq.util.hsqldb.HSQLDBDatabase
-generator.database.includes=TABLES,COLUMNS,REFERENTIAL_CONSTRAINTS,TABLE_CONSTRAINTS,CONSTRAINT_COLUMN_USAGE,KEY_COLUMN_USAGE,ROUTINES,PARAMETERS,SEQUENCES,ELEMENT_TYPES
+generator.database.includes=SCHEMATA,TABLES,COLUMNS,REFERENTIAL_CONSTRAINTS,TABLE_CONSTRAINTS,CONSTRAINT_COLUMN_USAGE,KEY_COLUMN_USAGE,ROUTINES,PARAMETERS,SEQUENCES,ELEMENT_TYPES
 generator.database.excludes=
 generator.generate.deprecated=false
 generator.generate.fields=both
diff --git a/jOOQ-test/configuration/org/jooq/configuration/lukas/ingres/$ingres.properties b/jOOQ-test/configuration/org/jooq/configuration/lukas/ingres/$ingres.properties
index 249db8cd98..aca0432403 100644
--- a/jOOQ-test/configuration/org/jooq/configuration/lukas/ingres/$ingres.properties
+++ b/jOOQ-test/configuration/org/jooq/configuration/lukas/ingres/$ingres.properties
@@ -7,7 +7,7 @@ jdbc.Password=
 
 generator=org.jooq.util.DefaultGenerator
 generator.database=org.jooq.util.ingres.IngresDatabase
-generator.database.includes=iitables,iicolumns,iiconstraints,iiconstraint_indexes,iiindexes,iiindex_columns,iiref_constraints,iisequences,iidb_comments,iidb_subcomments
+generator.database.includes=iischema,iitables,iicolumns,iiconstraints,iiconstraint_indexes,iiindexes,iiindex_columns,iiref_constraints,iisequences,iidb_comments,iidb_subcomments
 generator.database.excludes=
 generator.generate.records=false
 generator.generate.deprecated=false
diff --git a/jOOQ-test/configuration/org/jooq/configuration/lukas/mysql/information_schema.properties b/jOOQ-test/configuration/org/jooq/configuration/lukas/mysql/information_schema.properties
index f3ca1a0fcf..8017f508d4 100644
--- a/jOOQ-test/configuration/org/jooq/configuration/lukas/mysql/information_schema.properties
+++ b/jOOQ-test/configuration/org/jooq/configuration/lukas/mysql/information_schema.properties
@@ -7,7 +7,7 @@ jdbc.Password=
 
 generator=org.jooq.util.DefaultGenerator
 generator.database=org.jooq.util.mysql.MySQLDatabase
-generator.database.includes=TABLES,COLUMNS,KEY_COLUMN_USAGE,REFERENTIAL_CONSTRAINTS,TABLE_CONSTRAINTS
+generator.database.includes=SCHEMATA,TABLES,COLUMNS,KEY_COLUMN_USAGE,REFERENTIAL_CONSTRAINTS,TABLE_CONSTRAINTS
 generator.database.excludes=
 generator.generate.deprecated=false
 generator.generate.instance-fields=false
diff --git a/jOOQ-test/configuration/org/jooq/configuration/lukas/oracle/Oracle3Strategy.java b/jOOQ-test/configuration/org/jooq/configuration/lukas/oracle/Oracle3Strategy.java
index 7aa75af1ce..c2101690c9 100644
--- a/jOOQ-test/configuration/org/jooq/configuration/lukas/oracle/Oracle3Strategy.java
+++ b/jOOQ-test/configuration/org/jooq/configuration/lukas/oracle/Oracle3Strategy.java
@@ -106,6 +106,9 @@ public class Oracle3Strategy extends DefaultGeneratorStrategy {
         if (mode == Mode.POJO) {
             return definition.getOutputName() + "_POJO";
         }
+        if (mode == Mode.FACTORY) {
+            return "MyFactory";
+        }
 
         return definition.getOutputName();
     }
diff --git a/jOOQ-test/configuration/org/jooq/configuration/lukas/oracle/sys.properties b/jOOQ-test/configuration/org/jooq/configuration/lukas/oracle/sys.properties
index de2c08806a..6cabb8aa75 100644
--- a/jOOQ-test/configuration/org/jooq/configuration/lukas/oracle/sys.properties
+++ b/jOOQ-test/configuration/org/jooq/configuration/lukas/oracle/sys.properties
@@ -7,7 +7,7 @@ jdbc.Password=TEST
 
 generator=org.jooq.util.DefaultGenerator
 generator.database=org.jooq.util.oracle.OracleDatabase
-generator.database.includes=ALL_TAB_COMMENTS,ALL_TAB_COLS,ALL_COL_COMMENTS,ALL_CONSTRAINTS,ALL_CONS_COLUMNS,ALL_PROCEDURES,ALL_ARGUMENTS,ALL_OBJECTS,ALL_TYPES,ALL_TYPE_ATTRS,ALL_SEQUENCES,ALL_COLL_TYPES,ORA_MINING_NUMBER_NT,ORA_MINING_VARCHAR2_NT
+generator.database.includes=ALL_USERS,ALL_TAB_COMMENTS,ALL_TAB_COLS,ALL_COL_COMMENTS,ALL_CONSTRAINTS,ALL_CONS_COLUMNS,ALL_PROCEDURES,ALL_ARGUMENTS,ALL_OBJECTS,ALL_TYPES,ALL_TYPE_ATTRS,ALL_SEQUENCES,ALL_COLL_TYPES,ORA_MINING_NUMBER_NT,ORA_MINING_VARCHAR2_NT
 generator.database.excludes=
 generator.generate.records=false
 generator.generate.deprecated=false
diff --git a/jOOQ-test/configuration/org/jooq/configuration/lukas/postgres/information_schema.properties b/jOOQ-test/configuration/org/jooq/configuration/lukas/postgres/information_schema.properties
index 29fb31ae4e..821ffef37e 100644
--- a/jOOQ-test/configuration/org/jooq/configuration/lukas/postgres/information_schema.properties
+++ b/jOOQ-test/configuration/org/jooq/configuration/lukas/postgres/information_schema.properties
@@ -7,7 +7,7 @@ jdbc.Password=test
 
 generator=org.jooq.util.DefaultGenerator
 generator.database=org.jooq.util.postgres.PostgresDatabase
-generator.database.includes=tables,columns,referential_constraints,table_constraints,key_column_usage,constraint_column_usage,attributes,routines,parameters,sequences
+generator.database.includes=schemata,tables,columns,referential_constraints,table_constraints,key_column_usage,constraint_column_usage,attributes,routines,parameters,sequences
 generator.database.excludes=
 generator.generate.deprecated=false
 generator.generate.instance-fields=true
diff --git a/jOOQ-test/configuration/org/jooq/configuration/lukas/sqlserver/information_schema.properties b/jOOQ-test/configuration/org/jooq/configuration/lukas/sqlserver/information_schema.properties
index f65e439447..fcb782eb3f 100644
--- a/jOOQ-test/configuration/org/jooq/configuration/lukas/sqlserver/information_schema.properties
+++ b/jOOQ-test/configuration/org/jooq/configuration/lukas/sqlserver/information_schema.properties
@@ -10,7 +10,7 @@ jdbc.Password=
 
 generator=org.jooq.util.DefaultGenerator
 generator.database=org.jooq.util.hsqldb.HSQLDBDatabase
-generator.database.includes=TABLES,COLUMNS,REFERENTIAL_CONSTRAINTS,TABLE_CONSTRAINTS,CONSTRAINT_COLUMN_USAGE,KEY_COLUMN_USAGE,ROUTINES,PARAMETERS,SEQUENCES
+generator.database.includes=SCHEMATA,TABLES,COLUMNS,REFERENTIAL_CONSTRAINTS,TABLE_CONSTRAINTS,CONSTRAINT_COLUMN_USAGE,KEY_COLUMN_USAGE,ROUTINES,PARAMETERS,SEQUENCES
 generator.database.excludes=
 generator.generate.deprecated=false
 generator.generate.instance-fields=true
diff --git a/jOOQ-test/configuration/org/jooq/configuration/lukas/sybase/library.xml b/jOOQ-test/configuration/org/jooq/configuration/lukas/sybase/library.xml
index 1c772e7f83..620fe67337 100644
--- a/jOOQ-test/configuration/org/jooq/configuration/lukas/sybase/library.xml
+++ b/jOOQ-test/configuration/org/jooq/configuration/lukas/sybase/library.xml
@@ -3,7 +3,7 @@
     <jdbc>
         <driver>com.sybase.jdbc3.jdbc.SybDriver</driver>
         <url>jdbc:sybase:Tds:localhost:2638</url>
-        <schema>dba</schema>
+        <schema>DBA</schema>
         <user>dba</user>
         <password>sql</password>
     </jdbc>
diff --git a/jOOQ-test/configuration/org/jooq/configuration/lukas/sybase/sys.properties b/jOOQ-test/configuration/org/jooq/configuration/lukas/sybase/sys.properties
index 19575c5b4d..126e188317 100644
--- a/jOOQ-test/configuration/org/jooq/configuration/lukas/sybase/sys.properties
+++ b/jOOQ-test/configuration/org/jooq/configuration/lukas/sybase/sys.properties
@@ -1,13 +1,13 @@
 #Sybase system table properties file
 jdbc.Driver=com.sybase.jdbc3.jdbc.SybDriver
 jdbc.URL=jdbc:sybase:Tds:localhost:2638
-jdbc.Schema=sys
+jdbc.Schema=SYS
 jdbc.User=dba
 jdbc.Password=sql
 
 generator=org.jooq.util.DefaultGenerator
 generator.database=org.jooq.util.sybase.SybaseDatabase
-generator.database.includes=SYSTAB,SYSTABLE,SYSTABCOL,SYSDOMAIN,SYSIDX,SYSIDXCOL,SYSPROCEDURE,SYSPROCPARM,SYSVIEW,SYSSEQUENCE,SYSFKEY
+generator.database.includes=SYSUSER,SYSTAB,SYSTABLE,SYSTABCOL,SYSDOMAIN,SYSIDX,SYSIDXCOL,SYSPROCEDURE,SYSPROCPARM,SYSVIEW,SYSSEQUENCE,SYSFKEY
 generator.database.excludes=
 generator.generate.records=false
 generator.generate.deprecated=false
diff --git a/jOOQ-test/launch/GenerationTool Sybase ASE test.launch b/jOOQ-test/launch/GenerationTool Sybase ASE test.launch
index aa45c5dad2..1de69a82dc 100644
--- a/jOOQ-test/launch/GenerationTool Sybase ASE test.launch	
+++ b/jOOQ-test/launch/GenerationTool Sybase ASE test.launch	
@@ -7,6 +7,8 @@
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
 <listEntry value="4"/>
 </listAttribute>
+<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/>
+<stringAttribute key="org.eclipse.debug.core.source_locator_memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;sourceLookupDirector&gt;&#13;&#10;&lt;sourceContainers duplicates=&quot;false&quot;&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;javaProject name=&amp;quot;jOOQ-codegen&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.javaProject&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;classpathContainer path=&amp;quot;org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.classpathContainer&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;default/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.debug.core.containerType.default&quot;/&gt;&#13;&#10;&lt;/sourceContainers&gt;&#13;&#10;&lt;/sourceLookupDirector&gt;&#13;&#10;"/>
 <listAttribute key="org.eclipse.debug.ui.favoriteGroups">
 <listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
 <listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
diff --git a/jOOQ-test/launch/Meta-Generate HSQLDB information_schema.launch b/jOOQ-test/launch/Meta-Generate HSQLDB information_schema.launch
index a280a3d464..0f76db2d0e 100644
--- a/jOOQ-test/launch/Meta-Generate HSQLDB information_schema.launch	
+++ b/jOOQ-test/launch/Meta-Generate HSQLDB information_schema.launch	
@@ -7,6 +7,8 @@
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
 <listEntry value="1"/>
 </listAttribute>
+<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/>
+<stringAttribute key="org.eclipse.debug.core.source_locator_memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;sourceLookupDirector&gt;&#13;&#10;&lt;sourceContainers duplicates=&quot;false&quot;&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;javaProject name=&amp;quot;jOOQ-codegen&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.javaProject&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;classpathContainer path=&amp;quot;org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.classpathContainer&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;default/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.debug.core.containerType.default&quot;/&gt;&#13;&#10;&lt;/sourceContainers&gt;&#13;&#10;&lt;/sourceLookupDirector&gt;&#13;&#10;"/>
 <listAttribute key="org.eclipse.debug.ui.favoriteGroups">
 <listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
 <listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
diff --git a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/TESTFactory.java b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/MyFactory.java
similarity index 58%
rename from jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/TESTFactory.java
rename to jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/MyFactory.java
index 9556f51da5..f457dae411 100644
--- a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/TESTFactory.java
+++ b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/MyFactory.java
@@ -6,26 +6,26 @@ package org.jooq.test.oracle3.generatedclasses;
 /**
  * This class is generated by jOOQ.
  */
-public class TESTFactory extends org.jooq.util.oracle.OracleFactory implements java.lang.Cloneable {
+public class MyFactory extends org.jooq.util.oracle.OracleFactory implements java.lang.Cloneable {
 
-	private static final long serialVersionUID = -1620671743;
+	private static final long serialVersionUID = 684536071;
 
 	/**
 	 * Create a factory with a connection
 	 *
 	 * @param connection The connection to use with objects created from this factory
 	 */
-	public TESTFactory(java.sql.Connection connection) {
+	public MyFactory(java.sql.Connection connection) {
 		super(connection);
 	}
 
 	/**
 	 * Create a factory with a connection and a schema mapping
 	 * 
-	 * @deprecated - 2.0.5 - Use {@link #TESTFactory(java.sql.Connection, org.jooq.conf.Settings)} instead
+	 * @deprecated - 2.0.5 - Use {@link #MyFactory(java.sql.Connection, org.jooq.conf.Settings)} instead
 	 */
 	@Deprecated
-	public TESTFactory(java.sql.Connection connection, org.jooq.SchemaMapping mapping) {
+	public MyFactory(java.sql.Connection connection, org.jooq.SchemaMapping mapping) {
 		super(connection, mapping);
 	}
 
@@ -35,7 +35,7 @@ public class TESTFactory extends org.jooq.util.oracle.OracleFactory implements j
 	 * @param connection The connection to use with objects created from this factory
 	 * @param settings The settings to apply to objects created from this factory
 	 */
-	public TESTFactory(java.sql.Connection connection, org.jooq.conf.Settings settings) {
+	public MyFactory(java.sql.Connection connection, org.jooq.conf.Settings settings) {
 		super(connection, settings);
 	}
 }
diff --git a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/Dba.java b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/Dba.java
index b3619ec8f8..2f6dbb894f 100644
--- a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/Dba.java
+++ b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/Dba.java
@@ -8,10 +8,10 @@ package org.jooq.test.sybase.generatedclasses;
  */
 public class Dba extends org.jooq.impl.SchemaImpl {
 
-	private static final long serialVersionUID = -1082280310;
+	private static final long serialVersionUID = -507798902;
 
 	/**
-	 * The singleton instance of dba
+	 * The singleton instance of DBA
 	 */
 	public static final Dba DBA = new Dba();
 
@@ -19,7 +19,7 @@ public class Dba extends org.jooq.impl.SchemaImpl {
 	 * No further instances allowed
 	 */
 	private Dba() {
-		super("dba");
+		super("DBA");
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/Keys.java b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/Keys.java
index f29a280d9d..b36752d02f 100644
--- a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/Keys.java
+++ b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/Keys.java
@@ -6,7 +6,7 @@ package org.jooq.test.sybase.generatedclasses;
 /**
  * This class is generated by jOOQ.
  *
- * A class modelling foreign key relationships between tables of the dba schema
+ * A class modelling foreign key relationships between tables of the DBA schema
  */
 @SuppressWarnings({"unchecked"})
 public class Keys extends org.jooq.impl.AbstractKeys {
diff --git a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/Routines.java b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/Routines.java
index e9ad5c2f7e..5013cda63c 100644
--- a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/Routines.java
+++ b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/Routines.java
@@ -6,12 +6,12 @@ package org.jooq.test.sybase.generatedclasses;
 /**
  * This class is generated by jOOQ.
  *
- * Convenience access to all stored procedures and functions in dba
+ * Convenience access to all stored procedures and functions in DBA
  */
 public final class Routines {
 
 	/**
-	 * Call dba.f_author_exists
+	 * Call DBA.f_author_exists
 	 *
 	 * @param authorName
 	 * @throws org.jooq.exception.DataAccessException if something went wrong executing the query
@@ -25,7 +25,7 @@ public final class Routines {
 	}
 
 	/**
-	 * Get dba.f_author_exists as a field
+	 * Get DBA.f_author_exists as a field
 	 *
 	 * @param authorName
 	 */
@@ -37,7 +37,7 @@ public final class Routines {
 	}
 
 	/**
-	 * Get dba.f_author_exists as a field
+	 * Get DBA.f_author_exists as a field
 	 *
 	 * @param authorName
 	 */
@@ -49,7 +49,7 @@ public final class Routines {
 	}
 
 	/**
-	 * Call dba.f_number
+	 * Call DBA.f_number
 	 *
 	 * @param n
 	 * @throws org.jooq.exception.DataAccessException if something went wrong executing the query
@@ -63,7 +63,7 @@ public final class Routines {
 	}
 
 	/**
-	 * Get dba.f_number as a field
+	 * Get DBA.f_number as a field
 	 *
 	 * @param n
 	 */
@@ -75,7 +75,7 @@ public final class Routines {
 	}
 
 	/**
-	 * Get dba.f_number as a field
+	 * Get DBA.f_number as a field
 	 *
 	 * @param n
 	 */
@@ -87,7 +87,7 @@ public final class Routines {
 	}
 
 	/**
-	 * Call dba.f_one
+	 * Call DBA.f_one
 	 *
 	 * @throws org.jooq.exception.DataAccessException if something went wrong executing the query
 	 */
@@ -99,7 +99,7 @@ public final class Routines {
 	}
 
 	/**
-	 * Get dba.f_one as a field
+	 * Get DBA.f_one as a field
 	 *
 	 */
 	public static org.jooq.Field<java.lang.Integer> fOne() {
@@ -109,7 +109,7 @@ public final class Routines {
 	}
 
 	/**
-	 * Call dba.f317
+	 * Call DBA.f317
 	 *
 	 * @param p1
 	 * @param p2
@@ -129,7 +129,7 @@ public final class Routines {
 	}
 
 	/**
-	 * Get dba.f317 as a field
+	 * Get DBA.f317 as a field
 	 *
 	 * @param p1
 	 * @param p2
@@ -147,7 +147,7 @@ public final class Routines {
 	}
 
 	/**
-	 * Get dba.f317 as a field
+	 * Get DBA.f317 as a field
 	 *
 	 * @param p1
 	 * @param p2
@@ -165,7 +165,7 @@ public final class Routines {
 	}
 
 	/**
-	 * Call dba.p_author_exists
+	 * Call DBA.p_author_exists
 	 *
 	 * @param authorName IN parameter
 	 * @param result OUT parameter
@@ -180,7 +180,7 @@ public final class Routines {
 	}
 
 	/**
-	 * Call dba.p_create_author
+	 * Call DBA.p_create_author
 	 *
 	 * @throws org.jooq.exception.DataAccessException if something went wrong executing the query
 	 */
@@ -191,7 +191,7 @@ public final class Routines {
 	}
 
 	/**
-	 * Call dba.p_create_author_by_name
+	 * Call DBA.p_create_author_by_name
 	 *
 	 * @param pFirstName IN parameter
 	 * @param pLastName IN parameter
@@ -206,7 +206,7 @@ public final class Routines {
 	}
 
 	/**
-	 * Call dba.p_unused
+	 * Call DBA.p_unused
 	 *
 	 * @param in1 IN parameter
 	 * @param out1 OUT parameter
@@ -223,7 +223,7 @@ public final class Routines {
 	}
 
 	/**
-	 * Call dba.p391
+	 * Call DBA.p391
 	 *
 	 * @param i1 IN parameter
 	 * @param io1 IN OUT parameter
diff --git a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/Sequences.java b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/Sequences.java
index 2236316de0..62a71ef9f8 100644
--- a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/Sequences.java
+++ b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/Sequences.java
@@ -6,12 +6,12 @@ package org.jooq.test.sybase.generatedclasses;
 /**
  * This class is generated by jOOQ.
  *
- * Convenience access to all sequences in dba
+ * Convenience access to all sequences in DBA
  */
 public final class Sequences {
 
 	/**
-	 * The sequence dba.s_author_id
+	 * The sequence DBA.s_author_id
 	 */
 	public static final org.jooq.Sequence<java.math.BigInteger> S_AUTHOR_ID = new org.jooq.impl.SequenceImpl<java.math.BigInteger>("s_author_id", org.jooq.test.sybase.generatedclasses.Dba.DBA, org.jooq.impl.SQLDataType.DECIMAL_INTEGER);
 
diff --git a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/Tables.java b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/Tables.java
index a5dc2f9471..eb947f5622 100644
--- a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/Tables.java
+++ b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/Tables.java
@@ -6,47 +6,47 @@ package org.jooq.test.sybase.generatedclasses;
 /**
  * This class is generated by jOOQ.
  *
- * Convenience access to all tables in dba
+ * Convenience access to all tables in DBA
  */
 public final class Tables {
 
 	/**
-	 * The table dba.t_identity_pk
+	 * The table DBA.t_identity_pk
 	 */
 	public static org.jooq.test.sybase.generatedclasses.tables.TIdentityPk T_IDENTITY_PK = org.jooq.test.sybase.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK;
 
 	/**
-	 * The table dba.t_identity
+	 * The table DBA.t_identity
 	 */
 	public static org.jooq.test.sybase.generatedclasses.tables.TIdentity T_IDENTITY = org.jooq.test.sybase.generatedclasses.tables.TIdentity.T_IDENTITY;
 
 	/**
-	 * The table dba.t_dates
+	 * The table DBA.t_dates
 	 */
 	public static org.jooq.test.sybase.generatedclasses.tables.TDates T_DATES = org.jooq.test.sybase.generatedclasses.tables.TDates.T_DATES;
 
 	/**
-	 * The table dba.t_booleans
+	 * The table DBA.t_booleans
 	 */
 	public static org.jooq.test.sybase.generatedclasses.tables.TBooleans T_BOOLEANS = org.jooq.test.sybase.generatedclasses.tables.TBooleans.T_BOOLEANS;
 
 	/**
-	 * The table dba.t_triggers
+	 * The table DBA.t_triggers
 	 */
 	public static org.jooq.test.sybase.generatedclasses.tables.TTriggers T_TRIGGERS = org.jooq.test.sybase.generatedclasses.tables.TTriggers.T_TRIGGERS;
 
 	/**
-	 * The table dba.t_658_ref
+	 * The table DBA.t_658_ref
 	 */
 	public static org.jooq.test.sybase.generatedclasses.tables.T_658Ref T_658_REF = org.jooq.test.sybase.generatedclasses.tables.T_658Ref.T_658_REF;
 
 	/**
-	 * The table dba.t_725_lob_test
+	 * The table DBA.t_725_lob_test
 	 */
 	public static org.jooq.test.sybase.generatedclasses.tables.T_725LobTest T_725_LOB_TEST = org.jooq.test.sybase.generatedclasses.tables.T_725LobTest.T_725_LOB_TEST;
 
 	/**
-	 * The table dba.t_785
+	 * The table DBA.t_785
 	 */
 	public static org.jooq.test.sybase.generatedclasses.tables.T_785 T_785 = org.jooq.test.sybase.generatedclasses.tables.T_785.T_785;
 
@@ -71,52 +71,52 @@ public final class Tables {
 	public static org.jooq.test.sybase.generatedclasses.tables.TBookToBookStore T_BOOK_TO_BOOK_STORE = org.jooq.test.sybase.generatedclasses.tables.TBookToBookStore.T_BOOK_TO_BOOK_STORE;
 
 	/**
-	 * The table dba.x_unused
+	 * The table DBA.x_unused
 	 */
 	public static org.jooq.test.sybase.generatedclasses.tables.XUnused X_UNUSED = org.jooq.test.sybase.generatedclasses.tables.XUnused.X_UNUSED;
 
 	/**
-	 * The table dba.t_986_1
+	 * The table DBA.t_986_1
 	 */
 	public static org.jooq.test.sybase.generatedclasses.tables.T_986_1 T_986_1 = org.jooq.test.sybase.generatedclasses.tables.T_986_1.T_986_1;
 
 	/**
-	 * The table dba.t_986_2
+	 * The table DBA.t_986_2
 	 */
 	public static org.jooq.test.sybase.generatedclasses.tables.T_986_2 T_986_2 = org.jooq.test.sybase.generatedclasses.tables.T_986_2.T_986_2;
 
 	/**
-	 * The table dba.t_639_numbers_table
+	 * The table DBA.t_639_numbers_table
 	 */
 	public static org.jooq.test.sybase.generatedclasses.tables.T_639NumbersTable T_639_NUMBERS_TABLE = org.jooq.test.sybase.generatedclasses.tables.T_639NumbersTable.T_639_NUMBERS_TABLE;
 
 	/**
-	 * The table dba.x_test_case_64_69
+	 * The table DBA.x_test_case_64_69
 	 */
 	public static org.jooq.test.sybase.generatedclasses.tables.XTestCase_64_69 X_TEST_CASE_64_69 = org.jooq.test.sybase.generatedclasses.tables.XTestCase_64_69.X_TEST_CASE_64_69;
 
 	/**
-	 * The table dba.x_test_case_71
+	 * The table DBA.x_test_case_71
 	 */
 	public static org.jooq.test.sybase.generatedclasses.tables.XTestCase_71 X_TEST_CASE_71 = org.jooq.test.sybase.generatedclasses.tables.XTestCase_71.X_TEST_CASE_71;
 
 	/**
-	 * The table dba.x_test_case_85
+	 * The table DBA.x_test_case_85
 	 */
 	public static org.jooq.test.sybase.generatedclasses.tables.XTestCase_85 X_TEST_CASE_85 = org.jooq.test.sybase.generatedclasses.tables.XTestCase_85.X_TEST_CASE_85;
 
 	/**
-	 * The table dba.V_LIBRARY
+	 * The table DBA.V_LIBRARY
 	 */
 	public static org.jooq.test.sybase.generatedclasses.tables.VLibrary V_LIBRARY = org.jooq.test.sybase.generatedclasses.tables.VLibrary.V_LIBRARY;
 
 	/**
-	 * The table dba.v_author
+	 * The table DBA.v_author
 	 */
 	public static org.jooq.test.sybase.generatedclasses.tables.VAuthor V_AUTHOR = org.jooq.test.sybase.generatedclasses.tables.VAuthor.V_AUTHOR;
 
 	/**
-	 * The table dba.v_book
+	 * The table DBA.v_book
 	 */
 	public static org.jooq.test.sybase.generatedclasses.tables.VBook V_BOOK = org.jooq.test.sybase.generatedclasses.tables.VBook.V_BOOK;
 
diff --git a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/TAuthor.java b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/TAuthor.java
index adc505c287..ae97cd49f3 100644
--- a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/TAuthor.java
+++ b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/TAuthor.java
@@ -10,10 +10,10 @@ package org.jooq.test.sybase.generatedclasses.tables;
  */
 public class TAuthor extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.sybase.generatedclasses.tables.records.TAuthorRecord> {
 
-	private static final long serialVersionUID = -1629946604;
+	private static final long serialVersionUID = -742426380;
 
 	/**
-	 * The singleton instance of dba.t_author
+	 * The singleton instance of DBA.t_author
 	 */
 	public static final org.jooq.test.sybase.generatedclasses.tables.TAuthor T_AUTHOR = new org.jooq.test.sybase.generatedclasses.tables.TAuthor();
 
diff --git a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/TBook.java b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/TBook.java
index c088ff9c45..446f87a318 100644
--- a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/TBook.java
+++ b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/TBook.java
@@ -10,10 +10,10 @@ package org.jooq.test.sybase.generatedclasses.tables;
  */
 public class TBook extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.sybase.generatedclasses.tables.records.TBookRecord> {
 
-	private static final long serialVersionUID = -1417640119;
+	private static final long serialVersionUID = 1633955657;
 
 	/**
-	 * The singleton instance of dba.t_book
+	 * The singleton instance of DBA.t_book
 	 */
 	public static final org.jooq.test.sybase.generatedclasses.tables.TBook T_BOOK = new org.jooq.test.sybase.generatedclasses.tables.TBook();
 
@@ -43,7 +43,7 @@ public class TBook extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.sybase
 	 * <code><pre>
 	 * CONSTRAINT t_book__fk_t_book_author_id
 	 * FOREIGN KEY (AUTHOR_ID)
-	 * REFERENCES dba.t_author (ID)
+	 * REFERENCES DBA.t_author (ID)
 	 * </pre></code>
 	 */
 	public final org.jooq.TableField<org.jooq.test.sybase.generatedclasses.tables.records.TBookRecord, java.lang.Integer> AUTHOR_ID = createField("AUTHOR_ID", org.jooq.impl.SQLDataType.INTEGER, this);
@@ -54,7 +54,7 @@ public class TBook extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.sybase
 	 * <code><pre>
 	 * CONSTRAINT t_book__fk_t_book_co_author_id
 	 * FOREIGN KEY (CO_AUTHOR_ID)
-	 * REFERENCES dba.t_author (ID)
+	 * REFERENCES DBA.t_author (ID)
 	 * </pre></code>
 	 */
 	public final org.jooq.TableField<org.jooq.test.sybase.generatedclasses.tables.records.TBookRecord, java.lang.Integer> CO_AUTHOR_ID = createField("CO_AUTHOR_ID", org.jooq.impl.SQLDataType.INTEGER, this);
@@ -80,7 +80,7 @@ public class TBook extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.sybase
 	 * <code><pre>
 	 * CONSTRAINT t_book__fk_t_book_language_id
 	 * FOREIGN KEY (LANGUAGE_ID)
-	 * REFERENCES dba.t_language (id)
+	 * REFERENCES DBA.t_language (id)
 	 * </pre></code>
 	 */
 	public final org.jooq.TableField<org.jooq.test.sybase.generatedclasses.tables.records.TBookRecord, org.jooq.test.sybase.generatedclasses.enums.TLanguage> LANGUAGE_ID = createField("LANGUAGE_ID", org.jooq.impl.SQLDataType.INTEGER.asMasterDataType(org.jooq.test.sybase.generatedclasses.enums.TLanguage.class), this);
diff --git a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/TBookStore.java b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/TBookStore.java
index ce5797ed76..6422b8a0f4 100644
--- a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/TBookStore.java
+++ b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/TBookStore.java
@@ -10,10 +10,10 @@ package org.jooq.test.sybase.generatedclasses.tables;
  */
 public class TBookStore extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.sybase.generatedclasses.tables.records.TBookStoreRecord> {
 
-	private static final long serialVersionUID = 889537163;
+	private static final long serialVersionUID = -1979766101;
 
 	/**
-	 * The singleton instance of dba.t_book_store
+	 * The singleton instance of DBA.t_book_store
 	 */
 	public static final org.jooq.test.sybase.generatedclasses.tables.TBookStore T_BOOK_STORE = new org.jooq.test.sybase.generatedclasses.tables.TBookStore();
 
diff --git a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/TBookToBookStore.java b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/TBookToBookStore.java
index b8dcadb151..e76c06eef3 100644
--- a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/TBookToBookStore.java
+++ b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/TBookToBookStore.java
@@ -10,10 +10,10 @@ package org.jooq.test.sybase.generatedclasses.tables;
  */
 public class TBookToBookStore extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.sybase.generatedclasses.tables.records.TBookToBookStoreRecord> {
 
-	private static final long serialVersionUID = -455896257;
+	private static final long serialVersionUID = 2123407199;
 
 	/**
-	 * The singleton instance of dba.t_book_to_book_store
+	 * The singleton instance of DBA.t_book_to_book_store
 	 */
 	public static final org.jooq.test.sybase.generatedclasses.tables.TBookToBookStore T_BOOK_TO_BOOK_STORE = new org.jooq.test.sybase.generatedclasses.tables.TBookToBookStore();
 
@@ -38,7 +38,7 @@ public class TBookToBookStore extends org.jooq.impl.UpdatableTableImpl<org.jooq.
 	 * <code><pre>
 	 * CONSTRAINT t_book_to_book_store__fk_b2bs_bs_name
 	 * FOREIGN KEY (book_store_name)
-	 * REFERENCES dba.t_book_store (name)
+	 * REFERENCES DBA.t_book_store (name)
 	 * </pre></code>
 	 */
 	public final org.jooq.TableField<org.jooq.test.sybase.generatedclasses.tables.records.TBookToBookStoreRecord, java.lang.String> BOOK_STORE_NAME = createField("book_store_name", org.jooq.impl.SQLDataType.VARCHAR, this);
@@ -51,7 +51,7 @@ public class TBookToBookStore extends org.jooq.impl.UpdatableTableImpl<org.jooq.
 	 * <code><pre>
 	 * CONSTRAINT t_book_to_book_store__fk_b2bs_b_id
 	 * FOREIGN KEY (book_id)
-	 * REFERENCES dba.t_book (ID)
+	 * REFERENCES DBA.t_book (ID)
 	 * </pre></code>
 	 */
 	public final org.jooq.TableField<org.jooq.test.sybase.generatedclasses.tables.records.TBookToBookStoreRecord, java.lang.Integer> BOOK_ID = createField("book_id", org.jooq.impl.SQLDataType.INTEGER, this);
diff --git a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/TBooleans.java b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/TBooleans.java
index e0490a3939..7bfbffb097 100644
--- a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/TBooleans.java
+++ b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/TBooleans.java
@@ -8,10 +8,10 @@ package org.jooq.test.sybase.generatedclasses.tables;
  */
 public class TBooleans extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.sybase.generatedclasses.tables.records.TBooleansRecord> {
 
-	private static final long serialVersionUID = 179486705;
+	private static final long serialVersionUID = -1302068271;
 
 	/**
-	 * The singleton instance of dba.t_booleans
+	 * The singleton instance of DBA.t_booleans
 	 */
 	public static final org.jooq.test.sybase.generatedclasses.tables.TBooleans T_BOOLEANS = new org.jooq.test.sybase.generatedclasses.tables.TBooleans();
 
diff --git a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/TDates.java b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/TDates.java
index f89cb647b1..42cb50a0b2 100644
--- a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/TDates.java
+++ b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/TDates.java
@@ -8,10 +8,10 @@ package org.jooq.test.sybase.generatedclasses.tables;
  */
 public class TDates extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.sybase.generatedclasses.tables.records.TDatesRecord> {
 
-	private static final long serialVersionUID = -407338539;
+	private static final long serialVersionUID = -1292997195;
 
 	/**
-	 * The singleton instance of dba.t_dates
+	 * The singleton instance of DBA.t_dates
 	 */
 	public static final org.jooq.test.sybase.generatedclasses.tables.TDates T_DATES = new org.jooq.test.sybase.generatedclasses.tables.TDates();
 
diff --git a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/TIdentity.java b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/TIdentity.java
index bc7ac60c8a..af8b792e1f 100644
--- a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/TIdentity.java
+++ b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/TIdentity.java
@@ -8,10 +8,10 @@ package org.jooq.test.sybase.generatedclasses.tables;
  */
 public class TIdentity extends org.jooq.impl.TableImpl<org.jooq.test.sybase.generatedclasses.tables.records.TIdentityRecord> {
 
-	private static final long serialVersionUID = -659009862;
+	private static final long serialVersionUID = -14435686;
 
 	/**
-	 * The singleton instance of dba.t_identity
+	 * The singleton instance of DBA.t_identity
 	 */
 	public static final org.jooq.test.sybase.generatedclasses.tables.TIdentity T_IDENTITY = new org.jooq.test.sybase.generatedclasses.tables.TIdentity();
 
diff --git a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/TIdentityPk.java b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/TIdentityPk.java
index a2fc9fa79f..f12a754922 100644
--- a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/TIdentityPk.java
+++ b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/TIdentityPk.java
@@ -8,10 +8,10 @@ package org.jooq.test.sybase.generatedclasses.tables;
  */
 public class TIdentityPk extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.sybase.generatedclasses.tables.records.TIdentityPkRecord> {
 
-	private static final long serialVersionUID = -1258048680;
+	private static final long serialVersionUID = -1254731976;
 
 	/**
-	 * The singleton instance of dba.t_identity_pk
+	 * The singleton instance of DBA.t_identity_pk
 	 */
 	public static final org.jooq.test.sybase.generatedclasses.tables.TIdentityPk T_IDENTITY_PK = new org.jooq.test.sybase.generatedclasses.tables.TIdentityPk();
 
diff --git a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/TTriggers.java b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/TTriggers.java
index e4c45b701c..d0811381a2 100644
--- a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/TTriggers.java
+++ b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/TTriggers.java
@@ -8,10 +8,10 @@ package org.jooq.test.sybase.generatedclasses.tables;
  */
 public class TTriggers extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.sybase.generatedclasses.tables.records.TTriggersRecord> {
 
-	private static final long serialVersionUID = 2012383406;
+	private static final long serialVersionUID = -1883757426;
 
 	/**
-	 * The singleton instance of dba.t_triggers
+	 * The singleton instance of DBA.t_triggers
 	 */
 	public static final org.jooq.test.sybase.generatedclasses.tables.TTriggers T_TRIGGERS = new org.jooq.test.sybase.generatedclasses.tables.TTriggers();
 
diff --git a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/T_639NumbersTable.java b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/T_639NumbersTable.java
index da6f94b086..a2a0bbd944 100644
--- a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/T_639NumbersTable.java
+++ b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/T_639NumbersTable.java
@@ -8,10 +8,10 @@ package org.jooq.test.sybase.generatedclasses.tables;
  */
 public class T_639NumbersTable extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.sybase.generatedclasses.tables.records.T_639NumbersTableRecord> {
 
-	private static final long serialVersionUID = 969159138;
+	private static final long serialVersionUID = -1237086782;
 
 	/**
-	 * The singleton instance of dba.t_639_numbers_table
+	 * The singleton instance of DBA.t_639_numbers_table
 	 */
 	public static final org.jooq.test.sybase.generatedclasses.tables.T_639NumbersTable T_639_NUMBERS_TABLE = new org.jooq.test.sybase.generatedclasses.tables.T_639NumbersTable();
 
diff --git a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/T_658Ref.java b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/T_658Ref.java
index f4936aea62..30be436a6f 100644
--- a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/T_658Ref.java
+++ b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/T_658Ref.java
@@ -8,10 +8,10 @@ package org.jooq.test.sybase.generatedclasses.tables;
  */
 public class T_658Ref extends org.jooq.impl.TableImpl<org.jooq.test.sybase.generatedclasses.tables.records.T_658RefRecord> {
 
-	private static final long serialVersionUID = 360979435;
+	private static final long serialVersionUID = 1473526731;
 
 	/**
-	 * The singleton instance of dba.t_658_ref
+	 * The singleton instance of DBA.t_658_ref
 	 */
 	public static final org.jooq.test.sybase.generatedclasses.tables.T_658Ref T_658_REF = new org.jooq.test.sybase.generatedclasses.tables.T_658Ref();
 
@@ -34,7 +34,7 @@ public class T_658Ref extends org.jooq.impl.TableImpl<org.jooq.test.sybase.gener
 	 * <code><pre>
 	 * CONSTRAINT t_658_ref__fk_t_658_11
 	 * FOREIGN KEY (ref_11)
-	 * REFERENCES dba.t_658_11 (id)
+	 * REFERENCES DBA.t_658_11 (id)
 	 * </pre></code>
 	 */
 	public final org.jooq.TableField<org.jooq.test.sybase.generatedclasses.tables.records.T_658RefRecord, org.jooq.test.sybase.generatedclasses.enums.T_658_11> REF_11 = createField("ref_11", org.jooq.impl.SQLDataType.CHAR.asMasterDataType(org.jooq.test.sybase.generatedclasses.enums.T_658_11.class), this);
@@ -45,7 +45,7 @@ public class T_658Ref extends org.jooq.impl.TableImpl<org.jooq.test.sybase.gener
 	 * <code><pre>
 	 * CONSTRAINT t_658_ref__fk_t_658_21
 	 * FOREIGN KEY (ref_21)
-	 * REFERENCES dba.t_658_21 (id)
+	 * REFERENCES DBA.t_658_21 (id)
 	 * </pre></code>
 	 */
 	public final org.jooq.TableField<org.jooq.test.sybase.generatedclasses.tables.records.T_658RefRecord, org.jooq.test.sybase.generatedclasses.enums.T_658_21> REF_21 = createField("ref_21", org.jooq.impl.SQLDataType.INTEGER.asMasterDataType(org.jooq.test.sybase.generatedclasses.enums.T_658_21.class), this);
@@ -56,7 +56,7 @@ public class T_658Ref extends org.jooq.impl.TableImpl<org.jooq.test.sybase.gener
 	 * <code><pre>
 	 * CONSTRAINT t_658_ref__fk_t_658_31
 	 * FOREIGN KEY (ref_31)
-	 * REFERENCES dba.t_658_31 (id)
+	 * REFERENCES DBA.t_658_31 (id)
 	 * </pre></code>
 	 */
 	public final org.jooq.TableField<org.jooq.test.sybase.generatedclasses.tables.records.T_658RefRecord, org.jooq.test.sybase.generatedclasses.enums.T_658_31> REF_31 = createField("ref_31", org.jooq.impl.SQLDataType.BIGINT.asMasterDataType(org.jooq.test.sybase.generatedclasses.enums.T_658_31.class), this);
@@ -67,7 +67,7 @@ public class T_658Ref extends org.jooq.impl.TableImpl<org.jooq.test.sybase.gener
 	 * <code><pre>
 	 * CONSTRAINT t_658_ref__fk_t_658_12
 	 * FOREIGN KEY (ref_12)
-	 * REFERENCES dba.t_658_12 (id)
+	 * REFERENCES DBA.t_658_12 (id)
 	 * </pre></code>
 	 */
 	public final org.jooq.TableField<org.jooq.test.sybase.generatedclasses.tables.records.T_658RefRecord, org.jooq.test.sybase.generatedclasses.enums.T_658_12> REF_12 = createField("ref_12", org.jooq.impl.SQLDataType.CHAR.asMasterDataType(org.jooq.test.sybase.generatedclasses.enums.T_658_12.class), this);
@@ -78,7 +78,7 @@ public class T_658Ref extends org.jooq.impl.TableImpl<org.jooq.test.sybase.gener
 	 * <code><pre>
 	 * CONSTRAINT t_658_ref__fk_t_658_22
 	 * FOREIGN KEY (ref_22)
-	 * REFERENCES dba.t_658_22 (id)
+	 * REFERENCES DBA.t_658_22 (id)
 	 * </pre></code>
 	 */
 	public final org.jooq.TableField<org.jooq.test.sybase.generatedclasses.tables.records.T_658RefRecord, org.jooq.test.sybase.generatedclasses.enums.T_658_22> REF_22 = createField("ref_22", org.jooq.impl.SQLDataType.INTEGER.asMasterDataType(org.jooq.test.sybase.generatedclasses.enums.T_658_22.class), this);
@@ -89,7 +89,7 @@ public class T_658Ref extends org.jooq.impl.TableImpl<org.jooq.test.sybase.gener
 	 * <code><pre>
 	 * CONSTRAINT t_658_ref__fk_t_658_32
 	 * FOREIGN KEY (ref_32)
-	 * REFERENCES dba.t_658_32 (id)
+	 * REFERENCES DBA.t_658_32 (id)
 	 * </pre></code>
 	 */
 	public final org.jooq.TableField<org.jooq.test.sybase.generatedclasses.tables.records.T_658RefRecord, org.jooq.test.sybase.generatedclasses.enums.T_658_32> REF_32 = createField("ref_32", org.jooq.impl.SQLDataType.BIGINT.asMasterDataType(org.jooq.test.sybase.generatedclasses.enums.T_658_32.class), this);
diff --git a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/T_725LobTest.java b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/T_725LobTest.java
index cb7d139d5e..9643fc3f04 100644
--- a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/T_725LobTest.java
+++ b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/T_725LobTest.java
@@ -8,10 +8,10 @@ package org.jooq.test.sybase.generatedclasses.tables;
  */
 public class T_725LobTest extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.sybase.generatedclasses.tables.records.T_725LobTestRecord> {
 
-	private static final long serialVersionUID = -994804325;
+	private static final long serialVersionUID = 1029726587;
 
 	/**
-	 * The singleton instance of dba.t_725_lob_test
+	 * The singleton instance of DBA.t_725_lob_test
 	 */
 	public static final org.jooq.test.sybase.generatedclasses.tables.T_725LobTest T_725_LOB_TEST = new org.jooq.test.sybase.generatedclasses.tables.T_725LobTest();
 
diff --git a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/T_785.java b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/T_785.java
index 5eadc48963..b0699a9fbf 100644
--- a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/T_785.java
+++ b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/T_785.java
@@ -8,10 +8,10 @@ package org.jooq.test.sybase.generatedclasses.tables;
  */
 public class T_785 extends org.jooq.impl.TableImpl<org.jooq.test.sybase.generatedclasses.tables.records.T_785Record> {
 
-	private static final long serialVersionUID = 466752406;
+	private static final long serialVersionUID = -23001226;
 
 	/**
-	 * The singleton instance of dba.t_785
+	 * The singleton instance of DBA.t_785
 	 */
 	public static final org.jooq.test.sybase.generatedclasses.tables.T_785 T_785 = new org.jooq.test.sybase.generatedclasses.tables.T_785();
 
diff --git a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/T_986_1.java b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/T_986_1.java
index 48764cdddc..81382f2cdd 100644
--- a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/T_986_1.java
+++ b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/T_986_1.java
@@ -8,10 +8,10 @@ package org.jooq.test.sybase.generatedclasses.tables;
  */
 public class T_986_1 extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.sybase.generatedclasses.tables.records.T_986_1Record> {
 
-	private static final long serialVersionUID = -1521794986;
+	private static final long serialVersionUID = -921462634;
 
 	/**
-	 * The singleton instance of dba.t_986_1
+	 * The singleton instance of DBA.t_986_1
 	 */
 	public static final org.jooq.test.sybase.generatedclasses.tables.T_986_1 T_986_1 = new org.jooq.test.sybase.generatedclasses.tables.T_986_1();
 
@@ -36,7 +36,7 @@ public class T_986_1 extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.syba
 	 * <code><pre>
 	 * CONSTRAINT t_986_1__fk_986
 	 * FOREIGN KEY (REF)
-	 * REFERENCES dba.x_unused (ID)
+	 * REFERENCES DBA.x_unused (ID)
 	 * </pre></code>
 	 */
 	public final org.jooq.TableField<org.jooq.test.sybase.generatedclasses.tables.records.T_986_1Record, java.lang.Integer> REF = createField("REF", org.jooq.impl.SQLDataType.INTEGER, this);
diff --git a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/T_986_2.java b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/T_986_2.java
index d19817aa65..faecd2b6af 100644
--- a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/T_986_2.java
+++ b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/T_986_2.java
@@ -8,10 +8,10 @@ package org.jooq.test.sybase.generatedclasses.tables;
  */
 public class T_986_2 extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.sybase.generatedclasses.tables.records.T_986_2Record> {
 
-	private static final long serialVersionUID = -399479787;
+	private static final long serialVersionUID = 200852565;
 
 	/**
-	 * The singleton instance of dba.t_986_2
+	 * The singleton instance of DBA.t_986_2
 	 */
 	public static final org.jooq.test.sybase.generatedclasses.tables.T_986_2 T_986_2 = new org.jooq.test.sybase.generatedclasses.tables.T_986_2();
 
@@ -36,7 +36,7 @@ public class T_986_2 extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.syba
 	 * <code><pre>
 	 * CONSTRAINT t_986_2__fk_986
 	 * FOREIGN KEY (REF)
-	 * REFERENCES dba.x_unused (ID)
+	 * REFERENCES DBA.x_unused (ID)
 	 * </pre></code>
 	 */
 	public final org.jooq.TableField<org.jooq.test.sybase.generatedclasses.tables.records.T_986_2Record, java.lang.Integer> REF = createField("REF", org.jooq.impl.SQLDataType.INTEGER, this);
diff --git a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/VAuthor.java b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/VAuthor.java
index 9e8618658a..bbedb307f8 100644
--- a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/VAuthor.java
+++ b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/VAuthor.java
@@ -8,10 +8,10 @@ package org.jooq.test.sybase.generatedclasses.tables;
  */
 public class VAuthor extends org.jooq.impl.TableImpl<org.jooq.test.sybase.generatedclasses.tables.records.VAuthorRecord> {
 
-	private static final long serialVersionUID = -254559111;
+	private static final long serialVersionUID = 698010777;
 
 	/**
-	 * The singleton instance of dba.v_author
+	 * The singleton instance of DBA.v_author
 	 */
 	public static final org.jooq.test.sybase.generatedclasses.tables.VAuthor V_AUTHOR = new org.jooq.test.sybase.generatedclasses.tables.VAuthor();
 
diff --git a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/VBook.java b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/VBook.java
index 99b0e62119..74d7173632 100644
--- a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/VBook.java
+++ b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/VBook.java
@@ -8,10 +8,10 @@ package org.jooq.test.sybase.generatedclasses.tables;
  */
 public class VBook extends org.jooq.impl.TableImpl<org.jooq.test.sybase.generatedclasses.tables.records.VBookRecord> {
 
-	private static final long serialVersionUID = 1432037652;
+	private static final long serialVersionUID = 590330164;
 
 	/**
-	 * The singleton instance of dba.v_book
+	 * The singleton instance of DBA.v_book
 	 */
 	public static final org.jooq.test.sybase.generatedclasses.tables.VBook V_BOOK = new org.jooq.test.sybase.generatedclasses.tables.VBook();
 
diff --git a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/VLibrary.java b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/VLibrary.java
index 87a7c0067b..fc834b1bf3 100644
--- a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/VLibrary.java
+++ b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/VLibrary.java
@@ -8,10 +8,10 @@ package org.jooq.test.sybase.generatedclasses.tables;
  */
 public class VLibrary extends org.jooq.impl.TableImpl<org.jooq.test.sybase.generatedclasses.tables.records.VLibraryRecord> {
 
-	private static final long serialVersionUID = 1903292517;
+	private static final long serialVersionUID = 366282885;
 
 	/**
-	 * The singleton instance of dba.V_LIBRARY
+	 * The singleton instance of DBA.V_LIBRARY
 	 */
 	public static final org.jooq.test.sybase.generatedclasses.tables.VLibrary V_LIBRARY = new org.jooq.test.sybase.generatedclasses.tables.VLibrary();
 
diff --git a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/XTestCase_64_69.java b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/XTestCase_64_69.java
index ff060739bc..a7f1480989 100644
--- a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/XTestCase_64_69.java
+++ b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/XTestCase_64_69.java
@@ -8,10 +8,10 @@ package org.jooq.test.sybase.generatedclasses.tables;
  */
 public class XTestCase_64_69 extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.sybase.generatedclasses.tables.records.XTestCase_64_69Record> {
 
-	private static final long serialVersionUID = 1781350785;
+	private static final long serialVersionUID = 1099632961;
 
 	/**
-	 * The singleton instance of dba.x_test_case_64_69
+	 * The singleton instance of DBA.x_test_case_64_69
 	 */
 	public static final org.jooq.test.sybase.generatedclasses.tables.XTestCase_64_69 X_TEST_CASE_64_69 = new org.jooq.test.sybase.generatedclasses.tables.XTestCase_64_69();
 
@@ -41,7 +41,7 @@ public class XTestCase_64_69 extends org.jooq.impl.UpdatableTableImpl<org.jooq.t
 	 * <code><pre>
 	 * CONSTRAINT x_test_case_64_69__fk_x_test_case_64_69a
 	 * FOREIGN KEY (UNUSED_ID)
-	 * REFERENCES dba.x_unused (ID)
+	 * REFERENCES DBA.x_unused (ID)
 	 * </pre></code>
 	 */
 	public final org.jooq.TableField<org.jooq.test.sybase.generatedclasses.tables.records.XTestCase_64_69Record, java.lang.Integer> UNUSED_ID = createField("UNUSED_ID", org.jooq.impl.SQLDataType.INTEGER, this);
diff --git a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/XTestCase_71.java b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/XTestCase_71.java
index 2f2317645a..f16a99e475 100644
--- a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/XTestCase_71.java
+++ b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/XTestCase_71.java
@@ -8,10 +8,10 @@ package org.jooq.test.sybase.generatedclasses.tables;
  */
 public class XTestCase_71 extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.sybase.generatedclasses.tables.records.XTestCase_71Record> {
 
-	private static final long serialVersionUID = 947582373;
+	private static final long serialVersionUID = 442824165;
 
 	/**
-	 * The singleton instance of dba.x_test_case_71
+	 * The singleton instance of DBA.x_test_case_71
 	 */
 	public static final org.jooq.test.sybase.generatedclasses.tables.XTestCase_71 X_TEST_CASE_71 = new org.jooq.test.sybase.generatedclasses.tables.XTestCase_71();
 
@@ -41,7 +41,7 @@ public class XTestCase_71 extends org.jooq.impl.UpdatableTableImpl<org.jooq.test
 	 * <code><pre>
 	 * CONSTRAINT x_test_case_71__fk_x_test_case_71
 	 * FOREIGN KEY (TEST_CASE_64_69_ID)
-	 * REFERENCES dba.x_test_case_64_69 (ID)
+	 * REFERENCES DBA.x_test_case_64_69 (ID)
 	 * </pre></code>
 	 */
 	public final org.jooq.TableField<org.jooq.test.sybase.generatedclasses.tables.records.XTestCase_71Record, java.lang.Integer> TEST_CASE_64_69_ID = createField("TEST_CASE_64_69_ID", org.jooq.impl.SQLDataType.INTEGER, this);
diff --git a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/XTestCase_85.java b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/XTestCase_85.java
index 34cd6e0787..5c998119f0 100644
--- a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/XTestCase_85.java
+++ b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/XTestCase_85.java
@@ -8,10 +8,10 @@ package org.jooq.test.sybase.generatedclasses.tables;
  */
 public class XTestCase_85 extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.sybase.generatedclasses.tables.records.XTestCase_85Record> {
 
-	private static final long serialVersionUID = 973148167;
+	private static final long serialVersionUID = 496357351;
 
 	/**
-	 * The singleton instance of dba.x_test_case_85
+	 * The singleton instance of DBA.x_test_case_85
 	 */
 	public static final org.jooq.test.sybase.generatedclasses.tables.XTestCase_85 X_TEST_CASE_85 = new org.jooq.test.sybase.generatedclasses.tables.XTestCase_85();
 
@@ -41,7 +41,7 @@ public class XTestCase_85 extends org.jooq.impl.UpdatableTableImpl<org.jooq.test
 	 * <code><pre>
 	 * CONSTRAINT x_test_case_85__fk_x_test_case_85
 	 * FOREIGN KEY (x_unused_id, x_unused_name)
-	 * REFERENCES dba.x_unused (ID, NAME)
+	 * REFERENCES DBA.x_unused (ID, NAME)
 	 * </pre></code>
 	 */
 	public final org.jooq.TableField<org.jooq.test.sybase.generatedclasses.tables.records.XTestCase_85Record, java.lang.Integer> X_UNUSED_ID = createField("x_unused_id", org.jooq.impl.SQLDataType.INTEGER, this);
@@ -52,7 +52,7 @@ public class XTestCase_85 extends org.jooq.impl.UpdatableTableImpl<org.jooq.test
 	 * <code><pre>
 	 * CONSTRAINT x_test_case_85__fk_x_test_case_85
 	 * FOREIGN KEY (x_unused_id, x_unused_name)
-	 * REFERENCES dba.x_unused (ID, NAME)
+	 * REFERENCES DBA.x_unused (ID, NAME)
 	 * </pre></code>
 	 */
 	public final org.jooq.TableField<org.jooq.test.sybase.generatedclasses.tables.records.XTestCase_85Record, java.lang.String> X_UNUSED_NAME = createField("x_unused_name", org.jooq.impl.SQLDataType.VARCHAR, this);
diff --git a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/XUnused.java b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/XUnused.java
index f1f598aece..74581a87d9 100644
--- a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/XUnused.java
+++ b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/XUnused.java
@@ -8,10 +8,10 @@ package org.jooq.test.sybase.generatedclasses.tables;
  */
 public class XUnused extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.sybase.generatedclasses.tables.records.XUnusedRecord> {
 
-	private static final long serialVersionUID = -1256574052;
+	private static final long serialVersionUID = 1231742908;
 
 	/**
-	 * The singleton instance of dba.x_unused
+	 * The singleton instance of DBA.x_unused
 	 */
 	public static final org.jooq.test.sybase.generatedclasses.tables.XUnused X_UNUSED = new org.jooq.test.sybase.generatedclasses.tables.XUnused();
 
@@ -53,7 +53,7 @@ public class XUnused extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.syba
 	 * <code><pre>
 	 * CONSTRAINT x_unused__fk_x_unused_self
 	 * FOREIGN KEY (ID_REF, NAME_REF)
-	 * REFERENCES dba.x_unused (ID, NAME)
+	 * REFERENCES DBA.x_unused (ID, NAME)
 	 * </pre></code>
 	 */
 	public final org.jooq.TableField<org.jooq.test.sybase.generatedclasses.tables.records.XUnusedRecord, java.lang.Integer> ID_REF = createField("ID_REF", org.jooq.impl.SQLDataType.INTEGER, this);
@@ -64,7 +64,7 @@ public class XUnused extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.syba
 	 * <code><pre>
 	 * CONSTRAINT x_unused__fk_x_unused_self
 	 * FOREIGN KEY (ID_REF, NAME_REF)
-	 * REFERENCES dba.x_unused (ID, NAME)
+	 * REFERENCES DBA.x_unused (ID, NAME)
 	 * </pre></code>
 	 */
 	public final org.jooq.TableField<org.jooq.test.sybase.generatedclasses.tables.records.XUnusedRecord, java.lang.String> NAME_REF = createField("NAME_REF", org.jooq.impl.SQLDataType.VARCHAR, this);
diff --git a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/records/TBookRecord.java b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/records/TBookRecord.java
index 3bde079dce..a1b1200117 100644
--- a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/records/TBookRecord.java
+++ b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/records/TBookRecord.java
@@ -10,7 +10,7 @@ package org.jooq.test.sybase.generatedclasses.tables.records;
  */
 public class TBookRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.test.sybase.generatedclasses.tables.records.TBookRecord> {
 
-	private static final long serialVersionUID = -496099882;
+	private static final long serialVersionUID = 755082710;
 
 	/**
 	 * An uncommented item
@@ -48,7 +48,7 @@ public class TBookRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.test
 	 * <code><pre>
 	 * CONSTRAINT t_book__fk_t_book_author_id
 	 * FOREIGN KEY (AUTHOR_ID)
-	 * REFERENCES dba.t_author (ID)
+	 * REFERENCES DBA.t_author (ID)
 	 * </pre></code>
 	 */
 	public void setAuthorId(java.lang.Integer value) {
@@ -61,7 +61,7 @@ public class TBookRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.test
 	 * <code><pre>
 	 * CONSTRAINT t_book__fk_t_book_author_id
 	 * FOREIGN KEY (AUTHOR_ID)
-	 * REFERENCES dba.t_author (ID)
+	 * REFERENCES DBA.t_author (ID)
 	 * </pre></code>
 	 */
 	public java.lang.Integer getAuthorId() {
@@ -74,7 +74,7 @@ public class TBookRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.test
 	 * <code><pre>
 	 * CONSTRAINT t_book__fk_t_book_author_id
 	 * FOREIGN KEY (AUTHOR_ID)
-	 * REFERENCES dba.t_author (ID)
+	 * REFERENCES DBA.t_author (ID)
 	 * </pre></code>
 	 */
 	public org.jooq.test.sybase.generatedclasses.tables.records.TAuthorRecord fetchTAuthorByAuthorId() {
@@ -90,7 +90,7 @@ public class TBookRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.test
 	 * <code><pre>
 	 * CONSTRAINT t_book__fk_t_book_co_author_id
 	 * FOREIGN KEY (CO_AUTHOR_ID)
-	 * REFERENCES dba.t_author (ID)
+	 * REFERENCES DBA.t_author (ID)
 	 * </pre></code>
 	 */
 	public void setCoAuthorId(java.lang.Integer value) {
@@ -103,7 +103,7 @@ public class TBookRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.test
 	 * <code><pre>
 	 * CONSTRAINT t_book__fk_t_book_co_author_id
 	 * FOREIGN KEY (CO_AUTHOR_ID)
-	 * REFERENCES dba.t_author (ID)
+	 * REFERENCES DBA.t_author (ID)
 	 * </pre></code>
 	 */
 	public java.lang.Integer getCoAuthorId() {
@@ -116,7 +116,7 @@ public class TBookRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.test
 	 * <code><pre>
 	 * CONSTRAINT t_book__fk_t_book_co_author_id
 	 * FOREIGN KEY (CO_AUTHOR_ID)
-	 * REFERENCES dba.t_author (ID)
+	 * REFERENCES DBA.t_author (ID)
 	 * </pre></code>
 	 */
 	public org.jooq.test.sybase.generatedclasses.tables.records.TAuthorRecord fetchTAuthorByCoAuthorId() {
@@ -174,7 +174,7 @@ public class TBookRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.test
 	 * <code><pre>
 	 * CONSTRAINT t_book__fk_t_book_language_id
 	 * FOREIGN KEY (LANGUAGE_ID)
-	 * REFERENCES dba.t_language (id)
+	 * REFERENCES DBA.t_language (id)
 	 * </pre></code>
 	 */
 	public void setLanguageId(org.jooq.test.sybase.generatedclasses.enums.TLanguage value) {
@@ -187,7 +187,7 @@ public class TBookRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.test
 	 * <code><pre>
 	 * CONSTRAINT t_book__fk_t_book_language_id
 	 * FOREIGN KEY (LANGUAGE_ID)
-	 * REFERENCES dba.t_language (id)
+	 * REFERENCES DBA.t_language (id)
 	 * </pre></code>
 	 */
 	public org.jooq.test.sybase.generatedclasses.enums.TLanguage getLanguageId() {
diff --git a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/records/TBookToBookStoreRecord.java b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/records/TBookToBookStoreRecord.java
index db7df35365..a244ed86a0 100644
--- a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/records/TBookToBookStoreRecord.java
+++ b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/records/TBookToBookStoreRecord.java
@@ -10,7 +10,7 @@ package org.jooq.test.sybase.generatedclasses.tables.records;
  */
 public class TBookToBookStoreRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.test.sybase.generatedclasses.tables.records.TBookToBookStoreRecord> {
 
-	private static final long serialVersionUID = 415329347;
+	private static final long serialVersionUID = 1150173123;
 
 	/**
 	 * An uncommented item
@@ -20,7 +20,7 @@ public class TBookToBookStoreRecord extends org.jooq.impl.UpdatableRecordImpl<or
 	 * <code><pre>
 	 * CONSTRAINT t_book_to_book_store__fk_b2bs_bs_name
 	 * FOREIGN KEY (book_store_name)
-	 * REFERENCES dba.t_book_store (name)
+	 * REFERENCES DBA.t_book_store (name)
 	 * </pre></code>
 	 */
 	public void setBookStoreName(java.lang.String value) {
@@ -35,7 +35,7 @@ public class TBookToBookStoreRecord extends org.jooq.impl.UpdatableRecordImpl<or
 	 * <code><pre>
 	 * CONSTRAINT t_book_to_book_store__fk_b2bs_bs_name
 	 * FOREIGN KEY (book_store_name)
-	 * REFERENCES dba.t_book_store (name)
+	 * REFERENCES DBA.t_book_store (name)
 	 * </pre></code>
 	 */
 	public java.lang.String getBookStoreName() {
@@ -50,7 +50,7 @@ public class TBookToBookStoreRecord extends org.jooq.impl.UpdatableRecordImpl<or
 	 * <code><pre>
 	 * CONSTRAINT t_book_to_book_store__fk_b2bs_bs_name
 	 * FOREIGN KEY (book_store_name)
-	 * REFERENCES dba.t_book_store (name)
+	 * REFERENCES DBA.t_book_store (name)
 	 * </pre></code>
 	 */
 	public org.jooq.test.sybase.generatedclasses.tables.records.TBookStoreRecord fetchTBookStore() {
@@ -68,7 +68,7 @@ public class TBookToBookStoreRecord extends org.jooq.impl.UpdatableRecordImpl<or
 	 * <code><pre>
 	 * CONSTRAINT t_book_to_book_store__fk_b2bs_b_id
 	 * FOREIGN KEY (book_id)
-	 * REFERENCES dba.t_book (ID)
+	 * REFERENCES DBA.t_book (ID)
 	 * </pre></code>
 	 */
 	public void setBookId(java.lang.Integer value) {
@@ -83,7 +83,7 @@ public class TBookToBookStoreRecord extends org.jooq.impl.UpdatableRecordImpl<or
 	 * <code><pre>
 	 * CONSTRAINT t_book_to_book_store__fk_b2bs_b_id
 	 * FOREIGN KEY (book_id)
-	 * REFERENCES dba.t_book (ID)
+	 * REFERENCES DBA.t_book (ID)
 	 * </pre></code>
 	 */
 	public java.lang.Integer getBookId() {
@@ -98,7 +98,7 @@ public class TBookToBookStoreRecord extends org.jooq.impl.UpdatableRecordImpl<or
 	 * <code><pre>
 	 * CONSTRAINT t_book_to_book_store__fk_b2bs_b_id
 	 * FOREIGN KEY (book_id)
-	 * REFERENCES dba.t_book (ID)
+	 * REFERENCES DBA.t_book (ID)
 	 * </pre></code>
 	 */
 	public org.jooq.test.sybase.generatedclasses.tables.records.TBookRecord fetchTBook() {
diff --git a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/records/T_658RefRecord.java b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/records/T_658RefRecord.java
index 4c6c523301..e9e6d55a5b 100644
--- a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/records/T_658RefRecord.java
+++ b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/records/T_658RefRecord.java
@@ -8,7 +8,7 @@ package org.jooq.test.sybase.generatedclasses.tables.records;
  */
 public class T_658RefRecord extends org.jooq.impl.TableRecordImpl<org.jooq.test.sybase.generatedclasses.tables.records.T_658RefRecord> {
 
-	private static final long serialVersionUID = -1671042585;
+	private static final long serialVersionUID = 512539495;
 
 	/**
 	 * An uncommented item
@@ -16,7 +16,7 @@ public class T_658RefRecord extends org.jooq.impl.TableRecordImpl<org.jooq.test.
 	 * <code><pre>
 	 * CONSTRAINT t_658_ref__fk_t_658_11
 	 * FOREIGN KEY (ref_11)
-	 * REFERENCES dba.t_658_11 (id)
+	 * REFERENCES DBA.t_658_11 (id)
 	 * </pre></code>
 	 */
 	public void setRef_11(org.jooq.test.sybase.generatedclasses.enums.T_658_11 value) {
@@ -29,7 +29,7 @@ public class T_658RefRecord extends org.jooq.impl.TableRecordImpl<org.jooq.test.
 	 * <code><pre>
 	 * CONSTRAINT t_658_ref__fk_t_658_11
 	 * FOREIGN KEY (ref_11)
-	 * REFERENCES dba.t_658_11 (id)
+	 * REFERENCES DBA.t_658_11 (id)
 	 * </pre></code>
 	 */
 	public org.jooq.test.sybase.generatedclasses.enums.T_658_11 getRef_11() {
@@ -42,7 +42,7 @@ public class T_658RefRecord extends org.jooq.impl.TableRecordImpl<org.jooq.test.
 	 * <code><pre>
 	 * CONSTRAINT t_658_ref__fk_t_658_21
 	 * FOREIGN KEY (ref_21)
-	 * REFERENCES dba.t_658_21 (id)
+	 * REFERENCES DBA.t_658_21 (id)
 	 * </pre></code>
 	 */
 	public void setRef_21(org.jooq.test.sybase.generatedclasses.enums.T_658_21 value) {
@@ -55,7 +55,7 @@ public class T_658RefRecord extends org.jooq.impl.TableRecordImpl<org.jooq.test.
 	 * <code><pre>
 	 * CONSTRAINT t_658_ref__fk_t_658_21
 	 * FOREIGN KEY (ref_21)
-	 * REFERENCES dba.t_658_21 (id)
+	 * REFERENCES DBA.t_658_21 (id)
 	 * </pre></code>
 	 */
 	public org.jooq.test.sybase.generatedclasses.enums.T_658_21 getRef_21() {
@@ -68,7 +68,7 @@ public class T_658RefRecord extends org.jooq.impl.TableRecordImpl<org.jooq.test.
 	 * <code><pre>
 	 * CONSTRAINT t_658_ref__fk_t_658_31
 	 * FOREIGN KEY (ref_31)
-	 * REFERENCES dba.t_658_31 (id)
+	 * REFERENCES DBA.t_658_31 (id)
 	 * </pre></code>
 	 */
 	public void setRef_31(org.jooq.test.sybase.generatedclasses.enums.T_658_31 value) {
@@ -81,7 +81,7 @@ public class T_658RefRecord extends org.jooq.impl.TableRecordImpl<org.jooq.test.
 	 * <code><pre>
 	 * CONSTRAINT t_658_ref__fk_t_658_31
 	 * FOREIGN KEY (ref_31)
-	 * REFERENCES dba.t_658_31 (id)
+	 * REFERENCES DBA.t_658_31 (id)
 	 * </pre></code>
 	 */
 	public org.jooq.test.sybase.generatedclasses.enums.T_658_31 getRef_31() {
@@ -94,7 +94,7 @@ public class T_658RefRecord extends org.jooq.impl.TableRecordImpl<org.jooq.test.
 	 * <code><pre>
 	 * CONSTRAINT t_658_ref__fk_t_658_12
 	 * FOREIGN KEY (ref_12)
-	 * REFERENCES dba.t_658_12 (id)
+	 * REFERENCES DBA.t_658_12 (id)
 	 * </pre></code>
 	 */
 	public void setRef_12(org.jooq.test.sybase.generatedclasses.enums.T_658_12 value) {
@@ -107,7 +107,7 @@ public class T_658RefRecord extends org.jooq.impl.TableRecordImpl<org.jooq.test.
 	 * <code><pre>
 	 * CONSTRAINT t_658_ref__fk_t_658_12
 	 * FOREIGN KEY (ref_12)
-	 * REFERENCES dba.t_658_12 (id)
+	 * REFERENCES DBA.t_658_12 (id)
 	 * </pre></code>
 	 */
 	public org.jooq.test.sybase.generatedclasses.enums.T_658_12 getRef_12() {
@@ -120,7 +120,7 @@ public class T_658RefRecord extends org.jooq.impl.TableRecordImpl<org.jooq.test.
 	 * <code><pre>
 	 * CONSTRAINT t_658_ref__fk_t_658_22
 	 * FOREIGN KEY (ref_22)
-	 * REFERENCES dba.t_658_22 (id)
+	 * REFERENCES DBA.t_658_22 (id)
 	 * </pre></code>
 	 */
 	public void setRef_22(org.jooq.test.sybase.generatedclasses.enums.T_658_22 value) {
@@ -133,7 +133,7 @@ public class T_658RefRecord extends org.jooq.impl.TableRecordImpl<org.jooq.test.
 	 * <code><pre>
 	 * CONSTRAINT t_658_ref__fk_t_658_22
 	 * FOREIGN KEY (ref_22)
-	 * REFERENCES dba.t_658_22 (id)
+	 * REFERENCES DBA.t_658_22 (id)
 	 * </pre></code>
 	 */
 	public org.jooq.test.sybase.generatedclasses.enums.T_658_22 getRef_22() {
@@ -146,7 +146,7 @@ public class T_658RefRecord extends org.jooq.impl.TableRecordImpl<org.jooq.test.
 	 * <code><pre>
 	 * CONSTRAINT t_658_ref__fk_t_658_32
 	 * FOREIGN KEY (ref_32)
-	 * REFERENCES dba.t_658_32 (id)
+	 * REFERENCES DBA.t_658_32 (id)
 	 * </pre></code>
 	 */
 	public void setRef_32(org.jooq.test.sybase.generatedclasses.enums.T_658_32 value) {
@@ -159,7 +159,7 @@ public class T_658RefRecord extends org.jooq.impl.TableRecordImpl<org.jooq.test.
 	 * <code><pre>
 	 * CONSTRAINT t_658_ref__fk_t_658_32
 	 * FOREIGN KEY (ref_32)
-	 * REFERENCES dba.t_658_32 (id)
+	 * REFERENCES DBA.t_658_32 (id)
 	 * </pre></code>
 	 */
 	public org.jooq.test.sybase.generatedclasses.enums.T_658_32 getRef_32() {
diff --git a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/records/T_986_1Record.java b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/records/T_986_1Record.java
index 04314f8546..98a7884360 100644
--- a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/records/T_986_1Record.java
+++ b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/records/T_986_1Record.java
@@ -8,7 +8,7 @@ package org.jooq.test.sybase.generatedclasses.tables.records;
  */
 public class T_986_1Record extends org.jooq.impl.UpdatableRecordImpl<org.jooq.test.sybase.generatedclasses.tables.records.T_986_1Record> {
 
-	private static final long serialVersionUID = 2117636347;
+	private static final long serialVersionUID = -413519653;
 
 	/**
 	 * An uncommented item
@@ -18,7 +18,7 @@ public class T_986_1Record extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 	 * <code><pre>
 	 * CONSTRAINT t_986_1__fk_986
 	 * FOREIGN KEY (REF)
-	 * REFERENCES dba.x_unused (ID)
+	 * REFERENCES DBA.x_unused (ID)
 	 * </pre></code>
 	 */
 	public void setRef(java.lang.Integer value) {
@@ -33,7 +33,7 @@ public class T_986_1Record extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 	 * <code><pre>
 	 * CONSTRAINT t_986_1__fk_986
 	 * FOREIGN KEY (REF)
-	 * REFERENCES dba.x_unused (ID)
+	 * REFERENCES DBA.x_unused (ID)
 	 * </pre></code>
 	 */
 	public java.lang.Integer getRef() {
@@ -48,7 +48,7 @@ public class T_986_1Record extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 	 * <code><pre>
 	 * CONSTRAINT t_986_1__fk_986
 	 * FOREIGN KEY (REF)
-	 * REFERENCES dba.x_unused (ID)
+	 * REFERENCES DBA.x_unused (ID)
 	 * </pre></code>
 	 */
 	public org.jooq.test.sybase.generatedclasses.tables.records.XUnusedRecord fetchXUnused() {
diff --git a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/records/T_986_2Record.java b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/records/T_986_2Record.java
index 2842e1be86..ec63ef9906 100644
--- a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/records/T_986_2Record.java
+++ b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/records/T_986_2Record.java
@@ -8,7 +8,7 @@ package org.jooq.test.sybase.generatedclasses.tables.records;
  */
 public class T_986_2Record extends org.jooq.impl.UpdatableRecordImpl<org.jooq.test.sybase.generatedclasses.tables.records.T_986_2Record> {
 
-	private static final long serialVersionUID = -1160990718;
+	private static final long serialVersionUID = 602820578;
 
 	/**
 	 * An uncommented item
@@ -18,7 +18,7 @@ public class T_986_2Record extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 	 * <code><pre>
 	 * CONSTRAINT t_986_2__fk_986
 	 * FOREIGN KEY (REF)
-	 * REFERENCES dba.x_unused (ID)
+	 * REFERENCES DBA.x_unused (ID)
 	 * </pre></code>
 	 */
 	public void setRef(java.lang.Integer value) {
@@ -33,7 +33,7 @@ public class T_986_2Record extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 	 * <code><pre>
 	 * CONSTRAINT t_986_2__fk_986
 	 * FOREIGN KEY (REF)
-	 * REFERENCES dba.x_unused (ID)
+	 * REFERENCES DBA.x_unused (ID)
 	 * </pre></code>
 	 */
 	public java.lang.Integer getRef() {
@@ -48,7 +48,7 @@ public class T_986_2Record extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 	 * <code><pre>
 	 * CONSTRAINT t_986_2__fk_986
 	 * FOREIGN KEY (REF)
-	 * REFERENCES dba.x_unused (ID)
+	 * REFERENCES DBA.x_unused (ID)
 	 * </pre></code>
 	 */
 	public org.jooq.test.sybase.generatedclasses.tables.records.XUnusedRecord fetchXUnused() {
diff --git a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/records/XTestCase_64_69Record.java b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/records/XTestCase_64_69Record.java
index dec5f5a1d8..e91be72c31 100644
--- a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/records/XTestCase_64_69Record.java
+++ b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/records/XTestCase_64_69Record.java
@@ -8,7 +8,7 @@ package org.jooq.test.sybase.generatedclasses.tables.records;
  */
 public class XTestCase_64_69Record extends org.jooq.impl.UpdatableRecordImpl<org.jooq.test.sybase.generatedclasses.tables.records.XTestCase_64_69Record> {
 
-	private static final long serialVersionUID = 428537391;
+	private static final long serialVersionUID = -622882353;
 
 	/**
 	 * An uncommented item
@@ -46,7 +46,7 @@ public class XTestCase_64_69Record extends org.jooq.impl.UpdatableRecordImpl<org
 	 * <code><pre>
 	 * CONSTRAINT x_test_case_64_69__fk_x_test_case_64_69a
 	 * FOREIGN KEY (UNUSED_ID)
-	 * REFERENCES dba.x_unused (ID)
+	 * REFERENCES DBA.x_unused (ID)
 	 * </pre></code>
 	 */
 	public void setUnusedId(java.lang.Integer value) {
@@ -59,7 +59,7 @@ public class XTestCase_64_69Record extends org.jooq.impl.UpdatableRecordImpl<org
 	 * <code><pre>
 	 * CONSTRAINT x_test_case_64_69__fk_x_test_case_64_69a
 	 * FOREIGN KEY (UNUSED_ID)
-	 * REFERENCES dba.x_unused (ID)
+	 * REFERENCES DBA.x_unused (ID)
 	 * </pre></code>
 	 */
 	public java.lang.Integer getUnusedId() {
@@ -72,7 +72,7 @@ public class XTestCase_64_69Record extends org.jooq.impl.UpdatableRecordImpl<org
 	 * <code><pre>
 	 * CONSTRAINT x_test_case_64_69__fk_x_test_case_64_69a
 	 * FOREIGN KEY (UNUSED_ID)
-	 * REFERENCES dba.x_unused (ID)
+	 * REFERENCES DBA.x_unused (ID)
 	 * </pre></code>
 	 */
 	public org.jooq.test.sybase.generatedclasses.tables.records.XUnusedRecord fetchXUnused() {
diff --git a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/records/XTestCase_71Record.java b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/records/XTestCase_71Record.java
index 6e21765cbb..0d8d80f61c 100644
--- a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/records/XTestCase_71Record.java
+++ b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/records/XTestCase_71Record.java
@@ -8,7 +8,7 @@ package org.jooq.test.sybase.generatedclasses.tables.records;
  */
 public class XTestCase_71Record extends org.jooq.impl.UpdatableRecordImpl<org.jooq.test.sybase.generatedclasses.tables.records.XTestCase_71Record> {
 
-	private static final long serialVersionUID = -1117462061;
+	private static final long serialVersionUID = 851369331;
 
 	/**
 	 * An uncommented item
@@ -34,7 +34,7 @@ public class XTestCase_71Record extends org.jooq.impl.UpdatableRecordImpl<org.jo
 	 * <code><pre>
 	 * CONSTRAINT x_test_case_71__fk_x_test_case_71
 	 * FOREIGN KEY (TEST_CASE_64_69_ID)
-	 * REFERENCES dba.x_test_case_64_69 (ID)
+	 * REFERENCES DBA.x_test_case_64_69 (ID)
 	 * </pre></code>
 	 */
 	public void setTestCase_64_69Id(java.lang.Integer value) {
@@ -47,7 +47,7 @@ public class XTestCase_71Record extends org.jooq.impl.UpdatableRecordImpl<org.jo
 	 * <code><pre>
 	 * CONSTRAINT x_test_case_71__fk_x_test_case_71
 	 * FOREIGN KEY (TEST_CASE_64_69_ID)
-	 * REFERENCES dba.x_test_case_64_69 (ID)
+	 * REFERENCES DBA.x_test_case_64_69 (ID)
 	 * </pre></code>
 	 */
 	public java.lang.Integer getTestCase_64_69Id() {
@@ -60,7 +60,7 @@ public class XTestCase_71Record extends org.jooq.impl.UpdatableRecordImpl<org.jo
 	 * <code><pre>
 	 * CONSTRAINT x_test_case_71__fk_x_test_case_71
 	 * FOREIGN KEY (TEST_CASE_64_69_ID)
-	 * REFERENCES dba.x_test_case_64_69 (ID)
+	 * REFERENCES DBA.x_test_case_64_69 (ID)
 	 * </pre></code>
 	 */
 	public org.jooq.test.sybase.generatedclasses.tables.records.XTestCase_64_69Record fetchXTestCase_64_69() {
diff --git a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/records/XTestCase_85Record.java b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/records/XTestCase_85Record.java
index de343c34b1..e9b287fa06 100644
--- a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/records/XTestCase_85Record.java
+++ b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/records/XTestCase_85Record.java
@@ -8,7 +8,7 @@ package org.jooq.test.sybase.generatedclasses.tables.records;
  */
 public class XTestCase_85Record extends org.jooq.impl.UpdatableRecordImpl<org.jooq.test.sybase.generatedclasses.tables.records.XTestCase_85Record> {
 
-	private static final long serialVersionUID = -646681484;
+	private static final long serialVersionUID = 1004375188;
 
 	/**
 	 * An uncommented item
@@ -34,7 +34,7 @@ public class XTestCase_85Record extends org.jooq.impl.UpdatableRecordImpl<org.jo
 	 * <code><pre>
 	 * CONSTRAINT x_test_case_85__fk_x_test_case_85
 	 * FOREIGN KEY (x_unused_id, x_unused_name)
-	 * REFERENCES dba.x_unused (ID, NAME)
+	 * REFERENCES DBA.x_unused (ID, NAME)
 	 * </pre></code>
 	 */
 	public void setXUnusedId(java.lang.Integer value) {
@@ -47,7 +47,7 @@ public class XTestCase_85Record extends org.jooq.impl.UpdatableRecordImpl<org.jo
 	 * <code><pre>
 	 * CONSTRAINT x_test_case_85__fk_x_test_case_85
 	 * FOREIGN KEY (x_unused_id, x_unused_name)
-	 * REFERENCES dba.x_unused (ID, NAME)
+	 * REFERENCES DBA.x_unused (ID, NAME)
 	 * </pre></code>
 	 */
 	public java.lang.Integer getXUnusedId() {
@@ -60,7 +60,7 @@ public class XTestCase_85Record extends org.jooq.impl.UpdatableRecordImpl<org.jo
 	 * <code><pre>
 	 * CONSTRAINT x_test_case_85__fk_x_test_case_85
 	 * FOREIGN KEY (x_unused_id, x_unused_name)
-	 * REFERENCES dba.x_unused (ID, NAME)
+	 * REFERENCES DBA.x_unused (ID, NAME)
 	 * </pre></code>
 	 */
 	public org.jooq.test.sybase.generatedclasses.tables.records.XUnusedRecord fetchXUnused() {
@@ -77,7 +77,7 @@ public class XTestCase_85Record extends org.jooq.impl.UpdatableRecordImpl<org.jo
 	 * <code><pre>
 	 * CONSTRAINT x_test_case_85__fk_x_test_case_85
 	 * FOREIGN KEY (x_unused_id, x_unused_name)
-	 * REFERENCES dba.x_unused (ID, NAME)
+	 * REFERENCES DBA.x_unused (ID, NAME)
 	 * </pre></code>
 	 */
 	public void setXUnusedName(java.lang.String value) {
@@ -90,7 +90,7 @@ public class XTestCase_85Record extends org.jooq.impl.UpdatableRecordImpl<org.jo
 	 * <code><pre>
 	 * CONSTRAINT x_test_case_85__fk_x_test_case_85
 	 * FOREIGN KEY (x_unused_id, x_unused_name)
-	 * REFERENCES dba.x_unused (ID, NAME)
+	 * REFERENCES DBA.x_unused (ID, NAME)
 	 * </pre></code>
 	 */
 	public java.lang.String getXUnusedName() {
diff --git a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/records/XUnusedRecord.java b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/records/XUnusedRecord.java
index 7ea02db868..f374f36c54 100644
--- a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/records/XUnusedRecord.java
+++ b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/tables/records/XUnusedRecord.java
@@ -8,7 +8,7 @@ package org.jooq.test.sybase.generatedclasses.tables.records;
  */
 public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.test.sybase.generatedclasses.tables.records.XUnusedRecord> {
 
-	private static final long serialVersionUID = -368664365;
+	private static final long serialVersionUID = -1393674957;
 
 	/**
 	 * An uncommented item
@@ -128,7 +128,7 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 	 * <code><pre>
 	 * CONSTRAINT x_unused__fk_x_unused_self
 	 * FOREIGN KEY (ID_REF, NAME_REF)
-	 * REFERENCES dba.x_unused (ID, NAME)
+	 * REFERENCES DBA.x_unused (ID, NAME)
 	 * </pre></code>
 	 */
 	public void setIdRef(java.lang.Integer value) {
@@ -141,7 +141,7 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 	 * <code><pre>
 	 * CONSTRAINT x_unused__fk_x_unused_self
 	 * FOREIGN KEY (ID_REF, NAME_REF)
-	 * REFERENCES dba.x_unused (ID, NAME)
+	 * REFERENCES DBA.x_unused (ID, NAME)
 	 * </pre></code>
 	 */
 	public java.lang.Integer getIdRef() {
@@ -154,7 +154,7 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 	 * <code><pre>
 	 * CONSTRAINT x_unused__fk_x_unused_self
 	 * FOREIGN KEY (ID_REF, NAME_REF)
-	 * REFERENCES dba.x_unused (ID, NAME)
+	 * REFERENCES DBA.x_unused (ID, NAME)
 	 * </pre></code>
 	 */
 	public org.jooq.test.sybase.generatedclasses.tables.records.XUnusedRecord fetchXUnused() {
@@ -171,7 +171,7 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 	 * <code><pre>
 	 * CONSTRAINT x_unused__fk_x_unused_self
 	 * FOREIGN KEY (ID_REF, NAME_REF)
-	 * REFERENCES dba.x_unused (ID, NAME)
+	 * REFERENCES DBA.x_unused (ID, NAME)
 	 * </pre></code>
 	 */
 	public void setNameRef(java.lang.String value) {
@@ -184,7 +184,7 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 	 * <code><pre>
 	 * CONSTRAINT x_unused__fk_x_unused_self
 	 * FOREIGN KEY (ID_REF, NAME_REF)
-	 * REFERENCES dba.x_unused (ID, NAME)
+	 * REFERENCES DBA.x_unused (ID, NAME)
 	 * </pre></code>
 	 */
 	public java.lang.String getNameRef() {