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 50046043e5..3da48109cd 100644
--- a/jOOQ-codegen/src/main/java/org/jooq/util/DefaultGenerator.java
+++ b/jOOQ-codegen/src/main/java/org/jooq/util/DefaultGenerator.java
@@ -62,7 +62,6 @@ import org.jooq.Parameter;
 import org.jooq.Record;
 import org.jooq.Result;
 import org.jooq.SQLDialect;
-import org.jooq.SchemaMapping;
 import org.jooq.Select;
 import org.jooq.Sequence;
 import org.jooq.Table;
@@ -70,6 +69,7 @@ import org.jooq.TableField;
 import org.jooq.UDT;
 import org.jooq.UDTField;
 import org.jooq.UniqueKey;
+import org.jooq.conf.Settings;
 import org.jooq.exception.DataAccessException;
 import org.jooq.exception.SQLDialectNotSupportedException;
 import org.jooq.impl.AbstractKeys;
@@ -246,6 +246,7 @@ public class DefaultGenerator implements Generator {
 		}
     }
 
+    @SuppressWarnings("deprecation")
     private void generate(
             Database database,
             SchemaDefinition schema,
@@ -316,21 +317,46 @@ public class DefaultGenerator implements Generator {
             outF.println("\t\tsuper(connection);");
             outF.println("\t}");
 
+            if (generateDeprecated()) {
+                outF.println();
+                outF.println("\t/**");
+                outF.println("\t * Create a factory with a connection and a schema mapping");
+                outF.println("\t * ");
+                outF.print("\t * @deprecated - 2.0.5 - Use {@link #");
+                outF.print(strategy.getJavaClassName(schema, "Factory"));
+                outF.print("(");
+                outF.print(Connection.class);
+                outF.print(", ");
+                outF.print(Settings.class);
+                outF.println(")} instead");
+                outF.println("\t */");
+                outF.println("\t@Deprecated");
+                outF.print("\tpublic ");
+                outF.print(strategy.getJavaClassName(schema, "Factory"));
+                outF.print("(");
+                outF.print(Connection.class);
+                outF.print(" connection, ");
+                outF.print(org.jooq.SchemaMapping.class);
+                outF.println(" mapping) {");
+                outF.println("\t\tsuper(connection, mapping);");
+                outF.println("\t}");
+            }
+
             outF.println();
             outF.println("\t/**");
-            outF.println("\t * Create a factory with a connection and a schema mapping");
+            outF.println("\t * Create a factory with a connection and some settings");
             outF.println("\t *");
             outF.println("\t * @param connection The connection to use with objects created from this factory");
-            outF.println("\t * @param mapping The schema mapping to use with objects created from this factory");
+            outF.println("\t * @param settings The settings to apply to objects created from this factory");
             outF.println("\t */");
             outF.print("\tpublic ");
             outF.print(strategy.getJavaClassName(schema, "Factory"));
             outF.print("(");
             outF.print(Connection.class);
             outF.print(" connection, ");
-            outF.print(SchemaMapping.class);
-            outF.println(" mapping) {");
-            outF.println("\t\tsuper(connection, mapping);");
+            outF.print(Settings.class);
+            outF.println(" settings) {");
+            outF.println("\t\tsuper(connection, settings);");
             outF.println("\t}");
 
             watch.splitInfo("Schema generated");
diff --git a/jOOQ-meta/build.xml b/jOOQ-meta/build.xml
index 87aedb0260..e0b4e24017 100644
--- a/jOOQ-meta/build.xml
+++ b/jOOQ-meta/build.xml
@@ -14,7 +14,7 @@
 	<!-- Run a full mvn clean package install deploy first before this -->
 	<target name="xjc-generator" description="Generate JAXB artefacts from XSD">
 		<mkdir dir="${dir.java}/org/jooq/util/jaxb" />
-		<xjc schema="${dir.resources}/jooq-codegen-2.0.4.xsd" destdir="${dir.java}" package="org.jooq.util.jaxb">
+		<xjc schema="${dir.resources}/xsd/jooq-codegen-2.0.4.xsd" destdir="${dir.java}" package="org.jooq.util.jaxb">
 			<arg value="-Xxew" />
 		    <arg value="-instantiate lazy" />
 		</xjc>
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 46d386ee5a..f691d50bb0 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class Dbo extends org.jooq.impl.SchemaImpl {
 
-	private static final long serialVersionUID = -348471044;
+	private static final long serialVersionUID = -123131457;
 
 	/**
 	 * The singleton instance of dbo
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 d39373b8f4..c25615eba2 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class DboFactory extends org.jooq.util.ase.ASEFactory {
 
-	private static final long serialVersionUID = 1609387664;
+	private static final long serialVersionUID = -316506747;
 
 	/**
 	 * Create a factory with a connection
@@ -22,12 +22,12 @@ public class DboFactory extends org.jooq.util.ase.ASEFactory {
 	}
 
 	/**
-	 * Create a factory with a connection and a schema mapping
+	 * Create a factory with a connection and some settings
 	 *
 	 * @param connection The connection to use with objects created from this factory
-	 * @param mapping The schema mapping to use with objects created from this factory
+	 * @param settings The settings to apply to objects created from this factory
 	 */
-	public DboFactory(java.sql.Connection connection, org.jooq.SchemaMapping mapping) {
-		super(connection, mapping);
+	public DboFactory(java.sql.Connection connection, org.jooq.conf.Settings settings) {
+		super(connection, settings);
 	}
 }
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 1e3a3f2807..25ca8b1ada 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public final class Tables {
 
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 20da047b89..b0667a6e4d 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class Sysindexes extends org.jooq.impl.TableImpl<org.jooq.util.ase.sys.tables.records.SysindexesRecord> {
 
-	private static final long serialVersionUID = -335637999;
+	private static final long serialVersionUID = -1236592044;
 
 	/**
 	 * The singleton instance of 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 462d32f3ef..1f5867fa6f 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class Sysobjects extends org.jooq.impl.TableImpl<org.jooq.util.ase.sys.tables.records.SysobjectsRecord> {
 
-	private static final long serialVersionUID = 1179279000;
+	private static final long serialVersionUID = 1167856501;
 
 	/**
 	 * The singleton instance of 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 b3694c290b..d0411efedf 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class Sysreferences extends org.jooq.impl.TableImpl<org.jooq.util.ase.sys.tables.records.SysreferencesRecord> {
 
-	private static final long serialVersionUID = 995195407;
+	private static final long serialVersionUID = -1311086254;
 
 	/**
 	 * The singleton instance of sysreferences
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/ase/sys/tables/records/SysindexesRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/ase/sys/tables/records/SysindexesRecord.java
index 51c133e757..e4fe827ecf 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/ase/sys/tables/records/SysindexesRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/ase/sys/tables/records/SysindexesRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.ase.sys.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class SysindexesRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.ase.sys.tables.records.SysindexesRecord> {
 
-	private static final long serialVersionUID = 2124697157;
+	private static final long serialVersionUID = 539000482;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/ase/sys/tables/records/SysobjectsRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/ase/sys/tables/records/SysobjectsRecord.java
index 0856382d54..4803f1f902 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/ase/sys/tables/records/SysobjectsRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/ase/sys/tables/records/SysobjectsRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.ase.sys.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class SysobjectsRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.ase.sys.tables.records.SysobjectsRecord> {
 
-	private static final long serialVersionUID = 316897165;
+	private static final long serialVersionUID = -1091912214;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/ase/sys/tables/records/SysreferencesRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/ase/sys/tables/records/SysreferencesRecord.java
index 513e483390..13cfc87908 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/ase/sys/tables/records/SysreferencesRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/ase/sys/tables/records/SysreferencesRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.ase.sys.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class SysreferencesRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.ase.sys.tables.records.SysreferencesRecord> {
 
-	private static final long serialVersionUID = -191217771;
+	private static final long serialVersionUID = 1539225586;
 
 	/**
 	 * An uncommented item
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 fc01eb89da..1070148b61 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class Syscat extends org.jooq.impl.SchemaImpl {
 
-	private static final long serialVersionUID = -2031531928;
+	private static final long serialVersionUID = 1606604715;
 
 	/**
 	 * The singleton instance of SYSCAT
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 b21082b44b..2a8090ce6d 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class SyscatFactory extends org.jooq.util.db2.DB2Factory {
 
-	private static final long serialVersionUID = 470462597;
+	private static final long serialVersionUID = -1099424048;
 
 	/**
 	 * Create a factory with a connection
@@ -22,12 +22,12 @@ public class SyscatFactory extends org.jooq.util.db2.DB2Factory {
 	}
 
 	/**
-	 * Create a factory with a connection and a schema mapping
+	 * Create a factory with a connection and some settings
 	 *
 	 * @param connection The connection to use with objects created from this factory
-	 * @param mapping The schema mapping to use with objects created from this factory
+	 * @param settings The settings to apply to objects created from this factory
 	 */
-	public SyscatFactory(java.sql.Connection connection, org.jooq.SchemaMapping mapping) {
-		super(connection, mapping);
+	public SyscatFactory(java.sql.Connection connection, org.jooq.conf.Settings settings) {
+		super(connection, settings);
 	}
 }
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 45edfe44db..97bc6f00b2 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public final class Tables {
 
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 b919749f1a..e1aa7e1f27 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class Attributes extends org.jooq.impl.TableImpl<org.jooq.util.db2.syscat.tables.records.AttributesRecord> {
 
-	private static final long serialVersionUID = 114519913;
+	private static final long serialVersionUID = 649430918;
 
 	/**
 	 * The singleton instance of 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 93bd5e74c2..300c4bdd1d 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class Columns extends org.jooq.impl.TableImpl<org.jooq.util.db2.syscat.tables.records.ColumnsRecord> {
 
-	private static final long serialVersionUID = 1714029624;
+	private static final long serialVersionUID = -610989189;
 
 	/**
 	 * The singleton instance of 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 c8a2d9cab9..f0b328a3cd 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class Datatypes extends org.jooq.impl.TableImpl<org.jooq.util.db2.syscat.tables.records.DatatypesRecord> {
 
-	private static final long serialVersionUID = 1467129668;
+	private static final long serialVersionUID = -1473135135;
 
 	/**
 	 * The singleton instance of 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 1de5fdc6aa..042284fe1f 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class Funcparms extends org.jooq.impl.TableImpl<org.jooq.util.db2.syscat.tables.records.FuncparmsRecord> {
 
-	private static final long serialVersionUID = 1732037261;
+	private static final long serialVersionUID = 1833106858;
 
 	/**
 	 * The singleton instance of 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 38bd74f182..6126487cf2 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class Functions extends org.jooq.impl.TableImpl<org.jooq.util.db2.syscat.tables.records.FunctionsRecord> {
 
-	private static final long serialVersionUID = 1339118341;
+	private static final long serialVersionUID = 1561552648;
 
 	/**
 	 * The singleton instance of 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 2f9b142b2b..b5ce204e89 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class Keycoluse extends org.jooq.impl.TableImpl<org.jooq.util.db2.syscat.tables.records.KeycoluseRecord> {
 
-	private static final long serialVersionUID = -1383686737;
+	private static final long serialVersionUID = 1525319346;
 
 	/**
 	 * The singleton instance of 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 6c5a969f07..d5a532f4b6 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class Procedures extends org.jooq.impl.TableImpl<org.jooq.util.db2.syscat.tables.records.ProceduresRecord> {
 
-	private static final long serialVersionUID = 70900412;
+	private static final long serialVersionUID = -1152908993;
 
 	/**
 	 * The singleton instance of 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 441bb049e7..8dc4d66da7 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class Procparms extends org.jooq.impl.TableImpl<org.jooq.util.db2.syscat.tables.records.ProcparmsRecord> {
 
-	private static final long serialVersionUID = -510262862;
+	private static final long serialVersionUID = 1051050895;
 
 	/**
 	 * The singleton instance of 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 12bbcfa72f..b8098fab85 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class References extends org.jooq.impl.TableImpl<org.jooq.util.db2.syscat.tables.records.ReferencesRecord> {
 
-	private static final long serialVersionUID = -784770410;
+	private static final long serialVersionUID = -359281511;
 
 	/**
 	 * The singleton instance of REFERENCES
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 30d10ed418..64218f0ddf 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class Sequences extends org.jooq.impl.TableImpl<org.jooq.util.db2.syscat.tables.records.SequencesRecord> {
 
-	private static final long serialVersionUID = 977500901;
+	private static final long serialVersionUID = 1459423080;
 
 	/**
 	 * The singleton instance of 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 a5aab72f65..d024a282af 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class Tabconst extends org.jooq.impl.TableImpl<org.jooq.util.db2.syscat.tables.records.TabconstRecord> {
 
-	private static final long serialVersionUID = 1253863506;
+	private static final long serialVersionUID = -802237547;
 
 	/**
 	 * The singleton instance of 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 9e624d2f66..50ea8743f3 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class Tables extends org.jooq.impl.TableImpl<org.jooq.util.db2.syscat.tables.records.TablesRecord> {
 
-	private static final long serialVersionUID = 977919592;
+	private static final long serialVersionUID = -1437908091;
 
 	/**
 	 * The singleton instance of TABLES
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/records/AttributesRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/records/AttributesRecord.java
index ade50646bf..f6dec5e97d 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/records/AttributesRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/records/AttributesRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.db2.syscat.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class AttributesRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.db2.syscat.tables.records.AttributesRecord> {
 
-	private static final long serialVersionUID = -1009050174;
+	private static final long serialVersionUID = -500565537;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/records/ColumnsRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/records/ColumnsRecord.java
index ad7149ad80..2ba6854329 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/records/ColumnsRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/records/ColumnsRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.db2.syscat.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class ColumnsRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.db2.syscat.tables.records.ColumnsRecord> {
 
-	private static final long serialVersionUID = -1698073202;
+	private static final long serialVersionUID = 173171563;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/records/DatatypesRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/records/DatatypesRecord.java
index c5208026a0..fc1fd8e757 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/records/DatatypesRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/records/DatatypesRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.db2.syscat.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class DatatypesRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.db2.syscat.tables.records.DatatypesRecord> {
 
-	private static final long serialVersionUID = 6406942;
+	private static final long serialVersionUID = -1502303301;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/records/FuncparmsRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/records/FuncparmsRecord.java
index a90c9cfd1c..de3ff68e5a 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/records/FuncparmsRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/records/FuncparmsRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.db2.syscat.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class FuncparmsRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.db2.syscat.tables.records.FuncparmsRecord> {
 
-	private static final long serialVersionUID = 841916438;
+	private static final long serialVersionUID = -1618742413;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/records/FunctionsRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/records/FunctionsRecord.java
index fd550eb545..99e73083ae 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/records/FunctionsRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/records/FunctionsRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.db2.syscat.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class FunctionsRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.db2.syscat.tables.records.FunctionsRecord> {
 
-	private static final long serialVersionUID = -1446463858;
+	private static final long serialVersionUID = -1177704469;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/records/KeycoluseRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/records/KeycoluseRecord.java
index f3f0448423..3dc47df441 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/records/KeycoluseRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/records/KeycoluseRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.db2.syscat.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class KeycoluseRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.db2.syscat.tables.records.KeycoluseRecord> {
 
-	private static final long serialVersionUID = 2023773812;
+	private static final long serialVersionUID = 1885731921;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/records/ProceduresRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/records/ProceduresRecord.java
index a4f26f846f..049082bbf3 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/records/ProceduresRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/records/ProceduresRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.db2.syscat.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class ProceduresRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.db2.syscat.tables.records.ProceduresRecord> {
 
-	private static final long serialVersionUID = -718827662;
+	private static final long serialVersionUID = -1177927025;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/records/ProcparmsRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/records/ProcparmsRecord.java
index 62edfa06e3..08a7b762ab 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/records/ProcparmsRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/records/ProcparmsRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.db2.syscat.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class ProcparmsRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.db2.syscat.tables.records.ProcparmsRecord> {
 
-	private static final long serialVersionUID = 1611881034;
+	private static final long serialVersionUID = 256519527;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/records/ReferencesRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/records/ReferencesRecord.java
index 52ade4e0f3..020d1c8920 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/records/ReferencesRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/records/ReferencesRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.db2.syscat.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class ReferencesRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.db2.syscat.tables.records.ReferencesRecord> {
 
-	private static final long serialVersionUID = -216343070;
+	private static final long serialVersionUID = -1968351617;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/records/SequencesRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/records/SequencesRecord.java
index 87cf09c971..8590f9ae1c 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/records/SequencesRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/records/SequencesRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.db2.syscat.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class SequencesRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.db2.syscat.tables.records.SequencesRecord> {
 
-	private static final long serialVersionUID = 627405406;
+	private static final long serialVersionUID = -1329221445;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/records/TabconstRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/records/TabconstRecord.java
index 5cbc375115..4e4fb39895 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/records/TabconstRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/records/TabconstRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.db2.syscat.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class TabconstRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.db2.syscat.tables.records.TabconstRecord> {
 
-	private static final long serialVersionUID = 1029282352;
+	private static final long serialVersionUID = 327391949;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/records/TablesRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/records/TablesRecord.java
index aaad9e874d..57718b6190 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/records/TablesRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/db2/syscat/tables/records/TablesRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.db2.syscat.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class TablesRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.db2.syscat.tables.records.TablesRecord> {
 
-	private static final long serialVersionUID = 325749960;
+	private static final long serialVersionUID = -1586880347;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/derby/sys/Sys.java b/jOOQ-meta/src/main/java/org/jooq/util/derby/sys/Sys.java
index 46e3b05396..93bd15b938 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/derby/sys/Sys.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/derby/sys/Sys.java
@@ -6,11 +6,11 @@ package org.jooq.util.derby.sys;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class Sys extends org.jooq.impl.SchemaImpl {
 
-	private static final long serialVersionUID = -1524141556;
+	private static final long serialVersionUID = 106419487;
 
 	/**
 	 * The singleton instance of SYS
@@ -27,12 +27,12 @@ public class Sys extends org.jooq.impl.SchemaImpl {
 	@Override
 	public final java.util.List<org.jooq.Table<?>> getTables() {
 		return java.util.Arrays.<org.jooq.Table<?>>asList(
-			org.jooq.util.derby.sys.tables.Sysconglomerates.SYSCONGLOMERATES,
-			org.jooq.util.derby.sys.tables.Systables.SYSTABLES,
 			org.jooq.util.derby.sys.tables.Syscolumns.SYSCOLUMNS,
-			org.jooq.util.derby.sys.tables.Sysschemas.SYSSCHEMAS,
+			org.jooq.util.derby.sys.tables.Sysconglomerates.SYSCONGLOMERATES,
 			org.jooq.util.derby.sys.tables.Sysconstraints.SYSCONSTRAINTS,
 			org.jooq.util.derby.sys.tables.Syskeys.SYSKEYS,
-			org.jooq.util.derby.sys.tables.Syssequences.SYSSEQUENCES);
+			org.jooq.util.derby.sys.tables.Sysschemas.SYSSCHEMAS,
+			org.jooq.util.derby.sys.tables.Syssequences.SYSSEQUENCES,
+			org.jooq.util.derby.sys.tables.Systables.SYSTABLES);
 	}
 }
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/derby/sys/SysFactory.java b/jOOQ-meta/src/main/java/org/jooq/util/derby/sys/SysFactory.java
index 22d83ca164..eaa1ce6f30 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/derby/sys/SysFactory.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/derby/sys/SysFactory.java
@@ -6,11 +6,11 @@ package org.jooq.util.derby.sys;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class SysFactory extends org.jooq.util.derby.DerbyFactory {
 
-	private static final long serialVersionUID = -8140297;
+	private static final long serialVersionUID = 877278380;
 
 	/**
 	 * Create a factory with a connection
@@ -22,12 +22,12 @@ public class SysFactory extends org.jooq.util.derby.DerbyFactory {
 	}
 
 	/**
-	 * Create a factory with a connection and a schema mapping
+	 * Create a factory with a connection and some settings
 	 *
 	 * @param connection The connection to use with objects created from this factory
-	 * @param mapping The schema mapping to use with objects created from this factory
+	 * @param settings The settings to apply to objects created from this factory
 	 */
-	public SysFactory(java.sql.Connection connection, org.jooq.SchemaMapping mapping) {
-		super(connection, mapping);
+	public SysFactory(java.sql.Connection connection, org.jooq.conf.Settings settings) {
+		super(connection, settings);
 	}
 }
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/derby/sys/Tables.java b/jOOQ-meta/src/main/java/org/jooq/util/derby/sys/Tables.java
index d0059449f5..ce6dcebdc0 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/derby/sys/Tables.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/derby/sys/Tables.java
@@ -8,29 +8,19 @@ package org.jooq.util.derby.sys;
  *
  * Convenience access to all tables in SYS
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public final class Tables {
 
-	/**
-	 * The table SYS.SYSCONGLOMERATES
-	 */
-	public static org.jooq.util.derby.sys.tables.Sysconglomerates SYSCONGLOMERATES = org.jooq.util.derby.sys.tables.Sysconglomerates.SYSCONGLOMERATES;
-
-	/**
-	 * The table SYS.SYSTABLES
-	 */
-	public static org.jooq.util.derby.sys.tables.Systables SYSTABLES = org.jooq.util.derby.sys.tables.Systables.SYSTABLES;
-
 	/**
 	 * The table SYS.SYSCOLUMNS
 	 */
 	public static org.jooq.util.derby.sys.tables.Syscolumns SYSCOLUMNS = org.jooq.util.derby.sys.tables.Syscolumns.SYSCOLUMNS;
 
 	/**
-	 * The table SYS.SYSSCHEMAS
+	 * The table SYS.SYSCONGLOMERATES
 	 */
-	public static org.jooq.util.derby.sys.tables.Sysschemas SYSSCHEMAS = org.jooq.util.derby.sys.tables.Sysschemas.SYSSCHEMAS;
+	public static org.jooq.util.derby.sys.tables.Sysconglomerates SYSCONGLOMERATES = org.jooq.util.derby.sys.tables.Sysconglomerates.SYSCONGLOMERATES;
 
 	/**
 	 * The table SYS.SYSCONSTRAINTS
@@ -42,11 +32,21 @@ public final class Tables {
 	 */
 	public static org.jooq.util.derby.sys.tables.Syskeys SYSKEYS = org.jooq.util.derby.sys.tables.Syskeys.SYSKEYS;
 
+	/**
+	 * The table SYS.SYSSCHEMAS
+	 */
+	public static org.jooq.util.derby.sys.tables.Sysschemas SYSSCHEMAS = org.jooq.util.derby.sys.tables.Sysschemas.SYSSCHEMAS;
+
 	/**
 	 * The table SYS.SYSSEQUENCES
 	 */
 	public static org.jooq.util.derby.sys.tables.Syssequences SYSSEQUENCES = org.jooq.util.derby.sys.tables.Syssequences.SYSSEQUENCES;
 
+	/**
+	 * The table SYS.SYSTABLES
+	 */
+	public static org.jooq.util.derby.sys.tables.Systables SYSTABLES = org.jooq.util.derby.sys.tables.Systables.SYSTABLES;
+
 	/**
 	 * No instances
 	 */
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/derby/sys/tables/Syscolumns.java b/jOOQ-meta/src/main/java/org/jooq/util/derby/sys/tables/Syscolumns.java
index 611b9e52a4..4e27275f1b 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/derby/sys/tables/Syscolumns.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/derby/sys/tables/Syscolumns.java
@@ -6,11 +6,11 @@ package org.jooq.util.derby.sys.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class Syscolumns extends org.jooq.impl.TableImpl<org.jooq.util.derby.sys.tables.records.SyscolumnsRecord> {
 
-	private static final long serialVersionUID = -1385809218;
+	private static final long serialVersionUID = 236864795;
 
 	/**
 	 * The singleton instance of SYSCOLUMNS
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/derby/sys/tables/Sysconglomerates.java b/jOOQ-meta/src/main/java/org/jooq/util/derby/sys/tables/Sysconglomerates.java
index 9ef67ef765..6a03d16b95 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/derby/sys/tables/Sysconglomerates.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/derby/sys/tables/Sysconglomerates.java
@@ -6,11 +6,11 @@ package org.jooq.util.derby.sys.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class Sysconglomerates extends org.jooq.impl.TableImpl<org.jooq.util.derby.sys.tables.records.SysconglomeratesRecord> {
 
-	private static final long serialVersionUID = -1830489851;
+	private static final long serialVersionUID = 153972552;
 
 	/**
 	 * The singleton instance of SYSCONGLOMERATES
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/derby/sys/tables/Sysconstraints.java b/jOOQ-meta/src/main/java/org/jooq/util/derby/sys/tables/Sysconstraints.java
index 8d9a67a230..bb619514c8 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/derby/sys/tables/Sysconstraints.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/derby/sys/tables/Sysconstraints.java
@@ -6,11 +6,11 @@ package org.jooq.util.derby.sys.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class Sysconstraints extends org.jooq.impl.TableImpl<org.jooq.util.derby.sys.tables.records.SysconstraintsRecord> {
 
-	private static final long serialVersionUID = 1473868829;
+	private static final long serialVersionUID = 536740730;
 
 	/**
 	 * The singleton instance of SYSCONSTRAINTS
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/derby/sys/tables/Syskeys.java b/jOOQ-meta/src/main/java/org/jooq/util/derby/sys/tables/Syskeys.java
index 87fac5635c..b0e63d6132 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/derby/sys/tables/Syskeys.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/derby/sys/tables/Syskeys.java
@@ -6,11 +6,11 @@ package org.jooq.util.derby.sys.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class Syskeys extends org.jooq.impl.TableImpl<org.jooq.util.derby.sys.tables.records.SyskeysRecord> {
 
-	private static final long serialVersionUID = 1960591831;
+	private static final long serialVersionUID = -887335142;
 
 	/**
 	 * The singleton instance of SYSKEYS
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/derby/sys/tables/Sysschemas.java b/jOOQ-meta/src/main/java/org/jooq/util/derby/sys/tables/Sysschemas.java
index db1a6c5dde..2e1b2cfd30 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/derby/sys/tables/Sysschemas.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/derby/sys/tables/Sysschemas.java
@@ -6,11 +6,11 @@ package org.jooq.util.derby.sys.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class Sysschemas extends org.jooq.impl.TableImpl<org.jooq.util.derby.sys.tables.records.SysschemasRecord> {
 
-	private static final long serialVersionUID = 832002111;
+	private static final long serialVersionUID = 272512130;
 
 	/**
 	 * The singleton instance of SYSSCHEMAS
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/derby/sys/tables/Syssequences.java b/jOOQ-meta/src/main/java/org/jooq/util/derby/sys/tables/Syssequences.java
index 42e582bd53..b497e38399 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/derby/sys/tables/Syssequences.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/derby/sys/tables/Syssequences.java
@@ -6,11 +6,11 @@ package org.jooq.util.derby.sys.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class Syssequences extends org.jooq.impl.TableImpl<org.jooq.util.derby.sys.tables.records.SyssequencesRecord> {
 
-	private static final long serialVersionUID = 890749480;
+	private static final long serialVersionUID = -2108242773;
 
 	/**
 	 * The singleton instance of SYSSEQUENCES
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/derby/sys/tables/Systables.java b/jOOQ-meta/src/main/java/org/jooq/util/derby/sys/tables/Systables.java
index 3563fd55fd..df790ed22a 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/derby/sys/tables/Systables.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/derby/sys/tables/Systables.java
@@ -6,11 +6,11 @@ package org.jooq.util.derby.sys.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class Systables extends org.jooq.impl.TableImpl<org.jooq.util.derby.sys.tables.records.SystablesRecord> {
 
-	private static final long serialVersionUID = 1357425667;
+	private static final long serialVersionUID = 415788230;
 
 	/**
 	 * The singleton instance of SYSTABLES
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/derby/sys/tables/records/SyscolumnsRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/derby/sys/tables/records/SyscolumnsRecord.java
index 283ac8e2f7..1712d09c80 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/derby/sys/tables/records/SyscolumnsRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/derby/sys/tables/records/SyscolumnsRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.derby.sys.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class SyscolumnsRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.derby.sys.tables.records.SyscolumnsRecord> {
 
-	private static final long serialVersionUID = 235754968;
+	private static final long serialVersionUID = 1672794293;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/derby/sys/tables/records/SysconglomeratesRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/derby/sys/tables/records/SysconglomeratesRecord.java
index e7ea9abf46..efb04f4c3d 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/derby/sys/tables/records/SysconglomeratesRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/derby/sys/tables/records/SysconglomeratesRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.derby.sys.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class SysconglomeratesRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.derby.sys.tables.records.SysconglomeratesRecord> {
 
-	private static final long serialVersionUID = -583641428;
+	private static final long serialVersionUID = 818266633;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/derby/sys/tables/records/SysconstraintsRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/derby/sys/tables/records/SysconstraintsRecord.java
index b66b6d5ef5..cf83cc68d8 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/derby/sys/tables/records/SysconstraintsRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/derby/sys/tables/records/SysconstraintsRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.derby.sys.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class SysconstraintsRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.derby.sys.tables.records.SysconstraintsRecord> {
 
-	private static final long serialVersionUID = 270536728;
+	private static final long serialVersionUID = -744839563;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/derby/sys/tables/records/SyskeysRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/derby/sys/tables/records/SyskeysRecord.java
index 42264b1375..904cf6234f 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/derby/sys/tables/records/SyskeysRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/derby/sys/tables/records/SyskeysRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.derby.sys.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class SyskeysRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.derby.sys.tables.records.SyskeysRecord> {
 
-	private static final long serialVersionUID = 223628424;
+	private static final long serialVersionUID = -1244601691;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/derby/sys/tables/records/SysschemasRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/derby/sys/tables/records/SysschemasRecord.java
index 5f445c2e41..16dc7123dd 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/derby/sys/tables/records/SysschemasRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/derby/sys/tables/records/SysschemasRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.derby.sys.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class SysschemasRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.derby.sys.tables.records.SysschemasRecord> {
 
-	private static final long serialVersionUID = -158855894;
+	private static final long serialVersionUID = -1863728825;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/derby/sys/tables/records/SyssequencesRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/derby/sys/tables/records/SyssequencesRecord.java
index d1e59e6b51..dd37b05758 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/derby/sys/tables/records/SyssequencesRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/derby/sys/tables/records/SyssequencesRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.derby.sys.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class SyssequencesRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.derby.sys.tables.records.SyssequencesRecord> {
 
-	private static final long serialVersionUID = -765356402;
+	private static final long serialVersionUID = 354466539;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/derby/sys/tables/records/SystablesRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/derby/sys/tables/records/SystablesRecord.java
index 8d74ff6ff8..de528eb2b1 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/derby/sys/tables/records/SystablesRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/derby/sys/tables/records/SystablesRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.derby.sys.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class SystablesRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.derby.sys.tables.records.SystablesRecord> {
 
-	private static final long serialVersionUID = 2012152928;
+	private static final long serialVersionUID = 1593493885;
 
 	/**
 	 * An uncommented item
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 b528167b15..48ab062ee8 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class InformationSchema extends org.jooq.impl.SchemaImpl {
 
-	private static final long serialVersionUID = 42747060;
+	private static final long serialVersionUID = 1426927287;
 
 	/**
 	 * The singleton instance of INFORMATION_SCHEMA
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 a5d20c8351..4f632d2935 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class InformationSchemaFactory extends org.jooq.util.h2.H2Factory {
 
-	private static final long serialVersionUID = 757478780;
+	private static final long serialVersionUID = 1633879793;
 
 	/**
 	 * Create a factory with a connection
@@ -22,12 +22,12 @@ public class InformationSchemaFactory extends org.jooq.util.h2.H2Factory {
 	}
 
 	/**
-	 * Create a factory with a connection and a schema mapping
+	 * Create a factory with a connection and some settings
 	 *
 	 * @param connection The connection to use with objects created from this factory
-	 * @param mapping The schema mapping to use with objects created from this factory
+	 * @param settings The settings to apply to objects created from this factory
 	 */
-	public InformationSchemaFactory(java.sql.Connection connection, org.jooq.SchemaMapping mapping) {
-		super(connection, mapping);
+	public InformationSchemaFactory(java.sql.Connection connection, org.jooq.conf.Settings settings) {
+		super(connection, settings);
 	}
 }
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 88d84f9ba2..fa0e08f950 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public final class Tables {
 
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 00947d57ed..fba191be1a 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class Columns extends org.jooq.impl.TableImpl<org.jooq.util.h2.information_schema.tables.records.ColumnsRecord> {
 
-	private static final long serialVersionUID = -731741434;
+	private static final long serialVersionUID = 1397722659;
 
 	/**
 	 * The singleton instance of 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 2c30cd4999..044c8cb390 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class Constraints extends org.jooq.impl.TableImpl<org.jooq.util.h2.information_schema.tables.records.ConstraintsRecord> {
 
-	private static final long serialVersionUID = -163185243;
+	private static final long serialVersionUID = 1972451304;
 
 	/**
 	 * The singleton instance of 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 de0abf83c4..5504463dee 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class CrossReferences extends org.jooq.impl.TableImpl<org.jooq.util.h2.information_schema.tables.records.CrossReferencesRecord> {
 
-	private static final long serialVersionUID = 1157002390;
+	private static final long serialVersionUID = 1429925529;
 
 	/**
 	 * The singleton instance of 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 3960dc32a4..d13b7726b7 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class FunctionAliases extends org.jooq.impl.TableImpl<org.jooq.util.h2.information_schema.tables.records.FunctionAliasesRecord> {
 
-	private static final long serialVersionUID = 564250853;
+	private static final long serialVersionUID = -1690018008;
 
 	/**
 	 * The singleton instance of 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 3db7eda5a3..8072701c79 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class FunctionColumns extends org.jooq.impl.TableImpl<org.jooq.util.h2.information_schema.tables.records.FunctionColumnsRecord> {
 
-	private static final long serialVersionUID = 1610837782;
+	private static final long serialVersionUID = 2061240115;
 
 	/**
 	 * The singleton instance of FUNCTION_COLUMNS
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 5c3853b294..f83e6a4caf 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class Sequences extends org.jooq.impl.TableImpl<org.jooq.util.h2.information_schema.tables.records.SequencesRecord> {
 
-	private static final long serialVersionUID = 377282336;
+	private static final long serialVersionUID = 123712035;
 
 	/**
 	 * The singleton instance of 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 0314b1a247..eebb5f6960 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class Tables extends org.jooq.impl.TableImpl<org.jooq.util.h2.information_schema.tables.records.TablesRecord> {
 
-	private static final long serialVersionUID = -1673004421;
+	private static final long serialVersionUID = 751152958;
 
 	/**
 	 * The singleton instance of 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 b405eb4c01..3a7d2513d7 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class TypeInfo extends org.jooq.impl.TableImpl<org.jooq.util.h2.information_schema.tables.records.TypeInfoRecord> {
 
-	private static final long serialVersionUID = 1582765698;
+	private static final long serialVersionUID = 1451523167;
 
 	/**
 	 * The singleton instance of TYPE_INFO
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/h2/information_schema/tables/records/ColumnsRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/h2/information_schema/tables/records/ColumnsRecord.java
index ac9d460232..34ca85de6f 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/h2/information_schema/tables/records/ColumnsRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/h2/information_schema/tables/records/ColumnsRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.h2.information_schema.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class ColumnsRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.h2.information_schema.tables.records.ColumnsRecord> {
 
-	private static final long serialVersionUID = 1853010133;
+	private static final long serialVersionUID = 951330546;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/h2/information_schema/tables/records/ConstraintsRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/h2/information_schema/tables/records/ConstraintsRecord.java
index 21870d4058..f9617a0fc3 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/h2/information_schema/tables/records/ConstraintsRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/h2/information_schema/tables/records/ConstraintsRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.h2.information_schema.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class ConstraintsRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.h2.information_schema.tables.records.ConstraintsRecord> {
 
-	private static final long serialVersionUID = 1657819907;
+	private static final long serialVersionUID = 476855456;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/h2/information_schema/tables/records/CrossReferencesRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/h2/information_schema/tables/records/CrossReferencesRecord.java
index 073e66d312..fc137f13a7 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/h2/information_schema/tables/records/CrossReferencesRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/h2/information_schema/tables/records/CrossReferencesRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.h2.information_schema.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class CrossReferencesRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.h2.information_schema.tables.records.CrossReferencesRecord> {
 
-	private static final long serialVersionUID = -2081975328;
+	private static final long serialVersionUID = 1645258915;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/h2/information_schema/tables/records/FunctionAliasesRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/h2/information_schema/tables/records/FunctionAliasesRecord.java
index de0e49dcd1..e466a01f72 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/h2/information_schema/tables/records/FunctionAliasesRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/h2/information_schema/tables/records/FunctionAliasesRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.h2.information_schema.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class FunctionAliasesRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.h2.information_schema.tables.records.FunctionAliasesRecord> {
 
-	private static final long serialVersionUID = 2040682600;
+	private static final long serialVersionUID = -1646345109;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/h2/information_schema/tables/records/FunctionColumnsRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/h2/information_schema/tables/records/FunctionColumnsRecord.java
index aebaa2637d..c37f255072 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/h2/information_schema/tables/records/FunctionColumnsRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/h2/information_schema/tables/records/FunctionColumnsRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.h2.information_schema.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class FunctionColumnsRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.h2.information_schema.tables.records.FunctionColumnsRecord> {
 
-	private static final long serialVersionUID = 890991564;
+	private static final long serialVersionUID = -1092021745;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/h2/information_schema/tables/records/SequencesRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/h2/information_schema/tables/records/SequencesRecord.java
index e01f618662..362a22c072 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/h2/information_schema/tables/records/SequencesRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/h2/information_schema/tables/records/SequencesRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.h2.information_schema.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class SequencesRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.h2.information_schema.tables.records.SequencesRecord> {
 
-	private static final long serialVersionUID = 73674527;
+	private static final long serialVersionUID = -1470657668;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/h2/information_schema/tables/records/TablesRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/h2/information_schema/tables/records/TablesRecord.java
index fcf560c8b9..b3599cba01 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/h2/information_schema/tables/records/TablesRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/h2/information_schema/tables/records/TablesRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.h2.information_schema.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class TablesRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.h2.information_schema.tables.records.TablesRecord> {
 
-	private static final long serialVersionUID = 1179061141;
+	private static final long serialVersionUID = 1358460530;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/h2/information_schema/tables/records/TypeInfoRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/h2/information_schema/tables/records/TypeInfoRecord.java
index 601c038f61..5c78cd86f2 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/h2/information_schema/tables/records/TypeInfoRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/h2/information_schema/tables/records/TypeInfoRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.h2.information_schema.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class TypeInfoRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.h2.information_schema.tables.records.TypeInfoRecord> {
 
-	private static final long serialVersionUID = 995660642;
+	private static final long serialVersionUID = 1140914085;
 
 	/**
 	 * An uncommented item
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 c0941ee10f..9631ddc757 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class InformationSchema extends org.jooq.impl.SchemaImpl {
 
-	private static final long serialVersionUID = 738749783;
+	private static final long serialVersionUID = -966123148;
 
 	/**
 	 * The singleton instance of INFORMATION_SCHEMA
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 cf3d3742dc..be33f7d2bd 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class InformationSchemaFactory extends org.jooq.util.hsqldb.HSQLDBFactory {
 
-	private static final long serialVersionUID = 1705827458;
+	private static final long serialVersionUID = 2121119607;
 
 	/**
 	 * Create a factory with a connection
@@ -22,12 +22,12 @@ public class InformationSchemaFactory extends org.jooq.util.hsqldb.HSQLDBFactory
 	}
 
 	/**
-	 * Create a factory with a connection and a schema mapping
+	 * Create a factory with a connection and some settings
 	 *
 	 * @param connection The connection to use with objects created from this factory
-	 * @param mapping The schema mapping to use with objects created from this factory
+	 * @param settings The settings to apply to objects created from this factory
 	 */
-	public InformationSchemaFactory(java.sql.Connection connection, org.jooq.SchemaMapping mapping) {
-		super(connection, mapping);
+	public InformationSchemaFactory(java.sql.Connection connection, org.jooq.conf.Settings settings) {
+		super(connection, settings);
 	}
 }
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 1d7de8173a..68cf7f055d 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public final class Tables {
 
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 1dc5cdf117..87a04e26c1 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class Columns extends org.jooq.impl.TableImpl<org.jooq.util.hsqldb.information_schema.tables.records.ColumnsRecord> {
 
-	private static final long serialVersionUID = 702932321;
+	private static final long serialVersionUID = -1106144642;
 
 	/**
 	 * The singleton instance of 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 9eb170b1eb..f2e2dc3a7b 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class ConstraintColumnUsage extends org.jooq.impl.TableImpl<org.jooq.util.hsqldb.information_schema.tables.records.ConstraintColumnUsageRecord> {
 
-	private static final long serialVersionUID = -804797529;
+	private static final long serialVersionUID = -100387158;
 
 	/**
 	 * The singleton instance of 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 3ff2353dfd..42613ad0d5 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class ElementTypes extends org.jooq.impl.TableImpl<org.jooq.util.hsqldb.information_schema.tables.records.ElementTypesRecord> {
 
-	private static final long serialVersionUID = -1927194514;
+	private static final long serialVersionUID = -2063781429;
 
 	/**
 	 * The singleton instance of 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 fb6a3189b9..9257b25c0b 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class KeyColumnUsage extends org.jooq.impl.TableImpl<org.jooq.util.hsqldb.information_schema.tables.records.KeyColumnUsageRecord> {
 
-	private static final long serialVersionUID = -1839332903;
+	private static final long serialVersionUID = 634053302;
 
 	/**
 	 * The singleton instance of 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 d84334c207..8cc24bc8c3 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class Parameters extends org.jooq.impl.TableImpl<org.jooq.util.hsqldb.information_schema.tables.records.ParametersRecord> {
 
-	private static final long serialVersionUID = 89790720;
+	private static final long serialVersionUID = -348318627;
 
 	/**
 	 * The singleton instance of 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 378be253fd..b67ca3fa2f 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class ReferentialConstraints extends org.jooq.impl.TableImpl<org.jooq.util.hsqldb.information_schema.tables.records.ReferentialConstraintsRecord> {
 
-	private static final long serialVersionUID = -1994542632;
+	private static final long serialVersionUID = -1891513099;
 
 	/**
 	 * The singleton instance of 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 6dc9cbe4f5..5943cd8d1d 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class Routines extends org.jooq.impl.TableImpl<org.jooq.util.hsqldb.information_schema.tables.records.RoutinesRecord> {
 
-	private static final long serialVersionUID = -236701506;
+	private static final long serialVersionUID = 1977923995;
 
 	/**
 	 * The singleton instance of ROUTINES
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 a9b70e2522..afe44c2dea 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class Sequences extends org.jooq.impl.TableImpl<org.jooq.util.hsqldb.information_schema.tables.records.SequencesRecord> {
 
-	private static final long serialVersionUID = 197124762;
+	private static final long serialVersionUID = -101399241;
 
 	/**
 	 * The singleton instance of 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 193b7201ad..00cb882a0d 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class TableConstraints extends org.jooq.impl.TableImpl<org.jooq.util.hsqldb.information_schema.tables.records.TableConstraintsRecord> {
 
-	private static final long serialVersionUID = 573735269;
+	private static final long serialVersionUID = 1834790466;
 
 	/**
 	 * The singleton instance of 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 9ca69eb495..17f9efa5d2 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class Tables extends org.jooq.impl.TableImpl<org.jooq.util.hsqldb.information_schema.tables.records.TablesRecord> {
 
-	private static final long serialVersionUID = 275281729;
+	private static final long serialVersionUID = -17747068;
 
 	/**
 	 * The singleton instance of TABLES
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/tables/records/ColumnsRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/tables/records/ColumnsRecord.java
index 6aff669ced..916b830432 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/tables/records/ColumnsRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/tables/records/ColumnsRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.hsqldb.information_schema.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class ColumnsRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.hsqldb.information_schema.tables.records.ColumnsRecord> {
 
-	private static final long serialVersionUID = -2040264425;
+	private static final long serialVersionUID = 2113140084;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/tables/records/ConstraintColumnUsageRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/tables/records/ConstraintColumnUsageRecord.java
index 7500a9b51b..95ecd55391 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/tables/records/ConstraintColumnUsageRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/tables/records/ConstraintColumnUsageRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.hsqldb.information_schema.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class ConstraintColumnUsageRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.hsqldb.information_schema.tables.records.ConstraintColumnUsageRecord> {
 
-	private static final long serialVersionUID = 1140323331;
+	private static final long serialVersionUID = 1062558624;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/tables/records/ElementTypesRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/tables/records/ElementTypesRecord.java
index 1d2649553c..a3751ed741 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/tables/records/ElementTypesRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/tables/records/ElementTypesRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.hsqldb.information_schema.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class ElementTypesRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.hsqldb.information_schema.tables.records.ElementTypesRecord> {
 
-	private static final long serialVersionUID = 353151452;
+	private static final long serialVersionUID = -1749842529;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/tables/records/KeyColumnUsageRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/tables/records/KeyColumnUsageRecord.java
index 75962169f6..5fa56c6a14 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/tables/records/KeyColumnUsageRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/tables/records/KeyColumnUsageRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.hsqldb.information_schema.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class KeyColumnUsageRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.hsqldb.information_schema.tables.records.KeyColumnUsageRecord> {
 
-	private static final long serialVersionUID = 764745787;
+	private static final long serialVersionUID = 991879192;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/tables/records/ParametersRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/tables/records/ParametersRecord.java
index a532383454..8551a3c0ad 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/tables/records/ParametersRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/tables/records/ParametersRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.hsqldb.information_schema.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class ParametersRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.hsqldb.information_schema.tables.records.ParametersRecord> {
 
-	private static final long serialVersionUID = -831060169;
+	private static final long serialVersionUID = -1041297836;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/tables/records/ReferentialConstraintsRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/tables/records/ReferentialConstraintsRecord.java
index eeb73f609f..bc27384043 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/tables/records/ReferentialConstraintsRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/tables/records/ReferentialConstraintsRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.hsqldb.information_schema.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class ReferentialConstraintsRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.hsqldb.information_schema.tables.records.ReferentialConstraintsRecord> {
 
-	private static final long serialVersionUID = 1767959740;
+	private static final long serialVersionUID = -2101518657;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/tables/records/RoutinesRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/tables/records/RoutinesRecord.java
index e4119966b0..fd3b2e90e2 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/tables/records/RoutinesRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/tables/records/RoutinesRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.hsqldb.information_schema.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class RoutinesRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.hsqldb.information_schema.tables.records.RoutinesRecord> {
 
-	private static final long serialVersionUID = -302187373;
+	private static final long serialVersionUID = 294719472;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/tables/records/SequencesRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/tables/records/SequencesRecord.java
index a12ff56017..bfb8309b8a 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/tables/records/SequencesRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/tables/records/SequencesRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.hsqldb.information_schema.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class SequencesRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.hsqldb.information_schema.tables.records.SequencesRecord> {
 
-	private static final long serialVersionUID = -1683265811;
+	private static final long serialVersionUID = -1555394742;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/tables/records/TableConstraintsRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/tables/records/TableConstraintsRecord.java
index 9cf559f3e8..8b552ffbad 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/tables/records/TableConstraintsRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/tables/records/TableConstraintsRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.hsqldb.information_schema.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class TableConstraintsRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.hsqldb.information_schema.tables.records.TableConstraintsRecord> {
 
-	private static final long serialVersionUID = 1851469100;
+	private static final long serialVersionUID = -1904018577;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/tables/records/TablesRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/tables/records/TablesRecord.java
index e69e6e4c3e..9ebe34f6ae 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/tables/records/TablesRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/information_schema/tables/records/TablesRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.hsqldb.information_schema.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class TablesRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.hsqldb.information_schema.tables.records.TablesRecord> {
 
-	private static final long serialVersionUID = 1385748877;
+	private static final long serialVersionUID = 1475190058;
 
 	/**
 	 * An uncommented item
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 e92f532a07..b848c35232 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class $ingres extends org.jooq.impl.SchemaImpl {
 
-	private static final long serialVersionUID = -1852298891;
+	private static final long serialVersionUID = -1990474312;
 
 	/**
 	 * The singleton instance of $ingres
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 ca78084019..c1ba3867d5 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class $ingresFactory extends org.jooq.util.ingres.IngresFactory {
 
-	private static final long serialVersionUID = 27555303;
+	private static final long serialVersionUID = 745113436;
 
 	/**
 	 * Create a factory with a connection
@@ -22,12 +22,12 @@ public class $ingresFactory extends org.jooq.util.ingres.IngresFactory {
 	}
 
 	/**
-	 * Create a factory with a connection and a schema mapping
+	 * Create a factory with a connection and some settings
 	 *
 	 * @param connection The connection to use with objects created from this factory
-	 * @param mapping The schema mapping to use with objects created from this factory
+	 * @param settings The settings to apply to objects created from this factory
 	 */
-	public $ingresFactory(java.sql.Connection connection, org.jooq.SchemaMapping mapping) {
-		super(connection, mapping);
+	public $ingresFactory(java.sql.Connection connection, org.jooq.conf.Settings settings) {
+		super(connection, settings);
 	}
 }
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 10ec1de057..2519648603 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public final class Tables {
 
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 e46c3ee3fe..6850d8dde0 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class Iicolumns extends org.jooq.impl.TableImpl<org.jooq.util.ingres.ingres.tables.records.IicolumnsRecord> {
 
-	private static final long serialVersionUID = -1796532800;
+	private static final long serialVersionUID = 342402499;
 
 	/**
 	 * The singleton instance of 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 429dd4eb04..ed9e35f835 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class IiconstraintIndexes extends org.jooq.impl.TableImpl<org.jooq.util.ingres.ingres.tables.records.IiconstraintIndexesRecord> {
 
-	private static final long serialVersionUID = -1361534698;
+	private static final long serialVersionUID = -62972301;
 
 	/**
 	 * The singleton instance of 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 61bb6a9d10..e75a8b05f8 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class Iiconstraints extends org.jooq.impl.TableImpl<org.jooq.util.ingres.ingres.tables.records.IiconstraintsRecord> {
 
-	private static final long serialVersionUID = 626878151;
+	private static final long serialVersionUID = -1609223068;
 
 	/**
 	 * The singleton instance of 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 6b06a11a0b..8571644727 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class IidbComments extends org.jooq.impl.TableImpl<org.jooq.util.ingres.ingres.tables.records.IidbCommentsRecord> {
 
-	private static final long serialVersionUID = 611369250;
+	private static final long serialVersionUID = -1336833921;
 
 	/**
 	 * The singleton instance of 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 637d1908f7..07ae78e4a0 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class IidbSubcomments extends org.jooq.impl.TableImpl<org.jooq.util.ingres.ingres.tables.records.IidbSubcommentsRecord> {
 
-	private static final long serialVersionUID = 1161418926;
+	private static final long serialVersionUID = -1823950735;
 
 	/**
 	 * The singleton instance of 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 42a83bf556..ef158d552e 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class IiindexColumns extends org.jooq.impl.TableImpl<org.jooq.util.ingres.ingres.tables.records.IiindexColumnsRecord> {
 
-	private static final long serialVersionUID = 11587401;
+	private static final long serialVersionUID = 649676134;
 
 	/**
 	 * The singleton instance of 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 ee46af4b7a..1d947919ff 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class Iiindexes extends org.jooq.impl.TableImpl<org.jooq.util.ingres.ingres.tables.records.IiindexesRecord> {
 
-	private static final long serialVersionUID = -1107834472;
+	private static final long serialVersionUID = 1626359157;
 
 	/**
 	 * The singleton instance of 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 cff30b1c71..2cb70c597d 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class IirefConstraints extends org.jooq.impl.TableImpl<org.jooq.util.ingres.ingres.tables.records.IirefConstraintsRecord> {
 
-	private static final long serialVersionUID = 116746560;
+	private static final long serialVersionUID = -5257661;
 
 	/**
 	 * The singleton instance of iiref_constraints
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 fba133122e..26354df889 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class Iisequences extends org.jooq.impl.TableImpl<org.jooq.util.ingres.ingres.tables.records.IisequencesRecord> {
 
-	private static final long serialVersionUID = 1298775173;
+	private static final long serialVersionUID = 1142021346;
 
 	/**
 	 * The singleton instance of 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 1bcd615ddf..160e7b61f9 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class Iitables extends org.jooq.impl.TableImpl<org.jooq.util.ingres.ingres.tables.records.IitablesRecord> {
 
-	private static final long serialVersionUID = -1358306895;
+	private static final long serialVersionUID = 1984489524;
 
 	/**
 	 * The singleton instance of iitables
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/records/IicolumnsRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/records/IicolumnsRecord.java
index 46d6e53250..eba8ceb44a 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/records/IicolumnsRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/records/IicolumnsRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.ingres.ingres.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class IicolumnsRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.ingres.ingres.tables.records.IicolumnsRecord> {
 
-	private static final long serialVersionUID = 1532391461;
+	private static final long serialVersionUID = 270818882;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/records/IiconstraintIndexesRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/records/IiconstraintIndexesRecord.java
index 710c3fbc21..4124c39900 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/records/IiconstraintIndexesRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/records/IiconstraintIndexesRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.ingres.ingres.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class IiconstraintIndexesRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.ingres.ingres.tables.records.IiconstraintIndexesRecord> {
 
-	private static final long serialVersionUID = 1441533524;
+	private static final long serialVersionUID = 858518295;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/records/IiconstraintsRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/records/IiconstraintsRecord.java
index 034bf9b83f..e3a423da4f 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/records/IiconstraintsRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/records/IiconstraintsRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.ingres.ingres.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class IiconstraintsRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.ingres.ingres.tables.records.IiconstraintsRecord> {
 
-	private static final long serialVersionUID = -793646867;
+	private static final long serialVersionUID = 1869126282;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/records/IidbCommentsRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/records/IidbCommentsRecord.java
index b067a5e0dc..a84f5aec44 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/records/IidbCommentsRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/records/IidbCommentsRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.ingres.ingres.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class IidbCommentsRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.ingres.ingres.tables.records.IidbCommentsRecord> {
 
-	private static final long serialVersionUID = -1137487826;
+	private static final long serialVersionUID = 2105868017;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/records/IidbSubcommentsRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/records/IidbSubcommentsRecord.java
index 85226634e1..54a5f9a3d9 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/records/IidbSubcommentsRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/records/IidbSubcommentsRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.ingres.ingres.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class IidbSubcommentsRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.ingres.ingres.tables.records.IidbSubcommentsRecord> {
 
-	private static final long serialVersionUID = -144436970;
+	private static final long serialVersionUID = -909876263;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/records/IiindexColumnsRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/records/IiindexColumnsRecord.java
index b3d115b2d3..b644bee8c3 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/records/IiindexColumnsRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/records/IiindexColumnsRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.ingres.ingres.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class IiindexColumnsRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.ingres.ingres.tables.records.IiindexColumnsRecord> {
 
-	private static final long serialVersionUID = 426486900;
+	private static final long serialVersionUID = 1751009399;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/records/IiindexesRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/records/IiindexesRecord.java
index 10f8861c75..c9464bf52c 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/records/IiindexesRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/records/IiindexesRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.ingres.ingres.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class IiindexesRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.ingres.ingres.tables.records.IiindexesRecord> {
 
-	private static final long serialVersionUID = 2015238729;
+	private static final long serialVersionUID = -278969114;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/records/IirefConstraintsRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/records/IirefConstraintsRecord.java
index 6363749150..79d10bd9ce 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/records/IirefConstraintsRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/records/IirefConstraintsRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.ingres.ingres.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class IirefConstraintsRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.ingres.ingres.tables.records.IirefConstraintsRecord> {
 
-	private static final long serialVersionUID = 1096090592;
+	private static final long serialVersionUID = 549772835;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/records/IisequencesRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/records/IisequencesRecord.java
index 371bdae616..c644da73e0 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/records/IisequencesRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/records/IisequencesRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.ingres.ingres.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class IisequencesRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.ingres.ingres.tables.records.IisequencesRecord> {
 
-	private static final long serialVersionUID = -1437725815;
+	private static final long serialVersionUID = -824238234;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/records/IitablesRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/records/IitablesRecord.java
index 7350193332..ac355a064f 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/records/IitablesRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/ingres/ingres/tables/records/IitablesRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.ingres.ingres.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class IitablesRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.ingres.ingres.tables.records.IitablesRecord> {
 
-	private static final long serialVersionUID = 1982751229;
+	private static final long serialVersionUID = -1424879398;
 
 	/**
 	 * An uncommented item
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 d52426976e..3fd08c8bcc 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class InformationSchema extends org.jooq.impl.SchemaImpl {
 
-	private static final long serialVersionUID = 1562451525;
+	private static final long serialVersionUID = 453866888;
 
 	/**
 	 * The singleton instance of information_schema
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 63cb8ad3ab..f8e87c7c80 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class InformationSchemaFactory extends org.jooq.util.mysql.MySQLFactory {
 
-	private static final long serialVersionUID = -1423867684;
+	private static final long serialVersionUID = 1683729425;
 
 	/**
 	 * Create a factory with a connection
@@ -22,12 +22,12 @@ public class InformationSchemaFactory extends org.jooq.util.mysql.MySQLFactory {
 	}
 
 	/**
-	 * Create a factory with a connection and a schema mapping
+	 * Create a factory with a connection and some settings
 	 *
 	 * @param connection The connection to use with objects created from this factory
-	 * @param mapping The schema mapping to use with objects created from this factory
+	 * @param settings The settings to apply to objects created from this factory
 	 */
-	public InformationSchemaFactory(java.sql.Connection connection, org.jooq.SchemaMapping mapping) {
-		super(connection, mapping);
+	public InformationSchemaFactory(java.sql.Connection connection, org.jooq.conf.Settings settings) {
+		super(connection, settings);
 	}
 }
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 65149942dc..9201fd03f6 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public final class 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 bce9939672..51a6023bc3 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class Columns extends org.jooq.impl.TableImpl<org.jooq.util.mysql.information_schema.tables.records.ColumnsRecord> {
 
-	private static final long serialVersionUID = -2099813704;
+	private static final long serialVersionUID = 1019942549;
 
 	/**
 	 * The singleton instance of 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 eb99889625..aa2d4d8c4d 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class KeyColumnUsage extends org.jooq.impl.TableImpl<org.jooq.util.mysql.information_schema.tables.records.KeyColumnUsageRecord> {
 
-	private static final long serialVersionUID = -1157342459;
+	private static final long serialVersionUID = 1129812322;
 
 	/**
 	 * The singleton instance of 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 da07e525ec..3e4ed8eea6 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class ReferentialConstraints extends org.jooq.impl.TableImpl<org.jooq.util.mysql.information_schema.tables.records.ReferentialConstraintsRecord> {
 
-	private static final long serialVersionUID = 1037663436;
+	private static final long serialVersionUID = 1130862927;
 
 	/**
 	 * The singleton instance of REFERENTIAL_CONSTRAINTS
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 e3781994ab..7532cdc302 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class TableConstraints extends org.jooq.impl.TableImpl<org.jooq.util.mysql.information_schema.tables.records.TableConstraintsRecord> {
 
-	private static final long serialVersionUID = -1757328348;
+	private static final long serialVersionUID = -120168857;
 
 	/**
 	 * The singleton instance of 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 4f548f3ed2..586d16df55 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class Tables extends org.jooq.impl.TableImpl<org.jooq.util.mysql.information_schema.tables.records.TablesRecord> {
 
-	private static final long serialVersionUID = -40524900;
+	private static final long serialVersionUID = -216877345;
 
 	/**
 	 * The singleton instance of TABLES
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/tables/records/ColumnsRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/tables/records/ColumnsRecord.java
index 00c6a03bf4..308defb9cd 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/tables/records/ColumnsRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/tables/records/ColumnsRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.mysql.information_schema.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class ColumnsRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.mysql.information_schema.tables.records.ColumnsRecord> {
 
-	private static final long serialVersionUID = 1823890797;
+	private static final long serialVersionUID = -657842614;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/tables/records/KeyColumnUsageRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/tables/records/KeyColumnUsageRecord.java
index 0aad735965..e004abd558 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/tables/records/KeyColumnUsageRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/tables/records/KeyColumnUsageRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.mysql.information_schema.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class KeyColumnUsageRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.mysql.information_schema.tables.records.KeyColumnUsageRecord> {
 
-	private static final long serialVersionUID = -2094484897;
+	private static final long serialVersionUID = 1867648508;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/tables/records/ReferentialConstraintsRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/tables/records/ReferentialConstraintsRecord.java
index 1570ffed59..b20bb80437 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/tables/records/ReferentialConstraintsRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/tables/records/ReferentialConstraintsRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.mysql.information_schema.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class ReferentialConstraintsRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.mysql.information_schema.tables.records.ReferentialConstraintsRecord> {
 
-	private static final long serialVersionUID = -629824320;
+	private static final long serialVersionUID = 563590915;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/tables/records/TableConstraintsRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/tables/records/TableConstraintsRecord.java
index 7727c733d0..cf0b5eebeb 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/tables/records/TableConstraintsRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/tables/records/TableConstraintsRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.mysql.information_schema.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class TableConstraintsRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.mysql.information_schema.tables.records.TableConstraintsRecord> {
 
-	private static final long serialVersionUID = -1145021838;
+	private static final long serialVersionUID = -1811315339;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/tables/records/TablesRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/tables/records/TablesRecord.java
index 367fce6509..4eca4fe357 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/tables/records/TablesRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/mysql/information_schema/tables/records/TablesRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.mysql.information_schema.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class TablesRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.mysql.information_schema.tables.records.TablesRecord> {
 
-	private static final long serialVersionUID = -984994659;
+	private static final long serialVersionUID = -1735576326;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/Mysql.java b/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/Mysql.java
index 2746b871c9..6cfdae9748 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/Mysql.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/Mysql.java
@@ -6,11 +6,11 @@ package org.jooq.util.mysql.mysql;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class Mysql extends org.jooq.impl.SchemaImpl {
 
-	private static final long serialVersionUID = -1261270483;
+	private static final long serialVersionUID = -1237942672;
 
 	/**
 	 * The singleton instance of mysql
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/MysqlFactory.java b/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/MysqlFactory.java
index 44ee8f6008..58b0960655 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/MysqlFactory.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/MysqlFactory.java
@@ -6,11 +6,11 @@ package org.jooq.util.mysql.mysql;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class MysqlFactory extends org.jooq.util.mysql.MySQLFactory {
 
-	private static final long serialVersionUID = -1257376281;
+	private static final long serialVersionUID = 699294428;
 
 	/**
 	 * Create a factory with a connection
@@ -22,12 +22,12 @@ public class MysqlFactory extends org.jooq.util.mysql.MySQLFactory {
 	}
 
 	/**
-	 * Create a factory with a connection and a schema mapping
+	 * Create a factory with a connection and some settings
 	 *
 	 * @param connection The connection to use with objects created from this factory
-	 * @param mapping The schema mapping to use with objects created from this factory
+	 * @param settings The settings to apply to objects created from this factory
 	 */
-	public MysqlFactory(java.sql.Connection connection, org.jooq.SchemaMapping mapping) {
-		super(connection, mapping);
+	public MysqlFactory(java.sql.Connection connection, org.jooq.conf.Settings settings) {
+		super(connection, settings);
 	}
 }
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/Tables.java b/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/Tables.java
index 740199b1af..85bf2fc3d0 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/Tables.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/Tables.java
@@ -8,7 +8,7 @@ package org.jooq.util.mysql.mysql;
  *
  * Convenience access to all tables in mysql
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public final class Tables {
 
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/enums/ProcIsDeterministic.java b/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/enums/ProcIsDeterministic.java
index cb57948eee..034d428ac0 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/enums/ProcIsDeterministic.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/enums/ProcIsDeterministic.java
@@ -6,7 +6,7 @@ package org.jooq.util.mysql.mysql.enums;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public enum ProcIsDeterministic implements org.jooq.EnumType {
 	YES("YES"),
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/enums/ProcLanguage.java b/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/enums/ProcLanguage.java
index 20f01947af..28a5068bbf 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/enums/ProcLanguage.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/enums/ProcLanguage.java
@@ -6,7 +6,7 @@ package org.jooq.util.mysql.mysql.enums;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public enum ProcLanguage implements org.jooq.EnumType {
 	SQL("SQL"),
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/enums/ProcSecurityType.java b/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/enums/ProcSecurityType.java
index 85a825f5f0..c0e0988d8b 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/enums/ProcSecurityType.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/enums/ProcSecurityType.java
@@ -6,7 +6,7 @@ package org.jooq.util.mysql.mysql.enums;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public enum ProcSecurityType implements org.jooq.EnumType {
 	INVOKER("INVOKER"),
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/enums/ProcSqlDataAccess.java b/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/enums/ProcSqlDataAccess.java
index 9455d44c55..64d15f8bb1 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/enums/ProcSqlDataAccess.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/enums/ProcSqlDataAccess.java
@@ -6,7 +6,7 @@ package org.jooq.util.mysql.mysql.enums;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public enum ProcSqlDataAccess implements org.jooq.EnumType {
 	CONTAINS_SQL("CONTAINS_SQL"),
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/enums/ProcType.java b/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/enums/ProcType.java
index 861ee749a9..10e86b7ad3 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/enums/ProcType.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/enums/ProcType.java
@@ -6,7 +6,7 @@ package org.jooq.util.mysql.mysql.enums;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public enum ProcType implements org.jooq.EnumType {
 	FUNCTION("FUNCTION"),
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/enums/ProcsPrivRoutineType.java b/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/enums/ProcsPrivRoutineType.java
index 2173eb1444..ad35492a87 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/enums/ProcsPrivRoutineType.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/enums/ProcsPrivRoutineType.java
@@ -6,7 +6,7 @@ package org.jooq.util.mysql.mysql.enums;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public enum ProcsPrivRoutineType implements org.jooq.EnumType {
 	FUNCTION("FUNCTION"),
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/tables/Proc.java b/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/tables/Proc.java
index 33df8a0f98..4ffb43c9c6 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/tables/Proc.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/tables/Proc.java
@@ -8,11 +8,11 @@ package org.jooq.util.mysql.mysql.tables;
  *
  * Stored Procedures
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class Proc extends org.jooq.impl.TableImpl<org.jooq.util.mysql.mysql.tables.records.ProcRecord> {
 
-	private static final long serialVersionUID = -1029117085;
+	private static final long serialVersionUID = -1270070784;
 
 	/**
 	 * The singleton instance of proc
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/tables/ProcsPriv.java b/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/tables/ProcsPriv.java
index 7550157744..7c538eae7b 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/tables/ProcsPriv.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/tables/ProcsPriv.java
@@ -8,11 +8,11 @@ package org.jooq.util.mysql.mysql.tables;
  *
  * Procedure privileges
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class ProcsPriv extends org.jooq.impl.TableImpl<org.jooq.util.mysql.mysql.tables.records.ProcsPrivRecord> {
 
-	private static final long serialVersionUID = -640451213;
+	private static final long serialVersionUID = 2010453430;
 
 	/**
 	 * The singleton instance of procs_priv
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/tables/records/ProcRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/tables/records/ProcRecord.java
index 4d5f36fb25..a6e25eb698 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/tables/records/ProcRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/tables/records/ProcRecord.java
@@ -8,11 +8,11 @@ package org.jooq.util.mysql.mysql.tables.records;
  *
  * Stored Procedures
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class ProcRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.mysql.mysql.tables.records.ProcRecord> {
 
-	private static final long serialVersionUID = 1932040044;
+	private static final long serialVersionUID = -2070286711;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/tables/records/ProcsPrivRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/tables/records/ProcsPrivRecord.java
index d1743b18db..ec1c1828cb 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/tables/records/ProcsPrivRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/tables/records/ProcsPrivRecord.java
@@ -8,11 +8,11 @@ package org.jooq.util.mysql.mysql.tables.records;
  *
  * Procedure privileges
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class ProcsPrivRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.mysql.mysql.tables.records.ProcsPrivRecord> {
 
-	private static final long serialVersionUID = -458086751;
+	private static final long serialVersionUID = -2088988764;
 
 	/**
 	 * An uncommented item
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 f8c04e0d8e..b5a46ff573 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.3"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class Sys extends org.jooq.impl.SchemaImpl {
 
-	private static final long serialVersionUID = -388504019;
+	private static final long serialVersionUID = -1465427477;
 
 	/**
 	 * The singleton instance of SYS
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 e12fbb440a..66de1fd2b8 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.3"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class SysFactory extends org.jooq.util.oracle.OracleFactory {
 
-	private static final long serialVersionUID = -1810498046;
+	private static final long serialVersionUID = -625437066;
 
 	/**
 	 * Create a factory with a connection
@@ -22,12 +22,12 @@ public class SysFactory extends org.jooq.util.oracle.OracleFactory {
 	}
 
 	/**
-	 * Create a factory with a connection and a schema mapping
+	 * Create a factory with a connection and some settings
 	 *
 	 * @param connection The connection to use with objects created from this factory
-	 * @param mapping The schema mapping to use with objects created from this factory
+	 * @param settings The settings to apply to objects created from this factory
 	 */
-	public SysFactory(java.sql.Connection connection, org.jooq.SchemaMapping mapping) {
-		super(connection, mapping);
+	public SysFactory(java.sql.Connection connection, org.jooq.conf.Settings settings) {
+		super(connection, settings);
 	}
 }
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 f9d35bda39..62b828ebab 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.3"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public final class Tables {
 
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 57026a5889..d2cb433144 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.3"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class AllArguments extends org.jooq.impl.TableImpl<org.jooq.util.oracle.sys.tables.records.AllArgumentsRecord> {
 
-	private static final long serialVersionUID = -950316966;
+	private static final long serialVersionUID = 38616668;
 
 	/**
 	 * The singleton instance of 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 c1abe80458..e7d13a2068 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.3"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class AllColComments extends org.jooq.impl.TableImpl<org.jooq.util.oracle.sys.tables.records.AllColCommentsRecord> {
 
-	private static final long serialVersionUID = 1725335927;
+	private static final long serialVersionUID = -357687115;
 
 	/**
 	 * The singleton instance of 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 2318c3332b..9b4dc9c6a3 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.3"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class AllCollTypes extends org.jooq.impl.TableImpl<org.jooq.util.oracle.sys.tables.records.AllCollTypesRecord> {
 
-	private static final long serialVersionUID = -1721955816;
+	private static final long serialVersionUID = 225178966;
 
 	/**
 	 * The singleton instance of 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 ddef817d53..85d59b75c2 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.3"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class AllConsColumns extends org.jooq.impl.TableImpl<org.jooq.util.oracle.sys.tables.records.AllConsColumnsRecord> {
 
-	private static final long serialVersionUID = -1346395749;
+	private static final long serialVersionUID = -169155367;
 
 	/**
 	 * The singleton instance of 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 9a02d9bbcd..7353d5a30f 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.3"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class AllConstraints extends org.jooq.impl.TableImpl<org.jooq.util.oracle.sys.tables.records.AllConstraintsRecord> {
 
-	private static final long serialVersionUID = -921224945;
+	private static final long serialVersionUID = -413030451;
 
 	/**
 	 * The singleton instance of 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 589d0ae97f..b1d3d1ada2 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.3"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class AllObjects extends org.jooq.impl.TableImpl<org.jooq.util.oracle.sys.tables.records.AllObjectsRecord> {
 
-	private static final long serialVersionUID = -765327119;
+	private static final long serialVersionUID = -1578550097;
 
 	/**
 	 * The singleton instance of 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 53af90fb28..643e49cfa0 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.3"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class AllProcedures extends org.jooq.impl.TableImpl<org.jooq.util.oracle.sys.tables.records.AllProceduresRecord> {
 
-	private static final long serialVersionUID = 285652354;
+	private static final long serialVersionUID = -671650044;
 
 	/**
 	 * The singleton instance of 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 5dbed92630..0daaca8d27 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.3"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class AllSequences extends org.jooq.impl.TableImpl<org.jooq.util.oracle.sys.tables.records.AllSequencesRecord> {
 
-	private static final long serialVersionUID = 827245030;
+	private static final long serialVersionUID = -1484919132;
 
 	/**
 	 * The singleton instance of 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 56bab52d15..81112d3bb4 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.3"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class AllTabCols extends org.jooq.impl.TableImpl<org.jooq.util.oracle.sys.tables.records.AllTabColsRecord> {
 
-	private static final long serialVersionUID = 914169633;
+	private static final long serialVersionUID = -1053136033;
 
 	/**
 	 * The singleton instance of 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 fa20be4165..97ebd36ed0 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.3"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class AllTabComments extends org.jooq.impl.TableImpl<org.jooq.util.oracle.sys.tables.records.AllTabCommentsRecord> {
 
-	private static final long serialVersionUID = 1209157655;
+	private static final long serialVersionUID = -1228761387;
 
 	/**
 	 * The singleton instance of 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 c7851c07e7..7dd56dad6e 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.3"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class AllTypeAttrs extends org.jooq.impl.TableImpl<org.jooq.util.oracle.sys.tables.records.AllTypeAttrsRecord> {
 
-	private static final long serialVersionUID = 1138731961;
+	private static final long serialVersionUID = 142915063;
 
 	/**
 	 * The singleton instance of 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 fb0cdd309d..d0a1ee217f 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.3"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class AllTypes extends org.jooq.impl.TableImpl<org.jooq.util.oracle.sys.tables.records.AllTypesRecord> {
 
-	private static final long serialVersionUID = -1742552057;
+	private static final long serialVersionUID = -2023966523;
 
 	/**
 	 * The singleton instance of ALL_TYPES
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/records/AllArgumentsRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/records/AllArgumentsRecord.java
index bfffd565a8..9e55bcf2cb 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/records/AllArgumentsRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/records/AllArgumentsRecord.java
@@ -8,11 +8,11 @@ package org.jooq.util.oracle.sys.tables.records;
  *
  * Arguments in object accessible to the user
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.3"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class AllArgumentsRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.oracle.sys.tables.records.AllArgumentsRecord> {
 
-	private static final long serialVersionUID = -1494091503;
+	private static final long serialVersionUID = -1393019373;
 
 	/**
 	 * Username of the owner of the object
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/records/AllColCommentsRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/records/AllColCommentsRecord.java
index 80f401fae3..842992097f 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/records/AllColCommentsRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/records/AllColCommentsRecord.java
@@ -8,11 +8,11 @@ package org.jooq.util.oracle.sys.tables.records;
  *
  * Comments on columns of accessible tables and views
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.3"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class AllColCommentsRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.oracle.sys.tables.records.AllColCommentsRecord> {
 
-	private static final long serialVersionUID = -645608286;
+	private static final long serialVersionUID = -800247840;
 
 	/**
 	 * Owner of the object
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/records/AllCollTypesRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/records/AllCollTypesRecord.java
index 1c3fc9fc99..26ea630039 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/records/AllCollTypesRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/records/AllCollTypesRecord.java
@@ -8,11 +8,11 @@ package org.jooq.util.oracle.sys.tables.records;
  *
  * Description of named collection types accessible to the user
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.3"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class AllCollTypesRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.oracle.sys.tables.records.AllCollTypesRecord> {
 
-	private static final long serialVersionUID = 1164829031;
+	private static final long serialVersionUID = 1848225957;
 
 	/**
 	 * Owner of the type
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/records/AllConsColumnsRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/records/AllConsColumnsRecord.java
index 8a521eab1f..94cc33ee97 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/records/AllConsColumnsRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/records/AllConsColumnsRecord.java
@@ -8,11 +8,11 @@ package org.jooq.util.oracle.sys.tables.records;
  *
  * Information about accessible columns in constraint definitions
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.3"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class AllConsColumnsRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.oracle.sys.tables.records.AllConsColumnsRecord> {
 
-	private static final long serialVersionUID = -13276483;
+	private static final long serialVersionUID = -2039358213;
 
 	/**
 	 * Owner of the constraint definition
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/records/AllConstraintsRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/records/AllConstraintsRecord.java
index 851560d7a1..9beeb559ff 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/records/AllConstraintsRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/records/AllConstraintsRecord.java
@@ -8,11 +8,11 @@ package org.jooq.util.oracle.sys.tables.records;
  *
  * Constraint definitions on accessible tables
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.3"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class AllConstraintsRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.oracle.sys.tables.records.AllConstraintsRecord> {
 
-	private static final long serialVersionUID = -473630329;
+	private static final long serialVersionUID = 758413705;
 
 	/**
 	 * Owner of the table
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/records/AllObjectsRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/records/AllObjectsRecord.java
index 20c950c7a8..c038686c5e 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/records/AllObjectsRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/records/AllObjectsRecord.java
@@ -8,11 +8,11 @@ package org.jooq.util.oracle.sys.tables.records;
  *
  * Objects accessible to the user
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.3"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class AllObjectsRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.oracle.sys.tables.records.AllObjectsRecord> {
 
-	private static final long serialVersionUID = 490895073;
+	private static final long serialVersionUID = 896997987;
 
 	/**
 	 * Username of the owner of the object
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/records/AllProceduresRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/records/AllProceduresRecord.java
index 20c83a5930..3053792aaf 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/records/AllProceduresRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/records/AllProceduresRecord.java
@@ -8,11 +8,11 @@ package org.jooq.util.oracle.sys.tables.records;
  *
  * Functions/procedures/packages/types/triggers available to the user
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.3"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class AllProceduresRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.oracle.sys.tables.records.AllProceduresRecord> {
 
-	private static final long serialVersionUID = 722042746;
+	private static final long serialVersionUID = 95859580;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/records/AllSequencesRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/records/AllSequencesRecord.java
index 3ba6c86d5b..c54fee8fd6 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/records/AllSequencesRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/records/AllSequencesRecord.java
@@ -8,11 +8,11 @@ package org.jooq.util.oracle.sys.tables.records;
  *
  * Description of SEQUENCEs accessible to the user
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.3"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class AllSequencesRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.oracle.sys.tables.records.AllSequencesRecord> {
 
-	private static final long serialVersionUID = 1527919222;
+	private static final long serialVersionUID = -2064000776;
 
 	/**
 	 * Name of the owner of the sequence
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/records/AllTabColsRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/records/AllTabColsRecord.java
index fcd4b5f289..e9db2d7c68 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/records/AllTabColsRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/records/AllTabColsRecord.java
@@ -8,11 +8,11 @@ package org.jooq.util.oracle.sys.tables.records;
  *
  * Columns of user's tables, views and clusters
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.3"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class AllTabColsRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.oracle.sys.tables.records.AllTabColsRecord> {
 
-	private static final long serialVersionUID = -619863281;
+	private static final long serialVersionUID = -1594071987;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/records/AllTabCommentsRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/records/AllTabCommentsRecord.java
index 07b7784789..4db1da077f 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/records/AllTabCommentsRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/records/AllTabCommentsRecord.java
@@ -8,11 +8,11 @@ package org.jooq.util.oracle.sys.tables.records;
  *
  * Comments on tables and views accessible to the user
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.3"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class AllTabCommentsRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.oracle.sys.tables.records.AllTabCommentsRecord> {
 
-	private static final long serialVersionUID = -1321767651;
+	private static final long serialVersionUID = 1941905243;
 
 	/**
 	 * Owner of the object
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/records/AllTypeAttrsRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/records/AllTypeAttrsRecord.java
index 4f9dbee1b4..f655ab9dca 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/records/AllTypeAttrsRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/records/AllTypeAttrsRecord.java
@@ -8,11 +8,11 @@ package org.jooq.util.oracle.sys.tables.records;
  *
  * Description of attributes of types accessible to the user
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.3"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class AllTypeAttrsRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.oracle.sys.tables.records.AllTypeAttrsRecord> {
 
-	private static final long serialVersionUID = -998173294;
+	private static final long serialVersionUID = 1062749520;
 
 	/**
 	 * Owner of the type
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/records/AllTypesRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/records/AllTypesRecord.java
index 518b7fe075..fe2bd01a5d 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/records/AllTypesRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/oracle/sys/tables/records/AllTypesRecord.java
@@ -8,11 +8,11 @@ package org.jooq.util.oracle.sys.tables.records;
  *
  * Description of types accessible to the user
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.3"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class AllTypesRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.oracle.sys.tables.records.AllTypesRecord> {
 
-	private static final long serialVersionUID = -812892773;
+	private static final long serialVersionUID = 533403549;
 
 	/**
 	 * Owner of the type
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 861ab4aac2..0759eb8bcb 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.3"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class OraMiningNumberNtRecord extends org.jooq.impl.ArrayRecordImpl<java.math.BigDecimal> {
 
-	private static final long serialVersionUID = -2132403247;
+	private static final long serialVersionUID = -1631299885;
 
 	public OraMiningNumberNtRecord(org.jooq.Configuration configuration) {
 		super("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 754ab4c7f1..40f004c340 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.3"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class OraMiningVarchar2NtRecord extends org.jooq.impl.ArrayRecordImpl<java.lang.String> {
 
-	private static final long serialVersionUID = 5873115;
+	private static final long serialVersionUID = 2133766493;
 
 	public OraMiningVarchar2NtRecord(org.jooq.Configuration configuration) {
 		super("SYS.ORA_MINING_VARCHAR2_NT", org.jooq.impl.SQLDataType.VARCHAR, configuration);
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 beebefd11f..4440f9d160 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class InformationSchema extends org.jooq.impl.SchemaImpl {
 
-	private static final long serialVersionUID = 919941935;
+	private static final long serialVersionUID = -1948573326;
 
 	/**
 	 * The singleton instance of information_schema
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 d8f7b14501..6df2c538a3 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class InformationSchemaFactory extends org.jooq.util.postgres.PostgresFactory {
 
-	private static final long serialVersionUID = -1040585523;
+	private static final long serialVersionUID = -585031038;
 
 	/**
 	 * Create a factory with a connection
@@ -22,12 +22,12 @@ public class InformationSchemaFactory extends org.jooq.util.postgres.PostgresFac
 	}
 
 	/**
-	 * Create a factory with a connection and a schema mapping
+	 * Create a factory with a connection and some settings
 	 *
 	 * @param connection The connection to use with objects created from this factory
-	 * @param mapping The schema mapping to use with objects created from this factory
+	 * @param settings The settings to apply to objects created from this factory
 	 */
-	public InformationSchemaFactory(java.sql.Connection connection, org.jooq.SchemaMapping mapping) {
-		super(connection, mapping);
+	public InformationSchemaFactory(java.sql.Connection connection, org.jooq.conf.Settings settings) {
+		super(connection, settings);
 	}
 }
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 bec8dccfa4..78df309b16 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public final class Tables {
 
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 730c2d61df..8cfc77bbac 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class Attributes extends org.jooq.impl.TableImpl<org.jooq.util.postgres.information_schema.tables.records.AttributesRecord> {
 
-	private static final long serialVersionUID = -1527786897;
+	private static final long serialVersionUID = 1904935244;
 
 	/**
 	 * The singleton instance of 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 fc574aca06..1058362d61 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class Columns extends org.jooq.impl.TableImpl<org.jooq.util.postgres.information_schema.tables.records.ColumnsRecord> {
 
-	private static final long serialVersionUID = -544221897;
+	private static final long serialVersionUID = -888880582;
 
 	/**
 	 * The singleton instance of 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 b560813707..2f62036c01 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class ConstraintColumnUsage extends org.jooq.impl.TableImpl<org.jooq.util.postgres.information_schema.tables.records.ConstraintColumnUsageRecord> {
 
-	private static final long serialVersionUID = 1227293082;
+	private static final long serialVersionUID = -1004703971;
 
 	/**
 	 * The singleton instance of 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 45633d41a5..241385031d 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class KeyColumnUsage extends org.jooq.impl.TableImpl<org.jooq.util.postgres.information_schema.tables.records.KeyColumnUsageRecord> {
 
-	private static final long serialVersionUID = -130891492;
+	private static final long serialVersionUID = -2077649927;
 
 	/**
 	 * The singleton instance of 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 bb0939fb8d..283f5b3855 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class Parameters extends org.jooq.impl.TableImpl<org.jooq.util.postgres.information_schema.tables.records.ParametersRecord> {
 
-	private static final long serialVersionUID = 1045898468;
+	private static final long serialVersionUID = -1349315135;
 
 	/**
 	 * The singleton instance of 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 3fb86034cf..5a571b9137 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class ReferentialConstraints extends org.jooq.impl.TableImpl<org.jooq.util.postgres.information_schema.tables.records.ReferentialConstraintsRecord> {
 
-	private static final long serialVersionUID = -899603729;
+	private static final long serialVersionUID = -1355604724;
 
 	/**
 	 * The singleton instance of 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 2608a6b16a..c10b214b8f 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class Routines extends org.jooq.impl.TableImpl<org.jooq.util.postgres.information_schema.tables.records.RoutinesRecord> {
 
-	private static final long serialVersionUID = -1297446607;
+	private static final long serialVersionUID = 748099854;
 
 	/**
 	 * The singleton instance of routines
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 83b0ae6f95..fbbb957443 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class Sequences extends org.jooq.impl.TableImpl<org.jooq.util.postgres.information_schema.tables.records.SequencesRecord> {
 
-	private static final long serialVersionUID = 1178993610;
+	private static final long serialVersionUID = 237504973;
 
 	/**
 	 * The singleton instance of 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 98c64742a6..a73523e6c7 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class TableConstraints extends org.jooq.impl.TableImpl<org.jooq.util.postgres.information_schema.tables.records.TableConstraintsRecord> {
 
-	private static final long serialVersionUID = -837141244;
+	private static final long serialVersionUID = 351111393;
 
 	/**
 	 * The singleton instance of 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 5e51c38f89..8297be02c4 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class Tables extends org.jooq.impl.TableImpl<org.jooq.util.postgres.information_schema.tables.records.TablesRecord> {
 
-	private static final long serialVersionUID = -1206685055;
+	private static final long serialVersionUID = -341102204;
 
 	/**
 	 * The singleton instance of tables
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/tables/records/AttributesRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/tables/records/AttributesRecord.java
index 2e6bf8a812..252d38a647 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/tables/records/AttributesRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/tables/records/AttributesRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.postgres.information_schema.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class AttributesRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.postgres.information_schema.tables.records.AttributesRecord> {
 
-	private static final long serialVersionUID = 1050694984;
+	private static final long serialVersionUID = 1030119845;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/tables/records/ColumnsRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/tables/records/ColumnsRecord.java
index ecc2c5f8b4..febac1c01c 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/tables/records/ColumnsRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/tables/records/ColumnsRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.postgres.information_schema.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class ColumnsRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.postgres.information_schema.tables.records.ColumnsRecord> {
 
-	private static final long serialVersionUID = 1642998484;
+	private static final long serialVersionUID = -1966533967;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/tables/records/ConstraintColumnUsageRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/tables/records/ConstraintColumnUsageRecord.java
index c075e869ce..4e6b28ea9a 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/tables/records/ConstraintColumnUsageRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/tables/records/ConstraintColumnUsageRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.postgres.information_schema.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class ConstraintColumnUsageRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.postgres.information_schema.tables.records.ConstraintColumnUsageRecord> {
 
-	private static final long serialVersionUID = 154824280;
+	private static final long serialVersionUID = 1250566645;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/tables/records/KeyColumnUsageRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/tables/records/KeyColumnUsageRecord.java
index b3f8549ea5..aecf56d638 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/tables/records/KeyColumnUsageRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/tables/records/KeyColumnUsageRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.postgres.information_schema.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class KeyColumnUsageRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.postgres.information_schema.tables.records.KeyColumnUsageRecord> {
 
-	private static final long serialVersionUID = -49014662;
+	private static final long serialVersionUID = 331586519;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/tables/records/ParametersRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/tables/records/ParametersRecord.java
index 23ef6b0b23..b336cc0980 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/tables/records/ParametersRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/tables/records/ParametersRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.postgres.information_schema.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class ParametersRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.postgres.information_schema.tables.records.ParametersRecord> {
 
-	private static final long serialVersionUID = 511435842;
+	private static final long serialVersionUID = 1642488927;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/tables/records/ReferentialConstraintsRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/tables/records/ReferentialConstraintsRecord.java
index efc9a76f3a..8f871325b8 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/tables/records/ReferentialConstraintsRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/tables/records/ReferentialConstraintsRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.postgres.information_schema.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class ReferentialConstraintsRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.postgres.information_schema.tables.records.ReferentialConstraintsRecord> {
 
-	private static final long serialVersionUID = -1159587651;
+	private static final long serialVersionUID = 1095044032;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/tables/records/RoutinesRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/tables/records/RoutinesRecord.java
index 8d5b091162..967c52ca0f 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/tables/records/RoutinesRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/tables/records/RoutinesRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.postgres.information_schema.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class RoutinesRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.postgres.information_schema.tables.records.RoutinesRecord> {
 
-	private static final long serialVersionUID = 431754670;
+	private static final long serialVersionUID = 1284039243;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/tables/records/SequencesRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/tables/records/SequencesRecord.java
index 6a51f189f3..aca115b51d 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/tables/records/SequencesRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/tables/records/SequencesRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.postgres.information_schema.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class SequencesRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.postgres.information_schema.tables.records.SequencesRecord> {
 
-	private static final long serialVersionUID = -1818474198;
+	private static final long serialVersionUID = -1287328377;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/tables/records/TableConstraintsRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/tables/records/TableConstraintsRecord.java
index 88ba9ce569..219f4ea08e 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/tables/records/TableConstraintsRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/tables/records/TableConstraintsRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.postgres.information_schema.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class TableConstraintsRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.postgres.information_schema.tables.records.TableConstraintsRecord> {
 
-	private static final long serialVersionUID = -1269893641;
+	private static final long serialVersionUID = 301729082;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/tables/records/TablesRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/tables/records/TablesRecord.java
index 5a0b7a820b..8fe1a54935 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/tables/records/TablesRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/information_schema/tables/records/TablesRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.postgres.information_schema.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class TablesRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.postgres.information_schema.tables.records.TablesRecord> {
 
-	private static final long serialVersionUID = 1472797506;
+	private static final long serialVersionUID = 1834039903;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/PgCatalog.java b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/PgCatalog.java
index ff0ff3e81d..671813f7e1 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/PgCatalog.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/PgCatalog.java
@@ -6,11 +6,11 @@ package org.jooq.util.postgres.pg_catalog;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.3"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class PgCatalog extends org.jooq.impl.SchemaImpl {
 
-	private static final long serialVersionUID = 791750662;
+	private static final long serialVersionUID = 884725896;
 
 	/**
 	 * The singleton instance of pg_catalog
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/PgCatalogFactory.java b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/PgCatalogFactory.java
index ca228140ba..96a5a3c741 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/PgCatalogFactory.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/PgCatalogFactory.java
@@ -6,11 +6,11 @@ package org.jooq.util.postgres.pg_catalog;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.3"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class PgCatalogFactory extends org.jooq.util.postgres.PostgresFactory {
 
-	private static final long serialVersionUID = -1388784032;
+	private static final long serialVersionUID = 1165675348;
 
 	/**
 	 * Create a factory with a connection
@@ -22,12 +22,12 @@ public class PgCatalogFactory extends org.jooq.util.postgres.PostgresFactory {
 	}
 
 	/**
-	 * Create a factory with a connection and a schema mapping
+	 * Create a factory with a connection and some settings
 	 *
 	 * @param connection The connection to use with objects created from this factory
-	 * @param mapping The schema mapping to use with objects created from this factory
+	 * @param settings The settings to apply to objects created from this factory
 	 */
-	public PgCatalogFactory(java.sql.Connection connection, org.jooq.SchemaMapping mapping) {
-		super(connection, mapping);
+	public PgCatalogFactory(java.sql.Connection connection, org.jooq.conf.Settings settings) {
+		super(connection, settings);
 	}
 }
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/Routines.java b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/Routines.java
index 3c4dfa16c1..6268a53a73 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/Routines.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/Routines.java
@@ -8,7 +8,7 @@ package org.jooq.util.postgres.pg_catalog;
  *
  * Convenience access to all stored procedures and functions in pg_catalog
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.3"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public final class Routines {
 
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/Tables.java b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/Tables.java
index 475af3e840..b96d75e0ff 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/Tables.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/Tables.java
@@ -8,7 +8,7 @@ package org.jooq.util.postgres.pg_catalog;
  *
  * Convenience access to all tables in pg_catalog
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.3"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public final class Tables {
 
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/routines/FormatType.java b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/routines/FormatType.java
index eef2b33f6d..af2b63830c 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/routines/FormatType.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/routines/FormatType.java
@@ -6,11 +6,11 @@ package org.jooq.util.postgres.pg_catalog.routines;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.3"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class FormatType extends org.jooq.impl.AbstractRoutine<java.lang.String> {
 
-	private static final long serialVersionUID = 1204222339;
+	private static final long serialVersionUID = -786308091;
 
 
 	/**
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgAttribute.java b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgAttribute.java
index eb20955681..300532a304 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgAttribute.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgAttribute.java
@@ -6,11 +6,11 @@ package org.jooq.util.postgres.pg_catalog.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.3"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class PgAttribute extends org.jooq.impl.TableImpl<org.jooq.util.postgres.pg_catalog.tables.records.PgAttributeRecord> {
 
-	private static final long serialVersionUID = 753041846;
+	private static final long serialVersionUID = -576102284;
 
 	/**
 	 * The singleton instance of pg_attribute
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgClass.java b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgClass.java
index 88c0613052..f2d1af3be1 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgClass.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgClass.java
@@ -6,11 +6,11 @@ package org.jooq.util.postgres.pg_catalog.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.3"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class PgClass extends org.jooq.impl.TableImpl<org.jooq.util.postgres.pg_catalog.tables.records.PgClassRecord> {
 
-	private static final long serialVersionUID = 1169850129;
+	private static final long serialVersionUID = 684490387;
 
 	/**
 	 * The singleton instance of pg_class
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgEnum.java b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgEnum.java
index ff8fc65e15..c746388b6e 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgEnum.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgEnum.java
@@ -6,11 +6,11 @@ package org.jooq.util.postgres.pg_catalog.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.3"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class PgEnum extends org.jooq.impl.TableImpl<org.jooq.util.postgres.pg_catalog.tables.records.PgEnumRecord> {
 
-	private static final long serialVersionUID = -1311846575;
+	private static final long serialVersionUID = 2065130383;
 
 	/**
 	 * The singleton instance of pg_enum
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgNamespace.java b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgNamespace.java
index 4417501129..88770a098b 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgNamespace.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgNamespace.java
@@ -6,11 +6,11 @@ package org.jooq.util.postgres.pg_catalog.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.3"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class PgNamespace extends org.jooq.impl.TableImpl<org.jooq.util.postgres.pg_catalog.tables.records.PgNamespaceRecord> {
 
-	private static final long serialVersionUID = -1757898245;
+	private static final long serialVersionUID = -1369568643;
 
 	/**
 	 * The singleton instance of pg_namespace
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgProc.java b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgProc.java
index 93fb95f52b..7bdd09bfb4 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgProc.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgProc.java
@@ -6,11 +6,11 @@ package org.jooq.util.postgres.pg_catalog.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.3"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class PgProc extends org.jooq.impl.TableImpl<org.jooq.util.postgres.pg_catalog.tables.records.PgProcRecord> {
 
-	private static final long serialVersionUID = 990924029;
+	private static final long serialVersionUID = 1878140927;
 
 	/**
 	 * The singleton instance of pg_proc
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgType.java b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgType.java
index e427f6b8ba..f437efadad 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgType.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/PgType.java
@@ -6,11 +6,11 @@ package org.jooq.util.postgres.pg_catalog.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.3"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class PgType extends org.jooq.impl.TableImpl<org.jooq.util.postgres.pg_catalog.tables.records.PgTypeRecord> {
 
-	private static final long serialVersionUID = 900015809;
+	private static final long serialVersionUID = -229075457;
 
 	/**
 	 * The singleton instance of pg_type
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/records/PgAttributeRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/records/PgAttributeRecord.java
index 0b04ca8720..30f7db30c9 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/records/PgAttributeRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/records/PgAttributeRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.postgres.pg_catalog.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.3"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class PgAttributeRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.postgres.pg_catalog.tables.records.PgAttributeRecord> {
 
-	private static final long serialVersionUID = 457353345;
+	private static final long serialVersionUID = -499882493;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/records/PgClassRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/records/PgClassRecord.java
index 11c77e9ca1..d4c5f259af 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/records/PgClassRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/records/PgClassRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.postgres.pg_catalog.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.3"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class PgClassRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.postgres.pg_catalog.tables.records.PgClassRecord> {
 
-	private static final long serialVersionUID = -545497803;
+	private static final long serialVersionUID = 1921096503;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/records/PgEnumRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/records/PgEnumRecord.java
index 14b6face09..d63baa9ae2 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/records/PgEnumRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/records/PgEnumRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.postgres.pg_catalog.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.3"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class PgEnumRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.postgres.pg_catalog.tables.records.PgEnumRecord> {
 
-	private static final long serialVersionUID = 1875819327;
+	private static final long serialVersionUID = 1952059585;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/records/PgNamespaceRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/records/PgNamespaceRecord.java
index 3089dd0f9e..258cf9daec 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/records/PgNamespaceRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/records/PgNamespaceRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.postgres.pg_catalog.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.3"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class PgNamespaceRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.postgres.pg_catalog.tables.records.PgNamespaceRecord> {
 
-	private static final long serialVersionUID = 621543853;
+	private static final long serialVersionUID = -1547075537;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/records/PgProcRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/records/PgProcRecord.java
index 3a7558b67b..c173e4c6d9 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/records/PgProcRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/records/PgProcRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.postgres.pg_catalog.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.3"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class PgProcRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.postgres.pg_catalog.tables.records.PgProcRecord> {
 
-	private static final long serialVersionUID = -1871166069;
+	private static final long serialVersionUID = 1238535693;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/records/PgTypeRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/records/PgTypeRecord.java
index b27d192dd9..985dd99347 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/records/PgTypeRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/pg_catalog/tables/records/PgTypeRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.postgres.pg_catalog.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.3"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class PgTypeRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.postgres.pg_catalog.tables.records.PgTypeRecord> {
 
-	private static final long serialVersionUID = 334831621;
+	private static final long serialVersionUID = -101356281;
 
 	/**
 	 * An uncommented item
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 9e7e70101c..47476e4494 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class InformationSchema extends org.jooq.impl.SchemaImpl {
 
-	private static final long serialVersionUID = -1840011447;
+	private static final long serialVersionUID = -74456500;
 
 	/**
 	 * The singleton instance of INFORMATION_SCHEMA
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 b9ac9df1f8..c866eb5b9d 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class InformationSchemaFactory extends org.jooq.util.hsqldb.HSQLDBFactory {
 
-	private static final long serialVersionUID = 41549557;
+	private static final long serialVersionUID = -90805206;
 
 	/**
 	 * Create a factory with a connection
@@ -22,12 +22,12 @@ public class InformationSchemaFactory extends org.jooq.util.hsqldb.HSQLDBFactory
 	}
 
 	/**
-	 * Create a factory with a connection and a schema mapping
+	 * Create a factory with a connection and some settings
 	 *
 	 * @param connection The connection to use with objects created from this factory
-	 * @param mapping The schema mapping to use with objects created from this factory
+	 * @param settings The settings to apply to objects created from this factory
 	 */
-	public InformationSchemaFactory(java.sql.Connection connection, org.jooq.SchemaMapping mapping) {
-		super(connection, mapping);
+	public InformationSchemaFactory(java.sql.Connection connection, org.jooq.conf.Settings settings) {
+		super(connection, settings);
 	}
 }
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 b91cffd639..c09bfbdb8d 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public final class Tables {
 
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 e4f6ed80aa..f78956b518 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class Columns extends org.jooq.impl.TableImpl<org.jooq.util.sqlserver.information_schema.tables.records.ColumnsRecord> {
 
-	private static final long serialVersionUID = 774641372;
+	private static final long serialVersionUID = 1342474553;
 
 	/**
 	 * The singleton instance of 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 72b00ff4a6..14fe4a03f4 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class ConstraintColumnUsage extends org.jooq.impl.TableImpl<org.jooq.util.sqlserver.information_schema.tables.records.ConstraintColumnUsageRecord> {
 
-	private static final long serialVersionUID = -120085874;
+	private static final long serialVersionUID = -1407396527;
 
 	/**
 	 * The singleton instance of 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 d27abb24fc..5ba7f15cfd 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class KeyColumnUsage extends org.jooq.impl.TableImpl<org.jooq.util.sqlserver.information_schema.tables.records.KeyColumnUsageRecord> {
 
-	private static final long serialVersionUID = -1688829570;
+	private static final long serialVersionUID = 1220473051;
 
 	/**
 	 * The singleton instance of 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 8762a34c1b..99e2b8338e 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class Parameters extends org.jooq.impl.TableImpl<org.jooq.util.sqlserver.information_schema.tables.records.ParametersRecord> {
 
-	private static final long serialVersionUID = -2012678084;
+	private static final long serialVersionUID = -1620942977;
 
 	/**
 	 * The singleton instance of 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 0be074a936..ca5463bcc1 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class ReferentialConstraints extends org.jooq.impl.TableImpl<org.jooq.util.sqlserver.information_schema.tables.records.ReferentialConstraintsRecord> {
 
-	private static final long serialVersionUID = -1143413295;
+	private static final long serialVersionUID = -616714386;
 
 	/**
 	 * The singleton instance of 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 6febacd64a..1419280b31 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class Routines extends org.jooq.impl.TableImpl<org.jooq.util.sqlserver.information_schema.tables.records.RoutinesRecord> {
 
-	private static final long serialVersionUID = 210383414;
+	private static final long serialVersionUID = 469380601;
 
 	/**
 	 * The singleton instance of ROUTINES
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 5e77626870..1dd0370b2d 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class Sequences extends org.jooq.impl.TableImpl<org.jooq.util.sqlserver.information_schema.tables.records.SequencesRecord> {
 
-	private static final long serialVersionUID = 1881594306;
+	private static final long serialVersionUID = 317738181;
 
 	/**
 	 * The singleton instance of 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 87542182fb..be80c39db5 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class TableConstraints extends org.jooq.impl.TableImpl<org.jooq.util.sqlserver.information_schema.tables.records.TableConstraintsRecord> {
 
-	private static final long serialVersionUID = -393433418;
+	private static final long serialVersionUID = 936929811;
 
 	/**
 	 * The singleton instance of 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 8dda1c19c7..6d39d873e9 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class Tables extends org.jooq.impl.TableImpl<org.jooq.util.sqlserver.information_schema.tables.records.TablesRecord> {
 
-	private static final long serialVersionUID = -1789276275;
+	private static final long serialVersionUID = 1702878506;
 
 	/**
 	 * The singleton instance of TABLES
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/information_schema/tables/records/ColumnsRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/information_schema/tables/records/ColumnsRecord.java
index 260ca392d8..5339141c25 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/information_schema/tables/records/ColumnsRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/information_schema/tables/records/ColumnsRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.sqlserver.information_schema.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class ColumnsRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.sqlserver.information_schema.tables.records.ColumnsRecord> {
 
-	private static final long serialVersionUID = -331025906;
+	private static final long serialVersionUID = -1623291285;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/information_schema/tables/records/ConstraintColumnUsageRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/information_schema/tables/records/ConstraintColumnUsageRecord.java
index 96bc091209..c3d0f3f837 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/information_schema/tables/records/ConstraintColumnUsageRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/information_schema/tables/records/ConstraintColumnUsageRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.sqlserver.information_schema.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class ConstraintColumnUsageRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.sqlserver.information_schema.tables.records.ConstraintColumnUsageRecord> {
 
-	private static final long serialVersionUID = -136603746;
+	private static final long serialVersionUID = -107843269;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/information_schema/tables/records/KeyColumnUsageRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/information_schema/tables/records/KeyColumnUsageRecord.java
index 73e6d83b8e..3d595cdbe9 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/information_schema/tables/records/KeyColumnUsageRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/information_schema/tables/records/KeyColumnUsageRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.sqlserver.information_schema.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class KeyColumnUsageRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.sqlserver.information_schema.tables.records.KeyColumnUsageRecord> {
 
-	private static final long serialVersionUID = -1781565596;
+	private static final long serialVersionUID = 1864912321;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/information_schema/tables/records/ParametersRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/information_schema/tables/records/ParametersRecord.java
index f235832cc6..167a07de12 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/information_schema/tables/records/ParametersRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/information_schema/tables/records/ParametersRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.sqlserver.information_schema.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class ParametersRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.sqlserver.information_schema.tables.records.ParametersRecord> {
 
-	private static final long serialVersionUID = 987498096;
+	private static final long serialVersionUID = 968506829;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/information_schema/tables/records/ReferentialConstraintsRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/information_schema/tables/records/ReferentialConstraintsRecord.java
index b07a18de37..6395dc86cd 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/information_schema/tables/records/ReferentialConstraintsRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/information_schema/tables/records/ReferentialConstraintsRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.sqlserver.information_schema.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class ReferentialConstraintsRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.sqlserver.information_schema.tables.records.ReferentialConstraintsRecord> {
 
-	private static final long serialVersionUID = -322277183;
+	private static final long serialVersionUID = -989805500;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/information_schema/tables/records/RoutinesRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/information_schema/tables/records/RoutinesRecord.java
index 1e34fa239b..eb1a650f4a 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/information_schema/tables/records/RoutinesRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/information_schema/tables/records/RoutinesRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.sqlserver.information_schema.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class RoutinesRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.sqlserver.information_schema.tables.records.RoutinesRecord> {
 
-	private static final long serialVersionUID = -456942618;
+	private static final long serialVersionUID = 107010947;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/information_schema/tables/records/SequencesRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/information_schema/tables/records/SequencesRecord.java
index 0dc8d1d6ef..96d611264a 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/information_schema/tables/records/SequencesRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/information_schema/tables/records/SequencesRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.sqlserver.information_schema.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class SequencesRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.sqlserver.information_schema.tables.records.SequencesRecord> {
 
-	private static final long serialVersionUID = -992597544;
+	private static final long serialVersionUID = 583908469;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/information_schema/tables/records/TableConstraintsRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/information_schema/tables/records/TableConstraintsRecord.java
index 3825cb6432..195b0fb9b5 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/information_schema/tables/records/TableConstraintsRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/information_schema/tables/records/TableConstraintsRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.sqlserver.information_schema.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class TableConstraintsRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.sqlserver.information_schema.tables.records.TableConstraintsRecord> {
 
-	private static final long serialVersionUID = 1940790363;
+	private static final long serialVersionUID = 2068179998;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/information_schema/tables/records/TablesRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/information_schema/tables/records/TablesRecord.java
index 07ae9ce778..aeff7c3eef 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/information_schema/tables/records/TablesRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/information_schema/tables/records/TablesRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.sqlserver.information_schema.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class TablesRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.sqlserver.information_schema.tables.records.TablesRecord> {
 
-	private static final long serialVersionUID = 1551306866;
+	private static final long serialVersionUID = 1731548495;
 
 	/**
 	 * An uncommented item
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 335ff31567..6892379748 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,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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class Sys extends org.jooq.impl.SchemaImpl {
 
-	private static final long serialVersionUID = -2135087220;
+	private static final long serialVersionUID = -2075868503;
 
 	/**
 	 * The singleton instance of sys
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 4379897cd0..987574c6b2 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.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class SysFactory extends org.jooq.util.sybase.SybaseFactory {
 
-	private static final long serialVersionUID = 1347262938;
+	private static final long serialVersionUID = 342095375;
 
 	/**
 	 * Create a factory with a connection
@@ -22,12 +22,12 @@ public class SysFactory extends org.jooq.util.sybase.SybaseFactory {
 	}
 
 	/**
-	 * Create a factory with a connection and a schema mapping
+	 * Create a factory with a connection and some settings
 	 *
 	 * @param connection The connection to use with objects created from this factory
-	 * @param mapping The schema mapping to use with objects created from this factory
+	 * @param settings The settings to apply to objects created from this factory
 	 */
-	public SysFactory(java.sql.Connection connection, org.jooq.SchemaMapping mapping) {
-		super(connection, mapping);
+	public SysFactory(java.sql.Connection connection, org.jooq.conf.Settings settings) {
+		super(connection, settings);
 	}
 }
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 41a5d1699d..dfc372a8d6 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
@@ -8,7 +8,7 @@ package org.jooq.util.sybase.sys;
  *
  * Convenience access to all tables in sys
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public final class Tables {
 
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 3cf37e5232..335b5dee84 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,11 +6,11 @@ package org.jooq.util.sybase.sys.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class Sysdomain extends org.jooq.impl.TableImpl<org.jooq.util.sybase.sys.tables.records.SysdomainRecord> {
 
-	private static final long serialVersionUID = -216958894;
+	private static final long serialVersionUID = 145269141;
 
 	/**
 	 * The singleton instance of 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 07fdb47c11..add37782fd 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,11 +6,11 @@ package org.jooq.util.sybase.sys.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class Sysfkey extends org.jooq.impl.TableImpl<org.jooq.util.sybase.sys.tables.records.SysfkeyRecord> {
 
-	private static final long serialVersionUID = 1904959086;
+	private static final long serialVersionUID = -1123025103;
 
 	/**
 	 * The singleton instance of 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 5385f437d3..8ffb612883 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,11 +6,11 @@ package org.jooq.util.sybase.sys.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class Sysidx extends org.jooq.impl.TableImpl<org.jooq.util.sybase.sys.tables.records.SysidxRecord> {
 
-	private static final long serialVersionUID = -1556460574;
+	private static final long serialVersionUID = 725496255;
 
 	/**
 	 * The singleton instance of 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 e34e0d3156..38d0c40868 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,11 +6,11 @@ package org.jooq.util.sybase.sys.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class Sysidxcol extends org.jooq.impl.TableImpl<org.jooq.util.sybase.sys.tables.records.SysidxcolRecord> {
 
-	private static final long serialVersionUID = 1956000274;
+	private static final long serialVersionUID = -1073489451;
 
 	/**
 	 * The singleton instance of 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 20933129a1..d3a60cd973 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,11 +6,11 @@ package org.jooq.util.sybase.sys.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class Sysprocedure extends org.jooq.impl.TableImpl<org.jooq.util.sybase.sys.tables.records.SysprocedureRecord> {
 
-	private static final long serialVersionUID = -1487800866;
+	private static final long serialVersionUID = -748115397;
 
 	/**
 	 * The singleton instance of 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 c389773e63..445f792701 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,11 +6,11 @@ package org.jooq.util.sybase.sys.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class Sysprocparm extends org.jooq.impl.TableImpl<org.jooq.util.sybase.sys.tables.records.SysprocparmRecord> {
 
-	private static final long serialVersionUID = -1190630624;
+	private static final long serialVersionUID = 1417863293;
 
 	/**
 	 * The singleton instance of 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 d59f130cdf..31df7216d9 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,11 +6,11 @@ package org.jooq.util.sybase.sys.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class Syssequence extends org.jooq.impl.TableImpl<org.jooq.util.sybase.sys.tables.records.SyssequenceRecord> {
 
-	private static final long serialVersionUID = -1217102765;
+	private static final long serialVersionUID = 1455287830;
 
 	/**
 	 * The singleton instance of 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 35679f0db1..4fc0c16589 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,11 +6,11 @@ package org.jooq.util.sybase.sys.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class Systab extends org.jooq.impl.TableImpl<org.jooq.util.sybase.sys.tables.records.SystabRecord> {
 
-	private static final long serialVersionUID = -1674813992;
+	private static final long serialVersionUID = -1073616229;
 
 	/**
 	 * The singleton instance of 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 6b6d475cf7..ed09f99c19 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,11 +6,11 @@ package org.jooq.util.sybase.sys.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class Systabcol extends org.jooq.impl.TableImpl<org.jooq.util.sybase.sys.tables.records.SystabcolRecord> {
 
-	private static final long serialVersionUID = 1451585908;
+	private static final long serialVersionUID = 1783282769;
 
 	/**
 	 * The singleton instance of 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 8e6a2f2942..d8a147adae 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,11 +6,11 @@ package org.jooq.util.sybase.sys.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class Systable extends org.jooq.impl.TableImpl<org.jooq.util.sybase.sys.tables.records.SystableRecord> {
 
-	private static final long serialVersionUID = 1960642110;
+	private static final long serialVersionUID = -1314898661;
 
 	/**
 	 * The singleton instance of SYSTABLE
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 8043aa852c..bd682cecb0 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,11 +6,11 @@ package org.jooq.util.sybase.sys.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class Sysview extends org.jooq.impl.TableImpl<org.jooq.util.sybase.sys.tables.records.SysviewRecord> {
 
-	private static final long serialVersionUID = -2021835410;
+	private static final long serialVersionUID = 1581175115;
 
 	/**
 	 * The singleton instance of SYSVIEW
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/records/SysdomainRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/records/SysdomainRecord.java
index eca7250377..f0de7d02c3 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/records/SysdomainRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/records/SysdomainRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.sybase.sys.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class SysdomainRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.sybase.sys.tables.records.SysdomainRecord> {
 
-	private static final long serialVersionUID = 815900481;
+	private static final long serialVersionUID = -516355042;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/records/SysfkeyRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/records/SysfkeyRecord.java
index 113a841a99..688f30f238 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/records/SysfkeyRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/records/SysfkeyRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.sybase.sys.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class SysfkeyRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.sybase.sys.tables.records.SysfkeyRecord> {
 
-	private static final long serialVersionUID = -2119654109;
+	private static final long serialVersionUID = 1550044288;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/records/SysidxRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/records/SysidxRecord.java
index daccf84c7e..44b93ed02b 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/records/SysidxRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/records/SysidxRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.sybase.sys.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class SysidxRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.sybase.sys.tables.records.SysidxRecord> {
 
-	private static final long serialVersionUID = -1110391569;
+	private static final long serialVersionUID = -1939779252;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/records/SysidxcolRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/records/SysidxcolRecord.java
index c9124ac7d9..ec7c07e56c 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/records/SysidxcolRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/records/SysidxcolRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.sybase.sys.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class SysidxcolRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.sybase.sys.tables.records.SysidxcolRecord> {
 
-	private static final long serialVersionUID = -965536593;
+	private static final long serialVersionUID = -1068136308;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/records/SysprocedureRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/records/SysprocedureRecord.java
index 33865985e2..8728b7da03 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/records/SysprocedureRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/records/SysprocedureRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.sybase.sys.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class SysprocedureRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.sybase.sys.tables.records.SysprocedureRecord> {
 
-	private static final long serialVersionUID = -728020793;
+	private static final long serialVersionUID = -569216412;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/records/SysprocparmRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/records/SysprocparmRecord.java
index d0f43eb740..f4e4104196 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/records/SysprocparmRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/records/SysprocparmRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.sybase.sys.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class SysprocparmRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.sybase.sys.tables.records.SysprocparmRecord> {
 
-	private static final long serialVersionUID = -942260807;
+	private static final long serialVersionUID = -1615836970;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/records/SyssequenceRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/records/SyssequenceRecord.java
index 6614175472..59b88b545a 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/records/SyssequenceRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/records/SyssequenceRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.sybase.sys.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class SyssequenceRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.sybase.sys.tables.records.SyssequenceRecord> {
 
-	private static final long serialVersionUID = 2142920309;
+	private static final long serialVersionUID = -469046894;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/records/SystabRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/records/SystabRecord.java
index d3b4d29133..7b1309ff3b 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/records/SystabRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/records/SystabRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.sybase.sys.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class SystabRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.sybase.sys.tables.records.SystabRecord> {
 
-	private static final long serialVersionUID = 1580269797;
+	private static final long serialVersionUID = 1312804994;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/records/SystabcolRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/records/SystabcolRecord.java
index 2cbd5d55ce..223efc9fd3 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/records/SystabcolRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/records/SystabcolRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.sybase.sys.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class SystabcolRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.sybase.sys.tables.records.SystabcolRecord> {
 
-	private static final long serialVersionUID = -1106944275;
+	private static final long serialVersionUID = -1330514422;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/records/SystableRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/records/SystableRecord.java
index a0a00093f5..a79f1dc143 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/records/SystableRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/records/SystableRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.sybase.sys.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class SystableRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.sybase.sys.tables.records.SystableRecord> {
 
-	private static final long serialVersionUID = -794851063;
+	private static final long serialVersionUID = -1558557530;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/records/SysviewRecord.java b/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/records/SysviewRecord.java
index 03e5675388..e03a8ce191 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/records/SysviewRecord.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/sybase/sys/tables/records/SysviewRecord.java
@@ -6,11 +6,11 @@ package org.jooq.util.sybase.sys.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.2"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
                             comments = "This class is generated by jOOQ")
 public class SysviewRecord extends org.jooq.impl.TableRecordImpl<org.jooq.util.sybase.sys.tables.records.SysviewRecord> {
 
-	private static final long serialVersionUID = 639734251;
+	private static final long serialVersionUID = 116001800;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-meta/src/main/resources/jooq-codegen-2.0.4.xsd b/jOOQ-meta/src/main/resources/xsd/jooq-codegen-2.0.4.xsd
similarity index 100%
rename from jOOQ-meta/src/main/resources/jooq-codegen-2.0.4.xsd
rename to jOOQ-meta/src/main/resources/xsd/jooq-codegen-2.0.4.xsd
diff --git a/jOOQ-spring/src/main/java/org/jooq/util/spring/FactoryProxy.java b/jOOQ-spring/src/main/java/org/jooq/util/spring/FactoryProxy.java
index c6ed98d03d..4d7fd2911b 100644
--- a/jOOQ-spring/src/main/java/org/jooq/util/spring/FactoryProxy.java
+++ b/jOOQ-spring/src/main/java/org/jooq/util/spring/FactoryProxy.java
@@ -81,6 +81,7 @@ import org.jooq.UDT;
 import org.jooq.UDTRecord;
 import org.jooq.UpdateQuery;
 import org.jooq.UpdateSetStep;
+import org.jooq.conf.Settings;
 import org.jooq.exception.DataAccessException;
 import org.jooq.impl.Factory;
 import org.jooq.tools.JooqLogger;
@@ -97,6 +98,7 @@ import org.springframework.jdbc.support.nativejdbc.NativeJdbcExtractor;
  * @author Sergey Epik
  * @author Lukas Eder
  */
+@SuppressWarnings("deprecation")
 public class FactoryProxy implements FactoryOperations, MethodInterceptor {
 
     /**
@@ -110,6 +112,7 @@ public class FactoryProxy implements FactoryOperations, MethodInterceptor {
     private transient DataSource           dataSource;
     private SQLDialect                     dialect;
     private SchemaMapping                  schemaMapping;
+    private Settings                       settings;
     private NativeJdbcExtractor            nativeJdbcExtractor;
 
     // -------------------------------------------------------------------------
@@ -121,9 +124,14 @@ public class FactoryProxy implements FactoryOperations, MethodInterceptor {
         this.dialect = dialect;
     }
 
-    @Required
     public final void setSchemaMapping(SchemaMapping schemaMapping) {
         this.schemaMapping = schemaMapping;
+
+        log.warn("DEPRECATION", "org.jooq.SchemaMapping is deprecated as of jOOQ 2.0.5. Consider using jOOQ's runtime configuration org.jooq.conf.Settings instead");
+    }
+
+    public final void setSettings(Settings settings) {
+        this.settings = settings;
     }
 
     @Required
@@ -163,10 +171,16 @@ public class FactoryProxy implements FactoryOperations, MethodInterceptor {
     }
 
     @Override
+    @Deprecated
     public final SchemaMapping getSchemaMapping() {
         return schemaMapping;
     }
 
+    @Override
+    public final Settings getSettings() {
+        return settings;
+    }
+
     @Override
     public final Connection getConnection() {
         return getDelegate().getConnection();
@@ -520,7 +534,7 @@ public class FactoryProxy implements FactoryOperations, MethodInterceptor {
     private final Factory createFactory() {
         try {
             Class<? extends Factory> clazz = getDialect().getFactory();
-            Constructor<? extends Factory> constructor = clazz.getConstructor(Connection.class, SchemaMapping.class);
+            Constructor<? extends Factory> constructor = clazz.getConstructor(Connection.class, Settings.class);
             Connection con = DataSourceUtils.getConnection(getDataSource());
             Connection conToUse = con;
 
@@ -528,7 +542,7 @@ public class FactoryProxy implements FactoryOperations, MethodInterceptor {
                 conToUse = nativeJdbcExtractor.getNativeConnection(con);
             }
 
-            Factory factory = constructor.newInstance(conToUse, getSchemaMapping());
+            Factory factory = constructor.newInstance(conToUse, getSettings());
             currentFactory.set(factory);
             currentConnection.set(con);
 
diff --git a/jOOQ-test/examples/org/jooq/examples/mysql/sakila/SakilaFactory.java b/jOOQ-test/examples/org/jooq/examples/mysql/sakila/SakilaFactory.java
index 4726fb3264..9d3195a708 100644
--- a/jOOQ-test/examples/org/jooq/examples/mysql/sakila/SakilaFactory.java
+++ b/jOOQ-test/examples/org/jooq/examples/mysql/sakila/SakilaFactory.java
@@ -8,7 +8,7 @@ package org.jooq.examples.mysql.sakila;
  */
 public class SakilaFactory extends org.jooq.util.mysql.MySQLFactory {
 
-	private static final long serialVersionUID = -1317109521;
+	private static final long serialVersionUID = -1204007483;
 
 	/**
 	 * Create a factory with a connection
@@ -21,11 +21,21 @@ public class SakilaFactory extends org.jooq.util.mysql.MySQLFactory {
 
 	/**
 	 * Create a factory with a connection and a schema mapping
-	 *
-	 * @param connection The connection to use with objects created from this factory
-	 * @param mapping The schema mapping to use with objects created from this factory
+	 * 
+	 * @deprecated - 2.0.5 - Use {@link #SakilaFactory(java.sql.Connection, org.jooq.conf.Settings)} instead
 	 */
+	@Deprecated
 	public SakilaFactory(java.sql.Connection connection, org.jooq.SchemaMapping mapping) {
 		super(connection, mapping);
 	}
+
+	/**
+	 * Create a factory with a connection and some settings
+	 *
+	 * @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 SakilaFactory(java.sql.Connection connection, org.jooq.conf.Settings settings) {
+		super(connection, settings);
+	}
 }
diff --git a/jOOQ-test/examples/org/jooq/examples/oracle/sys/SysFactory.java b/jOOQ-test/examples/org/jooq/examples/oracle/sys/SysFactory.java
index 17cdc0c875..18e4e16514 100644
--- a/jOOQ-test/examples/org/jooq/examples/oracle/sys/SysFactory.java
+++ b/jOOQ-test/examples/org/jooq/examples/oracle/sys/SysFactory.java
@@ -8,7 +8,7 @@ package org.jooq.examples.oracle.sys;
  */
 public class SysFactory extends org.jooq.util.oracle.OracleFactory {
 
-	private static final long serialVersionUID = -1573961703;
+	private static final long serialVersionUID = 891220555;
 
 	/**
 	 * Create a factory with a connection
@@ -20,12 +20,12 @@ public class SysFactory extends org.jooq.util.oracle.OracleFactory {
 	}
 
 	/**
-	 * Create a factory with a connection and a schema mapping
+	 * Create a factory with a connection and some settings
 	 *
 	 * @param connection The connection to use with objects created from this factory
-	 * @param mapping The schema mapping to use with objects created from this factory
+	 * @param settings The settings to apply to objects created from this factory
 	 */
-	public SysFactory(java.sql.Connection connection, org.jooq.SchemaMapping mapping) {
-		super(connection, mapping);
+	public SysFactory(java.sql.Connection connection, org.jooq.conf.Settings settings) {
+		super(connection, settings);
 	}
 }
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/DboFactory.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/DboFactory.java
index e3786704c6..0e109df55d 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/DboFactory.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/DboFactory.java
@@ -8,7 +8,7 @@ package org.jooq.examples.sqlserver.adventureworks.dbo;
  */
 public class DboFactory extends org.jooq.util.sqlserver.SQLServerFactory {
 
-	private static final long serialVersionUID = -745300318;
+	private static final long serialVersionUID = -829082410;
 
 	/**
 	 * Create a factory with a connection
@@ -21,11 +21,21 @@ public class DboFactory extends org.jooq.util.sqlserver.SQLServerFactory {
 
 	/**
 	 * Create a factory with a connection and a schema mapping
-	 *
-	 * @param connection The connection to use with objects created from this factory
-	 * @param mapping The schema mapping to use with objects created from this factory
+	 * 
+	 * @deprecated - 2.0.5 - Use {@link #DboFactory(java.sql.Connection, org.jooq.conf.Settings)} instead
 	 */
+	@Deprecated
 	public DboFactory(java.sql.Connection connection, org.jooq.SchemaMapping mapping) {
 		super(connection, mapping);
 	}
+
+	/**
+	 * Create a factory with a connection and some settings
+	 *
+	 * @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 DboFactory(java.sql.Connection connection, org.jooq.conf.Settings settings) {
+		super(connection, settings);
+	}
 }
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/HumanresourcesFactory.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/HumanresourcesFactory.java
index f18e6eae3a..20c11cf5d1 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/HumanresourcesFactory.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/HumanresourcesFactory.java
@@ -8,7 +8,7 @@ package org.jooq.examples.sqlserver.adventureworks.humanresources;
  */
 public class HumanresourcesFactory extends org.jooq.util.sqlserver.SQLServerFactory {
 
-	private static final long serialVersionUID = -983441838;
+	private static final long serialVersionUID = -450946154;
 
 	/**
 	 * Create a factory with a connection
@@ -21,11 +21,21 @@ public class HumanresourcesFactory extends org.jooq.util.sqlserver.SQLServerFact
 
 	/**
 	 * Create a factory with a connection and a schema mapping
-	 *
-	 * @param connection The connection to use with objects created from this factory
-	 * @param mapping The schema mapping to use with objects created from this factory
+	 * 
+	 * @deprecated - 2.0.5 - Use {@link #HumanresourcesFactory(java.sql.Connection, org.jooq.conf.Settings)} instead
 	 */
+	@Deprecated
 	public HumanresourcesFactory(java.sql.Connection connection, org.jooq.SchemaMapping mapping) {
 		super(connection, mapping);
 	}
+
+	/**
+	 * Create a factory with a connection and some settings
+	 *
+	 * @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 HumanresourcesFactory(java.sql.Connection connection, org.jooq.conf.Settings settings) {
+		super(connection, settings);
+	}
 }
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/PersonFactory.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/PersonFactory.java
index c8d1ec7737..e7e8f17da2 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/PersonFactory.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/PersonFactory.java
@@ -8,7 +8,7 @@ package org.jooq.examples.sqlserver.adventureworks.person;
  */
 public class PersonFactory extends org.jooq.util.sqlserver.SQLServerFactory {
 
-	private static final long serialVersionUID = -1915072750;
+	private static final long serialVersionUID = -716052976;
 
 	/**
 	 * Create a factory with a connection
@@ -21,11 +21,21 @@ public class PersonFactory extends org.jooq.util.sqlserver.SQLServerFactory {
 
 	/**
 	 * Create a factory with a connection and a schema mapping
-	 *
-	 * @param connection The connection to use with objects created from this factory
-	 * @param mapping The schema mapping to use with objects created from this factory
+	 * 
+	 * @deprecated - 2.0.5 - Use {@link #PersonFactory(java.sql.Connection, org.jooq.conf.Settings)} instead
 	 */
+	@Deprecated
 	public PersonFactory(java.sql.Connection connection, org.jooq.SchemaMapping mapping) {
 		super(connection, mapping);
 	}
+
+	/**
+	 * Create a factory with a connection and some settings
+	 *
+	 * @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 PersonFactory(java.sql.Connection connection, org.jooq.conf.Settings settings) {
+		super(connection, settings);
+	}
 }
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/ProductionFactory.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/ProductionFactory.java
index 6af1f06dec..f61ac449b9 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/ProductionFactory.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/ProductionFactory.java
@@ -8,7 +8,7 @@ package org.jooq.examples.sqlserver.adventureworks.production;
  */
 public class ProductionFactory extends org.jooq.util.sqlserver.SQLServerFactory {
 
-	private static final long serialVersionUID = 28546322;
+	private static final long serialVersionUID = -1333018536;
 
 	/**
 	 * Create a factory with a connection
@@ -21,11 +21,21 @@ public class ProductionFactory extends org.jooq.util.sqlserver.SQLServerFactory
 
 	/**
 	 * Create a factory with a connection and a schema mapping
-	 *
-	 * @param connection The connection to use with objects created from this factory
-	 * @param mapping The schema mapping to use with objects created from this factory
+	 * 
+	 * @deprecated - 2.0.5 - Use {@link #ProductionFactory(java.sql.Connection, org.jooq.conf.Settings)} instead
 	 */
+	@Deprecated
 	public ProductionFactory(java.sql.Connection connection, org.jooq.SchemaMapping mapping) {
 		super(connection, mapping);
 	}
+
+	/**
+	 * Create a factory with a connection and some settings
+	 *
+	 * @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 ProductionFactory(java.sql.Connection connection, org.jooq.conf.Settings settings) {
+		super(connection, settings);
+	}
 }
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/purchasing/PurchasingFactory.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/purchasing/PurchasingFactory.java
index 1ea8fbddbd..27fe701e8e 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/purchasing/PurchasingFactory.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/purchasing/PurchasingFactory.java
@@ -8,7 +8,7 @@ package org.jooq.examples.sqlserver.adventureworks.purchasing;
  */
 public class PurchasingFactory extends org.jooq.util.sqlserver.SQLServerFactory {
 
-	private static final long serialVersionUID = -575697966;
+	private static final long serialVersionUID = 536905314;
 
 	/**
 	 * Create a factory with a connection
@@ -21,11 +21,21 @@ public class PurchasingFactory extends org.jooq.util.sqlserver.SQLServerFactory
 
 	/**
 	 * Create a factory with a connection and a schema mapping
-	 *
-	 * @param connection The connection to use with objects created from this factory
-	 * @param mapping The schema mapping to use with objects created from this factory
+	 * 
+	 * @deprecated - 2.0.5 - Use {@link #PurchasingFactory(java.sql.Connection, org.jooq.conf.Settings)} instead
 	 */
+	@Deprecated
 	public PurchasingFactory(java.sql.Connection connection, org.jooq.SchemaMapping mapping) {
 		super(connection, mapping);
 	}
+
+	/**
+	 * Create a factory with a connection and some settings
+	 *
+	 * @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 PurchasingFactory(java.sql.Connection connection, org.jooq.conf.Settings settings) {
+		super(connection, settings);
+	}
 }
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/SalesFactory.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/SalesFactory.java
index ef2d51f945..295c6524bf 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/SalesFactory.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/SalesFactory.java
@@ -8,7 +8,7 @@ package org.jooq.examples.sqlserver.adventureworks.sales;
  */
 public class SalesFactory extends org.jooq.util.sqlserver.SQLServerFactory {
 
-	private static final long serialVersionUID = -1723533790;
+	private static final long serialVersionUID = -126533258;
 
 	/**
 	 * Create a factory with a connection
@@ -21,11 +21,21 @@ public class SalesFactory extends org.jooq.util.sqlserver.SQLServerFactory {
 
 	/**
 	 * Create a factory with a connection and a schema mapping
-	 *
-	 * @param connection The connection to use with objects created from this factory
-	 * @param mapping The schema mapping to use with objects created from this factory
+	 * 
+	 * @deprecated - 2.0.5 - Use {@link #SalesFactory(java.sql.Connection, org.jooq.conf.Settings)} instead
 	 */
+	@Deprecated
 	public SalesFactory(java.sql.Connection connection, org.jooq.SchemaMapping mapping) {
 		super(connection, mapping);
 	}
+
+	/**
+	 * Create a factory with a connection and some settings
+	 *
+	 * @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 SalesFactory(java.sql.Connection connection, org.jooq.conf.Settings settings) {
+		super(connection, settings);
+	}
 }
diff --git a/jOOQ-test/src/org/jooq/test/BaseTest.java b/jOOQ-test/src/org/jooq/test/BaseTest.java
index 17db5cfc60..f78cbaadf2 100644
--- a/jOOQ-test/src/org/jooq/test/BaseTest.java
+++ b/jOOQ-test/src/org/jooq/test/BaseTest.java
@@ -53,7 +53,6 @@ import org.jooq.Record;
 import org.jooq.Result;
 import org.jooq.SQLDialect;
 import org.jooq.Schema;
-import org.jooq.SchemaMapping;
 import org.jooq.Sequence;
 import org.jooq.Table;
 import org.jooq.TableField;
@@ -61,6 +60,7 @@ import org.jooq.TableRecord;
 import org.jooq.UDTRecord;
 import org.jooq.UpdatableRecord;
 import org.jooq.UpdatableTable;
+import org.jooq.conf.Settings;
 import org.jooq.impl.Factory;
 import org.jooq.tools.JooqLogger;
 import org.jooq.tools.unsigned.UByte;
@@ -559,8 +559,8 @@ public abstract class BaseTest<
         return delegate.getCastableDataTypes();
     }
 
-    protected Factory create(SchemaMapping mapping) {
-        return delegate.create(mapping);
+    protected Factory create(Settings settings) {
+        return delegate.create(settings);
     }
 
     protected final Connection getConnection() {
@@ -584,6 +584,7 @@ public abstract class BaseTest<
         return (Sequence<? extends Number>) cSequences().getField("S_AUTHOR_ID").get(cSequences());
     }
 
+    @SuppressWarnings("deprecation")
     protected final Schema schema() {
         return create().getSchemaMapping().map(TAuthor().getSchema());
     }
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/SchemaAndMappingTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/SchemaAndMappingTests.java
index 76baf09000..e50d349ab2 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/SchemaAndMappingTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/SchemaAndMappingTests.java
@@ -50,10 +50,14 @@ import java.util.Arrays;
 import org.jooq.Field;
 import org.jooq.Record;
 import org.jooq.Result;
-import org.jooq.SchemaMapping;
 import org.jooq.Select;
 import org.jooq.TableRecord;
 import org.jooq.UpdatableRecord;
+import org.jooq.conf.MappedSchema;
+import org.jooq.conf.MappedTable;
+import org.jooq.conf.RenderMapping;
+import org.jooq.conf.Rendering;
+import org.jooq.conf.Settings;
 import org.jooq.impl.Factory;
 import org.jooq.test.BaseTest;
 import org.jooq.test.jOOQAbstractTest;
@@ -114,22 +118,27 @@ extends BaseTest<A, B, S, B2S, BS, L, X, D, T, U, I, IPK, T658, T725, T639, T785
 
     @Test
     public void testTableMapping() throws Exception {
-        SchemaMapping mapping = new SchemaMapping();
-        mapping.add(TAuthor(), VAuthor());
-        mapping.add(TBook(), VBook().getName());
+        Settings settings = new Settings()
+            .withRendering(new Rendering()
+            .withRenderMapping(new RenderMapping()
+            .withSchemata(new MappedSchema()
+            .withInput(TAuthor().getSchema().getName())
+            .withTables(
+                new MappedTable(TAuthor().getName(), VAuthor().getName()),
+                new MappedTable(TBook().getName(), VBook().getName())))));
 
         Select<Record> q =
-        create(mapping).select(TBook_TITLE())
+        create(settings).select(TBook_TITLE())
                        .from(TAuthor())
                        .join(TBook())
                        .on(TAuthor_ID().equal(TBook_AUTHOR_ID()))
                        .orderBy(TBook_ID().asc());
 
         // Assure T_* is replaced by V_*
-        assertTrue(create(mapping).render(q).contains(VAuthor().getName()));
-        assertTrue(create(mapping).render(q).contains(VBook().getName()));
-        assertFalse(create(mapping).render(q).contains(TAuthor().getName()));
-        assertFalse(create(mapping).render(q).contains(TBook().getName()));
+        assertTrue(create(settings).render(q).contains(VAuthor().getName()));
+        assertTrue(create(settings).render(q).contains(VBook().getName()));
+        assertFalse(create(settings).render(q).contains(TAuthor().getName()));
+        assertFalse(create(settings).render(q).contains(TBook().getName()));
 
         // Assure that results are correct
         Result<Record> result = q.fetch();
@@ -149,13 +158,18 @@ extends BaseTest<A, B, S, B2S, BS, L, X, D, T, U, I, IPK, T658, T725, T639, T785
 
         // Map to self. This will work even for single-schema RDBMS
         // ---------------------------------------------------------------------
-        SchemaMapping mapping = new SchemaMapping();
-        mapping.add(TAuthor(), TAuthor());
-        mapping.add(TBook(), TBook().getName());
-        mapping.add(TAuthor().getSchema(), TAuthor().getSchema().getName());
+        Settings settings = new Settings()
+            .withRendering(new Rendering()
+            .withRenderMapping(new RenderMapping()
+            .withSchemata(new MappedSchema()
+            .withInput(TAuthor().getSchema().getName())
+            .withOutput(TAuthor().getSchema().getName())
+            .withTables(
+                new MappedTable(TAuthor().getName(), TAuthor().getName()),
+                new MappedTable(TBook().getName(), TBook().getName())))));
 
         Select<Record> query =
-        create(mapping).select(TBook_TITLE())
+        create(settings).select(TBook_TITLE())
                        .from(TAuthor())
                        .join(TBook())
                        .on(TAuthor_ID().equal(TBook_AUTHOR_ID()))
@@ -202,20 +216,24 @@ extends BaseTest<A, B, S, B2S, BS, L, X, D, T, U, I, IPK, T658, T725, T639, T785
 
         // Map to a second schema
         // ---------------------------------------------------------------------
-        mapping = new SchemaMapping();
-        mapping.add(TAuthor().getSchema(), TAuthor().getSchema().getName() + "2");
+        settings = new Settings()
+            .withRendering(new Rendering()
+            .withRenderMapping(new RenderMapping()
+            .withSchemata(new MappedSchema()
+            .withInput(TAuthor().getSchema().getName())
+            .withOutput(TAuthor().getSchema().getName() + "2"))));
 
         Select<Record> q =
-        create(mapping).select(TBook_TITLE())
+        create(settings).select(TBook_TITLE())
                        .from(TAuthor())
                        .join(TBook())
                        .on(TAuthor_ID().equal(TBook_AUTHOR_ID()))
                        .orderBy(TBook_ID().asc());
 
         // Assure that schema is replaced
-        assertTrue(create(mapping).render(q).contains(TAuthor().getSchema().getName() + "2"));
+        assertTrue(create(settings).render(q).contains(TAuthor().getSchema().getName() + "2"));
         assertTrue(q.getSQL().contains(TAuthor().getSchema().getName() + "2"));
-        assertEquals(create(mapping).render(q), q.getSQL());
+        assertEquals(create(settings).render(q), q.getSQL());
 
         // Assure that results are correct
         result = q.fetch();
@@ -230,12 +248,12 @@ extends BaseTest<A, B, S, B2S, BS, L, X, D, T, U, I, IPK, T658, T725, T639, T785
         Field<Integer> f2 = FNumberField(42).cast(Integer.class);
 
         q =
-        create(mapping).select(f1, f2);
+        create(settings).select(f1, f2);
 
         // Assure that schema is replaced
-        assertTrue(create(mapping).render(q).contains(TAuthor().getSchema().getName() + "2"));
+        assertTrue(create(settings).render(q).contains(TAuthor().getSchema().getName() + "2"));
         assertTrue(q.getSQL().contains(TAuthor().getSchema().getName() + "2"));
-        assertEquals(create(mapping).render(q), q.getSQL());
+        assertEquals(create(settings).render(q), q.getSQL());
 
         // Assure that results are correct
         Record record = q.fetchOne();
@@ -244,24 +262,29 @@ extends BaseTest<A, B, S, B2S, BS, L, X, D, T, U, I, IPK, T658, T725, T639, T785
 
         // Map both schema AND tables
         // --------------------------
-        mapping = new SchemaMapping();
-        mapping.add(TAuthor(), VAuthor());
-        mapping.add(TBook(), VBook().getName());
-        mapping.add(TAuthor().getSchema(), TAuthor().getSchema().getName() + "2");
+        settings = new Settings()
+            .withRendering(new Rendering()
+            .withRenderMapping(new RenderMapping()
+            .withSchemata(new MappedSchema()
+            .withInput(TAuthor().getSchema().getName())
+            .withOutput(TAuthor().getSchema().getName() + "2")
+            .withTables(
+                new MappedTable(TAuthor().getName(), VAuthor().getName()),
+                new MappedTable(TBook().getName(), VBook().getName())))));
 
         q =
-        create(mapping).select(TBook_TITLE())
+        create(settings).select(TBook_TITLE())
                        .from(TAuthor())
                        .join(TBook())
                        .on(TAuthor_ID().equal(TBook_AUTHOR_ID()))
                        .orderBy(TBook_ID().asc());
 
         // Assure T_* is replaced by V_*
-        assertTrue(create(mapping).render(q).contains(VAuthor().getName()));
-        assertTrue(create(mapping).render(q).contains(VBook().getName()));
-        assertTrue(create(mapping).render(q).contains("test2"));
-        assertFalse(create(mapping).render(q).contains(TAuthor().getName()));
-        assertFalse(create(mapping).render(q).contains(TBook().getName()));
+        assertTrue(create(settings).render(q).contains(VAuthor().getName()));
+        assertTrue(create(settings).render(q).contains(VBook().getName()));
+        assertTrue(create(settings).render(q).contains("test2"));
+        assertFalse(create(settings).render(q).contains(TAuthor().getName()));
+        assertFalse(create(settings).render(q).contains(TBook().getName()));
 
         // Assure that results are correct
         result = q.fetch();
diff --git a/jOOQ-test/src/org/jooq/test/ase/generatedclasses/DboFactory.java b/jOOQ-test/src/org/jooq/test/ase/generatedclasses/DboFactory.java
index d03ab3f48e..a46a372677 100644
--- a/jOOQ-test/src/org/jooq/test/ase/generatedclasses/DboFactory.java
+++ b/jOOQ-test/src/org/jooq/test/ase/generatedclasses/DboFactory.java
@@ -8,7 +8,7 @@ package org.jooq.test.ase.generatedclasses;
  */
 public class DboFactory extends org.jooq.util.ase.ASEFactory {
 
-	private static final long serialVersionUID = 800307943;
+	private static final long serialVersionUID = -237948133;
 
 	/**
 	 * Create a factory with a connection
@@ -21,11 +21,21 @@ public class DboFactory extends org.jooq.util.ase.ASEFactory {
 
 	/**
 	 * Create a factory with a connection and a schema mapping
-	 *
-	 * @param connection The connection to use with objects created from this factory
-	 * @param mapping The schema mapping to use with objects created from this factory
+	 * 
+	 * @deprecated - 2.0.5 - Use {@link #DboFactory(java.sql.Connection, org.jooq.conf.Settings)} instead
 	 */
+	@Deprecated
 	public DboFactory(java.sql.Connection connection, org.jooq.SchemaMapping mapping) {
 		super(connection, mapping);
 	}
+
+	/**
+	 * Create a factory with a connection and some settings
+	 *
+	 * @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 DboFactory(java.sql.Connection connection, org.jooq.conf.Settings settings) {
+		super(connection, settings);
+	}
 }
diff --git a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/LukasFactory.java b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/LukasFactory.java
index 6bc873cf0a..dfb0a88c3c 100644
--- a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/LukasFactory.java
+++ b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/LukasFactory.java
@@ -8,7 +8,7 @@ package org.jooq.test.db2.generatedclasses;
  */
 public class LukasFactory extends org.jooq.util.db2.DB2Factory {
 
-	private static final long serialVersionUID = 2092164265;
+	private static final long serialVersionUID = -2036387971;
 
 	/**
 	 * Create a factory with a connection
@@ -21,11 +21,21 @@ public class LukasFactory extends org.jooq.util.db2.DB2Factory {
 
 	/**
 	 * Create a factory with a connection and a schema mapping
-	 *
-	 * @param connection The connection to use with objects created from this factory
-	 * @param mapping The schema mapping to use with objects created from this factory
+	 * 
+	 * @deprecated - 2.0.5 - Use {@link #LukasFactory(java.sql.Connection, org.jooq.conf.Settings)} instead
 	 */
+	@Deprecated
 	public LukasFactory(java.sql.Connection connection, org.jooq.SchemaMapping mapping) {
 		super(connection, mapping);
 	}
+
+	/**
+	 * Create a factory with a connection and some settings
+	 *
+	 * @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 LukasFactory(java.sql.Connection connection, org.jooq.conf.Settings settings) {
+		super(connection, settings);
+	}
 }
diff --git a/jOOQ-test/src/org/jooq/test/derby/generatedclasses/TestFactory.java b/jOOQ-test/src/org/jooq/test/derby/generatedclasses/TestFactory.java
index dccfccbd35..3ebb925d5d 100644
--- a/jOOQ-test/src/org/jooq/test/derby/generatedclasses/TestFactory.java
+++ b/jOOQ-test/src/org/jooq/test/derby/generatedclasses/TestFactory.java
@@ -8,7 +8,7 @@ package org.jooq.test.derby.generatedclasses;
  */
 public class TestFactory extends org.jooq.util.derby.DerbyFactory {
 
-	private static final long serialVersionUID = 1574960121;
+	private static final long serialVersionUID = 1130246897;
 
 	/**
 	 * Create a factory with a connection
@@ -21,11 +21,21 @@ public class TestFactory extends org.jooq.util.derby.DerbyFactory {
 
 	/**
 	 * Create a factory with a connection and a schema mapping
-	 *
-	 * @param connection The connection to use with objects created from this factory
-	 * @param mapping The schema mapping to use with objects created from this factory
+	 * 
+	 * @deprecated - 2.0.5 - Use {@link #TestFactory(java.sql.Connection, org.jooq.conf.Settings)} instead
 	 */
+	@Deprecated
 	public TestFactory(java.sql.Connection connection, org.jooq.SchemaMapping mapping) {
 		super(connection, mapping);
 	}
+
+	/**
+	 * Create a factory with a connection and some settings
+	 *
+	 * @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) {
+		super(connection, settings);
+	}
 }
diff --git a/jOOQ-test/src/org/jooq/test/h2/generatedclasses/PublicFactory.java b/jOOQ-test/src/org/jooq/test/h2/generatedclasses/PublicFactory.java
index ca9fab434d..0c2bafbd8a 100644
--- a/jOOQ-test/src/org/jooq/test/h2/generatedclasses/PublicFactory.java
+++ b/jOOQ-test/src/org/jooq/test/h2/generatedclasses/PublicFactory.java
@@ -8,7 +8,7 @@ package org.jooq.test.h2.generatedclasses;
  */
 public class PublicFactory extends org.jooq.util.h2.H2Factory {
 
-	private static final long serialVersionUID = 1624239444;
+	private static final long serialVersionUID = -366537222;
 
 	/**
 	 * Create a factory with a connection
@@ -21,11 +21,21 @@ public class PublicFactory extends org.jooq.util.h2.H2Factory {
 
 	/**
 	 * Create a factory with a connection and a schema mapping
-	 *
-	 * @param connection The connection to use with objects created from this factory
-	 * @param mapping The schema mapping to use with objects created from this factory
+	 * 
+	 * @deprecated - 2.0.5 - Use {@link #PublicFactory(java.sql.Connection, org.jooq.conf.Settings)} instead
 	 */
+	@Deprecated
 	public PublicFactory(java.sql.Connection connection, org.jooq.SchemaMapping mapping) {
 		super(connection, mapping);
 	}
+
+	/**
+	 * Create a factory with a connection and some settings
+	 *
+	 * @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 PublicFactory(java.sql.Connection connection, org.jooq.conf.Settings settings) {
+		super(connection, settings);
+	}
 }
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/PublicFactory.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/PublicFactory.java
index 94f1b9840b..a34ae18a02 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/PublicFactory.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/PublicFactory.java
@@ -10,7 +10,7 @@ package org.jooq.test.hsqldb.generatedclasses;
                             comments = "This class is generated by jOOQ")
 public class PublicFactory extends org.jooq.util.hsqldb.HSQLDBFactory {
 
-	private static final long serialVersionUID = -995670206;
+	private static final long serialVersionUID = -645975704;
 
 	/**
 	 * Create a factory with a connection
@@ -23,11 +23,21 @@ public class PublicFactory extends org.jooq.util.hsqldb.HSQLDBFactory {
 
 	/**
 	 * Create a factory with a connection and a schema mapping
-	 *
-	 * @param connection The connection to use with objects created from this factory
-	 * @param mapping The schema mapping to use with objects created from this factory
+	 * 
+	 * @deprecated - 2.0.5 - Use {@link #PublicFactory(java.sql.Connection, org.jooq.conf.Settings)} instead
 	 */
+	@Deprecated
 	public PublicFactory(java.sql.Connection connection, org.jooq.SchemaMapping mapping) {
 		super(connection, mapping);
 	}
+
+	/**
+	 * Create a factory with a connection and some settings
+	 *
+	 * @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 PublicFactory(java.sql.Connection connection, org.jooq.conf.Settings settings) {
+		super(connection, settings);
+	}
 }
diff --git a/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/TestFactory.java b/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/TestFactory.java
index 2e0f7318f8..fc5d5fa761 100644
--- a/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/TestFactory.java
+++ b/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/TestFactory.java
@@ -8,7 +8,7 @@ package org.jooq.test.ingres.generatedclasses;
  */
 public class TestFactory extends org.jooq.util.ingres.IngresFactory {
 
-	private static final long serialVersionUID = -64223945;
+	private static final long serialVersionUID = 1781756079;
 
 	/**
 	 * Create a factory with a connection
@@ -21,11 +21,21 @@ public class TestFactory extends org.jooq.util.ingres.IngresFactory {
 
 	/**
 	 * Create a factory with a connection and a schema mapping
-	 *
-	 * @param connection The connection to use with objects created from this factory
-	 * @param mapping The schema mapping to use with objects created from this factory
+	 * 
+	 * @deprecated - 2.0.5 - Use {@link #TestFactory(java.sql.Connection, org.jooq.conf.Settings)} instead
 	 */
+	@Deprecated
 	public TestFactory(java.sql.Connection connection, org.jooq.SchemaMapping mapping) {
 		super(connection, mapping);
 	}
+
+	/**
+	 * Create a factory with a connection and some settings
+	 *
+	 * @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) {
+		super(connection, settings);
+	}
 }
diff --git a/jOOQ-test/src/org/jooq/test/jOOQASETest.java b/jOOQ-test/src/org/jooq/test/jOOQASETest.java
index 93086aa18a..87aed84e4b 100644
--- a/jOOQ-test/src/org/jooq/test/jOOQASETest.java
+++ b/jOOQ-test/src/org/jooq/test/jOOQASETest.java
@@ -46,11 +46,11 @@ import org.jooq.DataType;
 import org.jooq.Field;
 import org.jooq.Record;
 import org.jooq.Result;
-import org.jooq.SchemaMapping;
 import org.jooq.Table;
 import org.jooq.TableField;
 import org.jooq.UDTRecord;
 import org.jooq.UpdatableTable;
+import org.jooq.conf.Settings;
 import org.jooq.impl.Factory;
 import org.jooq.test.ase.generatedclasses.DboFactory;
 import org.jooq.test.ase.generatedclasses.tables.TAuthor;
@@ -109,8 +109,8 @@ public class jOOQASETest extends jOOQAbstractTest<
         T_785Record> {
 
     @Override
-    protected Factory create(SchemaMapping mapping) {
-        return new DboFactory(getConnection(), mapping);
+    protected Factory create(Settings settings) {
+        return new DboFactory(getConnection(), settings);
     }
 
     @Override
diff --git a/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java b/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java
index 165d5b73ad..f869ff575f 100644
--- a/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java
+++ b/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java
@@ -62,13 +62,13 @@ import org.jooq.Record;
 import org.jooq.Result;
 import org.jooq.SQLDialect;
 import org.jooq.Schema;
-import org.jooq.SchemaMapping;
 import org.jooq.Table;
 import org.jooq.TableField;
 import org.jooq.TableRecord;
 import org.jooq.UDTRecord;
 import org.jooq.UpdatableRecord;
 import org.jooq.UpdatableTable;
+import org.jooq.conf.Settings;
 import org.jooq.impl.Factory;
 import org.jooq.test._.testcases.AggregateWindowFunctionTests;
 import org.jooq.test._.testcases.CRUDTests;
@@ -591,8 +591,9 @@ public abstract class jOOQAbstractTest<
     protected abstract Class<?> cLibrary();
     protected abstract Class<?> cSequences();
     protected abstract DataType<?>[] getCastableDataTypes();
-    protected abstract Factory create(SchemaMapping mapping);
+    protected abstract Factory create(Settings settings);
 
+    @SuppressWarnings("deprecation")
     protected final Schema schema() {
         return create().getSchemaMapping().map(TAuthor().getSchema());
     }
diff --git a/jOOQ-test/src/org/jooq/test/jOOQDB2Test.java b/jOOQ-test/src/org/jooq/test/jOOQDB2Test.java
index cd3ecc9c06..049c6612f3 100644
--- a/jOOQ-test/src/org/jooq/test/jOOQDB2Test.java
+++ b/jOOQ-test/src/org/jooq/test/jOOQDB2Test.java
@@ -51,11 +51,11 @@ import org.jooq.DataType;
 import org.jooq.Field;
 import org.jooq.Record;
 import org.jooq.Result;
-import org.jooq.SchemaMapping;
 import org.jooq.Table;
 import org.jooq.TableField;
 import org.jooq.UDTRecord;
 import org.jooq.UpdatableTable;
+import org.jooq.conf.Settings;
 import org.jooq.impl.Factory;
 import org.jooq.test.db2.generatedclasses.LukasFactory;
 import org.jooq.test.db2.generatedclasses.Routines;
@@ -116,8 +116,8 @@ public class jOOQDB2Test extends jOOQAbstractTest<
         T_785Record> {
 
     @Override
-    protected Factory create(SchemaMapping mapping) {
-        return new LukasFactory(getConnection(), mapping);
+    protected Factory create(Settings settings) {
+        return new LukasFactory(getConnection(), settings);
     }
 
     @Override
diff --git a/jOOQ-test/src/org/jooq/test/jOOQDerbyTest.java b/jOOQ-test/src/org/jooq/test/jOOQDerbyTest.java
index e7d5c39d48..e485e3d528 100644
--- a/jOOQ-test/src/org/jooq/test/jOOQDerbyTest.java
+++ b/jOOQ-test/src/org/jooq/test/jOOQDerbyTest.java
@@ -51,11 +51,11 @@ import org.jooq.DataType;
 import org.jooq.Field;
 import org.jooq.Record;
 import org.jooq.Result;
-import org.jooq.SchemaMapping;
 import org.jooq.Table;
 import org.jooq.TableField;
 import org.jooq.UDTRecord;
 import org.jooq.UpdatableTable;
+import org.jooq.conf.Settings;
 import org.jooq.impl.Factory;
 import org.jooq.test.derby.generatedclasses.Sequences;
 import org.jooq.test.derby.generatedclasses.TestFactory;
@@ -112,8 +112,8 @@ public class jOOQDerbyTest extends jOOQAbstractTest<
         T_785Record> {
 
 	@Override
-    protected Factory create(SchemaMapping mapping) {
-        return new TestFactory(getConnection(), mapping);
+    protected Factory create(Settings settings) {
+        return new TestFactory(getConnection(), settings);
     }
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/jOOQH2Test.java b/jOOQ-test/src/org/jooq/test/jOOQH2Test.java
index 6846354b09..9fd06ab045 100644
--- a/jOOQ-test/src/org/jooq/test/jOOQH2Test.java
+++ b/jOOQ-test/src/org/jooq/test/jOOQH2Test.java
@@ -51,11 +51,11 @@ import org.jooq.DataType;
 import org.jooq.Field;
 import org.jooq.Record;
 import org.jooq.Result;
-import org.jooq.SchemaMapping;
 import org.jooq.Table;
 import org.jooq.TableField;
 import org.jooq.UDTRecord;
 import org.jooq.UpdatableTable;
+import org.jooq.conf.Settings;
 import org.jooq.impl.Factory;
 import org.jooq.test.h2.generatedclasses.PublicFactory;
 import org.jooq.test.h2.generatedclasses.Routines;
@@ -117,8 +117,8 @@ public class jOOQH2Test extends jOOQAbstractTest<
         T_785Record> {
 
     @Override
-    protected Factory create(SchemaMapping mapping) {
-        return new PublicFactory(getConnection(), mapping);
+    protected Factory create(Settings settings) {
+        return new PublicFactory(getConnection(), settings);
     }
 
     @Override
diff --git a/jOOQ-test/src/org/jooq/test/jOOQHSQLDBTest.java b/jOOQ-test/src/org/jooq/test/jOOQHSQLDBTest.java
index 6cc485f384..ef433270de 100644
--- a/jOOQ-test/src/org/jooq/test/jOOQHSQLDBTest.java
+++ b/jOOQ-test/src/org/jooq/test/jOOQHSQLDBTest.java
@@ -61,11 +61,11 @@ import org.jooq.DataType;
 import org.jooq.Field;
 import org.jooq.Record;
 import org.jooq.Result;
-import org.jooq.SchemaMapping;
 import org.jooq.Table;
 import org.jooq.TableField;
 import org.jooq.UDTRecord;
 import org.jooq.UpdatableTable;
+import org.jooq.conf.Settings;
 import org.jooq.impl.Factory;
 import org.jooq.test.hsqldb.generatedclasses.PublicFactory;
 import org.jooq.test.hsqldb.generatedclasses.Routines;
@@ -112,8 +112,8 @@ public class jOOQHSQLDBTest extends jOOQAbstractTest<
         T_785Record> {
 
 	@Override
-    protected Factory create(SchemaMapping mapping) {
-        return new PublicFactory(getConnection(), mapping);
+    protected Factory create(Settings settings) {
+        return new PublicFactory(getConnection(), settings);
     }
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/jOOQHSQLDBTest2.java b/jOOQ-test/src/org/jooq/test/jOOQHSQLDBTest2.java
index eb0d39b750..d28b23d162 100644
--- a/jOOQ-test/src/org/jooq/test/jOOQHSQLDBTest2.java
+++ b/jOOQ-test/src/org/jooq/test/jOOQHSQLDBTest2.java
@@ -59,11 +59,14 @@ import org.jooq.DataType;
 import org.jooq.Field;
 import org.jooq.Record;
 import org.jooq.Result;
-import org.jooq.SchemaMapping;
 import org.jooq.Table;
 import org.jooq.TableField;
 import org.jooq.UDTRecord;
 import org.jooq.UpdatableTable;
+import org.jooq.conf.MappedSchema;
+import org.jooq.conf.RenderMapping;
+import org.jooq.conf.Rendering;
+import org.jooq.conf.Settings;
 import org.jooq.impl.Factory;
 import org.jooq.test.hsqldb.generatedclasses.Public;
 import org.jooq.test.hsqldb.generatedclasses.PublicFactory;
@@ -109,10 +112,14 @@ public class jOOQHSQLDBTest2 extends jOOQAbstractTest<
         T_785Record> {
 
 	@Override
-    protected Factory create(SchemaMapping mapping) {
-	    mapping = (mapping != null) ? mapping : new SchemaMapping();
-	    mapping.add(TAuthor().getSchema(), Public.PUBLIC);
-        return new PublicFactory(getConnection(), mapping);
+    protected Factory create(Settings settings) {
+	    settings = (settings != null) ? settings : new Settings();
+	    settings.withRendering(new Rendering()
+	            .withRenderMapping(new RenderMapping()
+	            .withSchemata(new MappedSchema()
+	            .withInput(TAuthor().getSchema().getName())
+	            .withOutput(Public.PUBLIC.getName()))));
+        return new PublicFactory(getConnection(), settings);
     }
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/jOOQIngresTest.java b/jOOQ-test/src/org/jooq/test/jOOQIngresTest.java
index 2a864551e3..2caf5d7a0c 100644
--- a/jOOQ-test/src/org/jooq/test/jOOQIngresTest.java
+++ b/jOOQ-test/src/org/jooq/test/jOOQIngresTest.java
@@ -51,11 +51,11 @@ import org.jooq.DataType;
 import org.jooq.Field;
 import org.jooq.Record;
 import org.jooq.Result;
-import org.jooq.SchemaMapping;
 import org.jooq.Table;
 import org.jooq.TableField;
 import org.jooq.UDTRecord;
 import org.jooq.UpdatableTable;
+import org.jooq.conf.Settings;
 import org.jooq.impl.Factory;
 import org.jooq.test.ingres.generatedclasses.Sequences;
 import org.jooq.test.ingres.generatedclasses.TestFactory;
@@ -113,8 +113,8 @@ public class jOOQIngresTest extends jOOQAbstractTest<
         T_785Record> {
 
     @Override
-    protected Factory create(SchemaMapping mapping) {
-        return new TestFactory(getConnection(), mapping);
+    protected Factory create(Settings settings) {
+        return new TestFactory(getConnection(), settings);
     }
 
     @Override
diff --git a/jOOQ-test/src/org/jooq/test/jOOQMySQLTest.java b/jOOQ-test/src/org/jooq/test/jOOQMySQLTest.java
index 1edcf04284..8f2f5451bd 100644
--- a/jOOQ-test/src/org/jooq/test/jOOQMySQLTest.java
+++ b/jOOQ-test/src/org/jooq/test/jOOQMySQLTest.java
@@ -68,11 +68,11 @@ import org.jooq.DataType;
 import org.jooq.Field;
 import org.jooq.Record;
 import org.jooq.Result;
-import org.jooq.SchemaMapping;
 import org.jooq.Table;
 import org.jooq.TableField;
 import org.jooq.UDTRecord;
 import org.jooq.UpdatableTable;
+import org.jooq.conf.Settings;
 import org.jooq.test.mysql.generatedclasses.Routines;
 import org.jooq.test.mysql.generatedclasses.TestFactory;
 import org.jooq.test.mysql.generatedclasses.enums.T_959JavaKeywords;
@@ -134,8 +134,8 @@ public class jOOQMySQLTest extends jOOQAbstractTest<
         T_785Record> {
 
     @Override
-    protected TestFactory create(SchemaMapping mapping) {
-        return new TestFactory(getConnection(), mapping);
+    protected TestFactory create(Settings settings) {
+        return new TestFactory(getConnection(), settings);
     }
 
     @Override
diff --git a/jOOQ-test/src/org/jooq/test/jOOQMySQLTestSchemaMapping.java b/jOOQ-test/src/org/jooq/test/jOOQMySQLTestSchemaMapping.java
index afc1f7e6b7..a69e5ee2bf 100644
--- a/jOOQ-test/src/org/jooq/test/jOOQMySQLTestSchemaMapping.java
+++ b/jOOQ-test/src/org/jooq/test/jOOQMySQLTestSchemaMapping.java
@@ -36,7 +36,10 @@
 
 package org.jooq.test;
 
-import org.jooq.SchemaMapping;
+import org.jooq.conf.MappedSchema;
+import org.jooq.conf.RenderMapping;
+import org.jooq.conf.Rendering;
+import org.jooq.conf.Settings;
 import org.jooq.test.mysql.generatedclasses.TestFactory;
 
 
@@ -58,9 +61,13 @@ public class jOOQMySQLTestSchemaMapping extends jOOQMySQLTest {
     }
 
     @Override
-    protected TestFactory create(SchemaMapping mapping) {
-        mapping = (mapping != null) ? mapping : new SchemaMapping();
-        mapping.add(TAuthor().getSchema(), TAuthor().getSchema().getName() + getSchemaSuffix());
-        return new TestFactory(getConnection(), mapping);
+    protected TestFactory create(Settings settings) {
+        settings = (settings != null) ? settings : new Settings();
+        settings.withRendering(new Rendering()
+                .withRenderMapping(new RenderMapping()
+                .withSchemata(new MappedSchema()
+                .withInput(TAuthor().getSchema().getName())
+                .withOutput(TAuthor().getSchema().getName() + getSchemaSuffix()))));
+        return new TestFactory(getConnection(), settings);
     }
 }
\ No newline at end of file
diff --git a/jOOQ-test/src/org/jooq/test/jOOQMySQLTestSchemaRewrite.java b/jOOQ-test/src/org/jooq/test/jOOQMySQLTestSchemaRewrite.java
index 3f721166ea..3bb4428aac 100644
--- a/jOOQ-test/src/org/jooq/test/jOOQMySQLTestSchemaRewrite.java
+++ b/jOOQ-test/src/org/jooq/test/jOOQMySQLTestSchemaRewrite.java
@@ -60,11 +60,11 @@ import org.jooq.DataType;
 import org.jooq.Field;
 import org.jooq.Record;
 import org.jooq.Result;
-import org.jooq.SchemaMapping;
 import org.jooq.Table;
 import org.jooq.TableField;
 import org.jooq.UDTRecord;
 import org.jooq.UpdatableTable;
+import org.jooq.conf.Settings;
 import org.jooq.test.mysql2.generatedclasses.Routines;
 import org.jooq.test.mysql2.generatedclasses.Test2Factory;
 import org.jooq.test.mysql2.generatedclasses.tables.records.TAuthorRecord;
@@ -114,8 +114,8 @@ public class jOOQMySQLTestSchemaRewrite extends jOOQAbstractTest<
     }
 
     @Override
-    protected Test2Factory create(SchemaMapping mapping) {
-        return new Test2Factory(getConnection(), mapping);
+    protected Test2Factory create(Settings settings) {
+        return new Test2Factory(getConnection(), settings);
     }
 
     @Override
diff --git a/jOOQ-test/src/org/jooq/test/jOOQOracleTest.java b/jOOQ-test/src/org/jooq/test/jOOQOracleTest.java
index 8cc99c538c..330891e194 100644
--- a/jOOQ-test/src/org/jooq/test/jOOQOracleTest.java
+++ b/jOOQ-test/src/org/jooq/test/jOOQOracleTest.java
@@ -95,11 +95,11 @@ import org.jooq.DataType;
 import org.jooq.Field;
 import org.jooq.Record;
 import org.jooq.Result;
-import org.jooq.SchemaMapping;
 import org.jooq.Table;
 import org.jooq.TableField;
 import org.jooq.UDTRecord;
 import org.jooq.UpdatableTable;
+import org.jooq.conf.Settings;
 import org.jooq.test.oracle.generatedclasses.multi_schema.tables.records.TBookSaleRecord;
 import org.jooq.test.oracle.generatedclasses.test.Routines;
 import org.jooq.test.oracle.generatedclasses.test.Sequences;
@@ -198,8 +198,8 @@ public class jOOQOracleTest extends jOOQAbstractTest<
     }
 
     @Override
-    protected TestFactory create(SchemaMapping mapping) {
-        return new TestFactory(getConnection(), mapping);
+    protected TestFactory create(Settings settings) {
+        return new TestFactory(getConnection(), settings);
     }
 
     @Override
@@ -744,7 +744,7 @@ public class jOOQOracleTest extends jOOQAbstractTest<
     // -------------------------------------------------------------------------
 
     private OracleFactory ora() {
-        return new OracleFactory(create().getConnection(), create().getSchemaMapping());
+        return new OracleFactory(create().getConnection(), create().getSettings());
     }
 
     @Test
diff --git a/jOOQ-test/src/org/jooq/test/jOOQPostgresTest.java b/jOOQ-test/src/org/jooq/test/jOOQPostgresTest.java
index 6050551a05..75a0ab641e 100644
--- a/jOOQ-test/src/org/jooq/test/jOOQPostgresTest.java
+++ b/jOOQ-test/src/org/jooq/test/jOOQPostgresTest.java
@@ -64,11 +64,11 @@ import org.jooq.DataType;
 import org.jooq.Field;
 import org.jooq.Record;
 import org.jooq.Result;
-import org.jooq.SchemaMapping;
 import org.jooq.Table;
 import org.jooq.TableField;
 import org.jooq.UDTRecord;
 import org.jooq.UpdatableTable;
+import org.jooq.conf.Settings;
 import org.jooq.impl.Factory;
 import org.jooq.test.postgres.generatedclasses.PublicFactory;
 import org.jooq.test.postgres.generatedclasses.Routines;
@@ -121,8 +121,8 @@ public class jOOQPostgresTest extends jOOQAbstractTest<
         T_785Record> {
 
     @Override
-    protected Factory create(SchemaMapping mapping) {
-        return new PublicFactory(getConnection(), mapping);
+    protected Factory create(Settings settings) {
+        return new PublicFactory(getConnection(), settings);
     }
 
     @Override
diff --git a/jOOQ-test/src/org/jooq/test/jOOQSQLServerTest.java b/jOOQ-test/src/org/jooq/test/jOOQSQLServerTest.java
index e3af17a294..ab4474d220 100644
--- a/jOOQ-test/src/org/jooq/test/jOOQSQLServerTest.java
+++ b/jOOQ-test/src/org/jooq/test/jOOQSQLServerTest.java
@@ -59,11 +59,11 @@ import org.jooq.DataType;
 import org.jooq.Field;
 import org.jooq.Record;
 import org.jooq.Result;
-import org.jooq.SchemaMapping;
 import org.jooq.Table;
 import org.jooq.TableField;
 import org.jooq.UDTRecord;
 import org.jooq.UpdatableTable;
+import org.jooq.conf.Settings;
 import org.jooq.impl.Factory;
 import org.jooq.test.sqlserver.generatedclasses.DboFactory;
 import org.jooq.test.sqlserver.generatedclasses.Routines;
@@ -109,8 +109,8 @@ public class jOOQSQLServerTest extends jOOQAbstractTest<
         T_785Record> {
 
     @Override
-    protected Factory create(SchemaMapping mapping) {
-        return new DboFactory(getConnection(), mapping);
+    protected Factory create(Settings settings) {
+        return new DboFactory(getConnection(), settings);
     }
 
     @Override
diff --git a/jOOQ-test/src/org/jooq/test/jOOQSQLiteTest.java b/jOOQ-test/src/org/jooq/test/jOOQSQLiteTest.java
index 999b003758..b523c259b3 100644
--- a/jOOQ-test/src/org/jooq/test/jOOQSQLiteTest.java
+++ b/jOOQ-test/src/org/jooq/test/jOOQSQLiteTest.java
@@ -49,11 +49,11 @@ import org.jooq.DataType;
 import org.jooq.Field;
 import org.jooq.Record;
 import org.jooq.Result;
-import org.jooq.SchemaMapping;
 import org.jooq.Table;
 import org.jooq.TableField;
 import org.jooq.UDTRecord;
 import org.jooq.UpdatableTable;
+import org.jooq.conf.Settings;
 import org.jooq.impl.Factory;
 import org.jooq.test.sqlite.generatedclasses.tables.TAuthor;
 import org.jooq.test.sqlite.generatedclasses.tables.TBook;
@@ -107,8 +107,8 @@ public class jOOQSQLiteTest extends jOOQAbstractTest<
         T_785Record> {
 
     @Override
-    protected Factory create(SchemaMapping mapping) {
-        return new SQLiteFactory(getConnection(), mapping);
+    protected Factory create(Settings settings) {
+        return new SQLiteFactory(getConnection(), settings);
     }
 
     @Override
diff --git a/jOOQ-test/src/org/jooq/test/jOOQSybaseTest.java b/jOOQ-test/src/org/jooq/test/jOOQSybaseTest.java
index 64328d1f32..a1fb89d462 100644
--- a/jOOQ-test/src/org/jooq/test/jOOQSybaseTest.java
+++ b/jOOQ-test/src/org/jooq/test/jOOQSybaseTest.java
@@ -55,11 +55,11 @@ import org.jooq.DataType;
 import org.jooq.Field;
 import org.jooq.Record;
 import org.jooq.Result;
-import org.jooq.SchemaMapping;
 import org.jooq.Table;
 import org.jooq.TableField;
 import org.jooq.UDTRecord;
 import org.jooq.UpdatableTable;
+import org.jooq.conf.Settings;
 import org.jooq.impl.Factory;
 import org.jooq.test.sybase.generatedclasses.DbaFactory;
 import org.jooq.test.sybase.generatedclasses.Routines;
@@ -108,8 +108,8 @@ public class jOOQSybaseTest extends jOOQAbstractTest<
         T_785Record> {
 
     @Override
-    protected Factory create(SchemaMapping mapping) {
-        return new DbaFactory(getConnection(), mapping);
+    protected Factory create(Settings settings) {
+        return new DbaFactory(getConnection(), settings);
     }
 
 
diff --git a/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/TestFactory.java b/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/TestFactory.java
index 613b317834..8f9eb41bf1 100644
--- a/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/TestFactory.java
+++ b/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/TestFactory.java
@@ -8,7 +8,7 @@ package org.jooq.test.mysql.generatedclasses;
  */
 public class TestFactory extends org.jooq.util.mysql.MySQLFactory {
 
-	private static final long serialVersionUID = -663516053;
+	private static final long serialVersionUID = -151076125;
 
 	/**
 	 * Create a factory with a connection
@@ -21,11 +21,21 @@ public class TestFactory extends org.jooq.util.mysql.MySQLFactory {
 
 	/**
 	 * Create a factory with a connection and a schema mapping
-	 *
-	 * @param connection The connection to use with objects created from this factory
-	 * @param mapping The schema mapping to use with objects created from this factory
+	 * 
+	 * @deprecated - 2.0.5 - Use {@link #TestFactory(java.sql.Connection, org.jooq.conf.Settings)} instead
 	 */
+	@Deprecated
 	public TestFactory(java.sql.Connection connection, org.jooq.SchemaMapping mapping) {
 		super(connection, mapping);
 	}
+
+	/**
+	 * Create a factory with a connection and some settings
+	 *
+	 * @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) {
+		super(connection, settings);
+	}
 }
diff --git a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/Test2Factory.java b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/Test2Factory.java
index 0b87a2390f..90d0dc936c 100644
--- a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/Test2Factory.java
+++ b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/Test2Factory.java
@@ -8,7 +8,7 @@ package org.jooq.test.mysql2.generatedclasses;
  */
 public class Test2Factory extends org.jooq.util.mysql.MySQLFactory {
 
-	private static final long serialVersionUID = -1388530443;
+	private static final long serialVersionUID = -1427816631;
 
 	/**
 	 * Create a factory with a connection
@@ -21,11 +21,21 @@ public class Test2Factory extends org.jooq.util.mysql.MySQLFactory {
 
 	/**
 	 * Create a factory with a connection and a schema mapping
-	 *
-	 * @param connection The connection to use with objects created from this factory
-	 * @param mapping The schema mapping to use with objects created from this factory
+	 * 
+	 * @deprecated - 2.0.5 - Use {@link #Test2Factory(java.sql.Connection, org.jooq.conf.Settings)} instead
 	 */
+	@Deprecated
 	public Test2Factory(java.sql.Connection connection, org.jooq.SchemaMapping mapping) {
 		super(connection, mapping);
 	}
+
+	/**
+	 * Create a factory with a connection and some settings
+	 *
+	 * @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 Test2Factory(java.sql.Connection connection, org.jooq.conf.Settings settings) {
+		super(connection, settings);
+	}
 }
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/multi_schema/MultiSchemaFactory.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/multi_schema/MultiSchemaFactory.java
index c7d2edd37a..e05a8c75f2 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/multi_schema/MultiSchemaFactory.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/multi_schema/MultiSchemaFactory.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle.generatedclasses.multi_schema;
  */
 public class MultiSchemaFactory extends org.jooq.util.oracle.OracleFactory {
 
-	private static final long serialVersionUID = -558110626;
+	private static final long serialVersionUID = -1286222734;
 
 	/**
 	 * Create a factory with a connection
@@ -21,11 +21,21 @@ public class MultiSchemaFactory extends org.jooq.util.oracle.OracleFactory {
 
 	/**
 	 * Create a factory with a connection and a schema mapping
-	 *
-	 * @param connection The connection to use with objects created from this factory
-	 * @param mapping The schema mapping to use with objects created from this factory
+	 * 
+	 * @deprecated - 2.0.5 - Use {@link #MultiSchemaFactory(java.sql.Connection, org.jooq.conf.Settings)} instead
 	 */
+	@Deprecated
 	public MultiSchemaFactory(java.sql.Connection connection, org.jooq.SchemaMapping mapping) {
 		super(connection, mapping);
 	}
+
+	/**
+	 * Create a factory with a connection and some settings
+	 *
+	 * @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 MultiSchemaFactory(java.sql.Connection connection, org.jooq.conf.Settings settings) {
+		super(connection, settings);
+	}
 }
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/TestFactory.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/TestFactory.java
index 790ac83efd..4ee9ef6f49 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/TestFactory.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/TestFactory.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle.generatedclasses.test;
  */
 public class TestFactory extends org.jooq.util.oracle.OracleFactory {
 
-	private static final long serialVersionUID = 831106025;
+	private static final long serialVersionUID = -1137965343;
 
 	/**
 	 * Create a factory with a connection
@@ -21,11 +21,21 @@ public class TestFactory extends org.jooq.util.oracle.OracleFactory {
 
 	/**
 	 * Create a factory with a connection and a schema mapping
-	 *
-	 * @param connection The connection to use with objects created from this factory
-	 * @param mapping The schema mapping to use with objects created from this factory
+	 * 
+	 * @deprecated - 2.0.5 - Use {@link #TestFactory(java.sql.Connection, org.jooq.conf.Settings)} instead
 	 */
+	@Deprecated
 	public TestFactory(java.sql.Connection connection, org.jooq.SchemaMapping mapping) {
 		super(connection, mapping);
 	}
+
+	/**
+	 * Create a factory with a connection and some settings
+	 *
+	 * @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) {
+		super(connection, settings);
+	}
 }
diff --git a/jOOQ-test/src/org/jooq/test/oracle2/generatedclasses/TestFactory.java b/jOOQ-test/src/org/jooq/test/oracle2/generatedclasses/TestFactory.java
index 8ef83672bc..068fc6b8cc 100644
--- a/jOOQ-test/src/org/jooq/test/oracle2/generatedclasses/TestFactory.java
+++ b/jOOQ-test/src/org/jooq/test/oracle2/generatedclasses/TestFactory.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle2.generatedclasses;
  */
 public class TestFactory extends org.jooq.util.oracle.OracleFactory {
 
-	private static final long serialVersionUID = 684096481;
+	private static final long serialVersionUID = -737351463;
 
 	/**
 	 * Create a factory with a connection
@@ -21,11 +21,21 @@ public class TestFactory extends org.jooq.util.oracle.OracleFactory {
 
 	/**
 	 * Create a factory with a connection and a schema mapping
-	 *
-	 * @param connection The connection to use with objects created from this factory
-	 * @param mapping The schema mapping to use with objects created from this factory
+	 * 
+	 * @deprecated - 2.0.5 - Use {@link #TestFactory(java.sql.Connection, org.jooq.conf.Settings)} instead
 	 */
+	@Deprecated
 	public TestFactory(java.sql.Connection connection, org.jooq.SchemaMapping mapping) {
 		super(connection, mapping);
 	}
+
+	/**
+	 * Create a factory with a connection and some settings
+	 *
+	 * @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) {
+		super(connection, settings);
+	}
 }
diff --git a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/PublicFactory.java b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/PublicFactory.java
index 72ca6359e7..f5a9bac6aa 100644
--- a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/PublicFactory.java
+++ b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/PublicFactory.java
@@ -8,7 +8,7 @@ package org.jooq.test.postgres.generatedclasses;
  */
 public class PublicFactory extends org.jooq.util.postgres.PostgresFactory {
 
-	private static final long serialVersionUID = -2001156251;
+	private static final long serialVersionUID = -341766701;
 
 	/**
 	 * Create a factory with a connection
@@ -20,12 +20,12 @@ public class PublicFactory extends org.jooq.util.postgres.PostgresFactory {
 	}
 
 	/**
-	 * Create a factory with a connection and a schema mapping
+	 * Create a factory with a connection and some settings
 	 *
 	 * @param connection The connection to use with objects created from this factory
-	 * @param mapping The schema mapping to use with objects created from this factory
+	 * @param settings The settings to apply to objects created from this factory
 	 */
-	public PublicFactory(java.sql.Connection connection, org.jooq.SchemaMapping mapping) {
-		super(connection, mapping);
+	public PublicFactory(java.sql.Connection connection, org.jooq.conf.Settings settings) {
+		super(connection, settings);
 	}
 }
diff --git a/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/DboFactory.java b/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/DboFactory.java
index 1a9bc03e67..efc18a00bb 100644
--- a/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/DboFactory.java
+++ b/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/DboFactory.java
@@ -8,7 +8,7 @@ package org.jooq.test.sqlserver.generatedclasses;
  */
 public class DboFactory extends org.jooq.util.sqlserver.SQLServerFactory {
 
-	private static final long serialVersionUID = 1798877289;
+	private static final long serialVersionUID = 1650728093;
 
 	/**
 	 * Create a factory with a connection
@@ -21,11 +21,21 @@ public class DboFactory extends org.jooq.util.sqlserver.SQLServerFactory {
 
 	/**
 	 * Create a factory with a connection and a schema mapping
-	 *
-	 * @param connection The connection to use with objects created from this factory
-	 * @param mapping The schema mapping to use with objects created from this factory
+	 * 
+	 * @deprecated - 2.0.5 - Use {@link #DboFactory(java.sql.Connection, org.jooq.conf.Settings)} instead
 	 */
+	@Deprecated
 	public DboFactory(java.sql.Connection connection, org.jooq.SchemaMapping mapping) {
 		super(connection, mapping);
 	}
+
+	/**
+	 * Create a factory with a connection and some settings
+	 *
+	 * @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 DboFactory(java.sql.Connection connection, org.jooq.conf.Settings settings) {
+		super(connection, settings);
+	}
 }
diff --git a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/DbaFactory.java b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/DbaFactory.java
index c579298989..970218aca8 100644
--- a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/DbaFactory.java
+++ b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/DbaFactory.java
@@ -8,7 +8,7 @@ package org.jooq.test.sybase.generatedclasses;
  */
 public class DbaFactory extends org.jooq.util.sybase.SybaseFactory {
 
-	private static final long serialVersionUID = -351655705;
+	private static final long serialVersionUID = 1723504859;
 
 	/**
 	 * Create a factory with a connection
@@ -21,11 +21,21 @@ public class DbaFactory extends org.jooq.util.sybase.SybaseFactory {
 
 	/**
 	 * Create a factory with a connection and a schema mapping
-	 *
-	 * @param connection The connection to use with objects created from this factory
-	 * @param mapping The schema mapping to use with objects created from this factory
+	 * 
+	 * @deprecated - 2.0.5 - Use {@link #DbaFactory(java.sql.Connection, org.jooq.conf.Settings)} instead
 	 */
+	@Deprecated
 	public DbaFactory(java.sql.Connection connection, org.jooq.SchemaMapping mapping) {
 		super(connection, mapping);
 	}
+
+	/**
+	 * Create a factory with a connection and some settings
+	 *
+	 * @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 DbaFactory(java.sql.Connection connection, org.jooq.conf.Settings settings) {
+		super(connection, settings);
+	}
 }
diff --git a/jOOQ/build.xml b/jOOQ/build.xml
new file mode 100644
index 0000000000..362e6f6b09
--- /dev/null
+++ b/jOOQ/build.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<project name="jOOQ-codegen" basedir=".">
+	<property name="dir.resources" value="${basedir}/src/main/resources" />
+	<property name="dir.java" value="${basedir}/src/main/java" />
+	<property name="dir.target" value="${dir.java}/org/jooq/conf" />
+
+	<taskdef name="xjc" classname="com.sun.tools.xjc.XJCTask">
+		<classpath>
+			<fileset dir="${basedir}/lib" includes="*.jar" />
+			<fileset dir="${java.home}/lib" includes="rt.jar" />
+		</classpath>
+	</taskdef>
+
+	<!-- Run a full mvn clean package install deploy first before this -->
+	<target name="xjc-generator" description="Generate JAXB artefacts from XSD">
+		<mkdir dir="${dir.target}" />
+		<xjc schema="${dir.resources}/xsd/jooq-runtime-2.0.5.xsd" destdir="${dir.java}" package="org.jooq.conf">
+			<arg value="-extension"/>
+			<arg value="-Xxew" />
+			<arg value="-Xfluent-api" />
+			<arg value="-Xdefault-value"/>
+			<arg value="-Xvalue-constructor" />
+		    <arg value="-instantiate lazy" />
+		</xjc>
+	</target>
+</project>
\ No newline at end of file
diff --git a/jOOQ/lib/activation.jar b/jOOQ/lib/activation.jar
new file mode 100644
index 0000000000..8cbef16f48
Binary files /dev/null and b/jOOQ/lib/activation.jar differ
diff --git a/jOOQ/lib/jaxb-api.jar b/jOOQ/lib/jaxb-api.jar
new file mode 100644
index 0000000000..3918383710
Binary files /dev/null and b/jOOQ/lib/jaxb-api.jar differ
diff --git a/jOOQ/lib/jaxb-impl.jar b/jOOQ/lib/jaxb-impl.jar
new file mode 100644
index 0000000000..7ff2dac935
Binary files /dev/null and b/jOOQ/lib/jaxb-impl.jar differ
diff --git a/jOOQ/lib/jaxb-xjc.jar b/jOOQ/lib/jaxb-xjc.jar
new file mode 100644
index 0000000000..e586232048
Binary files /dev/null and b/jOOQ/lib/jaxb-xjc.jar differ
diff --git a/jOOQ/lib/jaxb1-impl.jar b/jOOQ/lib/jaxb1-impl.jar
new file mode 100644
index 0000000000..f6c8349da4
Binary files /dev/null and b/jOOQ/lib/jaxb1-impl.jar differ
diff --git a/jOOQ/lib/jaxb2-default-value-1.1.jar b/jOOQ/lib/jaxb2-default-value-1.1.jar
new file mode 100644
index 0000000000..884897de55
Binary files /dev/null and b/jOOQ/lib/jaxb2-default-value-1.1.jar differ
diff --git a/jOOQ/lib/jaxb2-fluent-api-3.0.jar b/jOOQ/lib/jaxb2-fluent-api-3.0.jar
new file mode 100644
index 0000000000..f3c384f497
Binary files /dev/null and b/jOOQ/lib/jaxb2-fluent-api-3.0.jar differ
diff --git a/jOOQ/lib/jaxb2-value-constructor-3.0.jar b/jOOQ/lib/jaxb2-value-constructor-3.0.jar
new file mode 100644
index 0000000000..1d53dc1565
Binary files /dev/null and b/jOOQ/lib/jaxb2-value-constructor-3.0.jar differ
diff --git a/jOOQ/lib/jsr173_1.0_api.jar b/jOOQ/lib/jsr173_1.0_api.jar
new file mode 100644
index 0000000000..87ff1c1abb
Binary files /dev/null and b/jOOQ/lib/jsr173_1.0_api.jar differ
diff --git a/jOOQ/lib/xew.jar b/jOOQ/lib/xew.jar
new file mode 100644
index 0000000000..a7e6051e97
Binary files /dev/null and b/jOOQ/lib/xew.jar differ
diff --git a/jOOQ/src/main/java/org/jooq/Configuration.java b/jOOQ/src/main/java/org/jooq/Configuration.java
index 155d1800b2..b6ac241514 100644
--- a/jOOQ/src/main/java/org/jooq/Configuration.java
+++ b/jOOQ/src/main/java/org/jooq/Configuration.java
@@ -38,6 +38,8 @@ package org.jooq;
 import java.io.Serializable;
 import java.sql.Connection;
 
+import org.jooq.conf.Settings;
+
 
 /**
  * The Configuration holds data about sql dialects and connections
@@ -58,7 +60,15 @@ public interface Configuration extends Serializable {
 
     /**
      * Retrieve the configured schema mapping
+     *
+     * @deprecated - 2.0.5 - Use {@link #getSettings()} instead
      */
+    @Deprecated
     SchemaMapping getSchemaMapping();
 
+    /**
+     * Retrieve the runtime configuration settings
+     */
+    Settings getSettings();
+
 }
diff --git a/jOOQ/src/main/java/org/jooq/Constants.java b/jOOQ/src/main/java/org/jooq/Constants.java
index aadc6d2c65..21f8e254f1 100644
--- a/jOOQ/src/main/java/org/jooq/Constants.java
+++ b/jOOQ/src/main/java/org/jooq/Constants.java
@@ -45,7 +45,7 @@ public final class Constants {
     /**
      * The latest jOOQ version
      */
-    public static final String VERSION = "2.0.4";
+    public static final String VERSION = "2.0.5";
 
     /**
      * No further instances
diff --git a/jOOQ/src/main/java/org/jooq/SchemaMapping.java b/jOOQ/src/main/java/org/jooq/SchemaMapping.java
index a4609ef3f5..c8df90c3c6 100644
--- a/jOOQ/src/main/java/org/jooq/SchemaMapping.java
+++ b/jOOQ/src/main/java/org/jooq/SchemaMapping.java
@@ -40,8 +40,15 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
 
+import org.jooq.conf.MappedSchema;
+import org.jooq.conf.MappedTable;
+import org.jooq.conf.RenderMapping;
+import org.jooq.conf.Rendering;
+import org.jooq.conf.Settings;
 import org.jooq.impl.SchemaImpl;
 import org.jooq.impl.TableImpl;
+import org.jooq.tools.JooqLogger;
+import org.jooq.tools.StringUtils;
 
 /**
  * General mapping of generated artefacts onto run-time substitutes.
@@ -68,28 +75,32 @@ import org.jooq.impl.TableImpl;
  * @see <a
  *      href="https://sourceforge.net/apps/trac/jooq/wiki/Manual/ADVANCED/SchemaMapping">https://sourceforge.net/apps/trac/jooq/wiki/Manual/ADVANCED/SchemaMapping</a>
  * @since 1.5.2, 1.6.0
+ * @deprecated - 2.0.5 - Use runtime configuration {@link Settings} instead
  */
+@Deprecated
 public class SchemaMapping implements Serializable {
 
     /**
      * Generated UID
      */
-    private static final long           serialVersionUID = 8269660159338710470L;
+    private static final long           serialVersionUID  = 8269660159338710470L;
+    private static final JooqLogger     log               = JooqLogger.getLogger(SchemaMapping.class);
+    private static boolean              loggedDeprecation = false;
 
     /**
      * The default, unmodifiable mapping that just takes generated schemata
      */
-    public static final SchemaMapping   NO_MAPPING       = new SchemaMapping();
+    public static final SchemaMapping   NO_MAPPING        = new SchemaMapping(false);
 
     /**
      * The underlying mapping for schemata
      */
-    private final Map<String, Schema>   schemata         = new HashMap<String, Schema>();
+    private final Map<String, Schema>   schemata          = new HashMap<String, Schema>();
 
     /**
      * The underlying mapping for tables
      */
-    private final Map<String, Table<?>> tables           = new HashMap<String, Table<?>>();
+    private final Map<String, Table<?>> tables            = new HashMap<String, Table<?>>();
 
     /**
      * The default schema
@@ -99,7 +110,18 @@ public class SchemaMapping implements Serializable {
     /**
      * Construct an empty mapping
      */
-    public SchemaMapping() {}
+    public SchemaMapping() {
+        this(true);
+    }
+
+    private SchemaMapping(boolean logDeprecation) {
+        if (logDeprecation && !loggedDeprecation) {
+
+            // Log only once
+            loggedDeprecation = true;
+            log.warn("DEPRECATION", "org.jooq.SchemaMapping is deprecated as of jOOQ 2.0.5. Consider using jOOQ's runtime configuration org.jooq.conf.Settings instead");
+        }
+    }
 
     /**
      * Set a schema as the default schema. This results in the supplied schema
@@ -130,23 +152,41 @@ public class SchemaMapping implements Serializable {
     /**
      * Add schemata to this mapping
      *
-     * @param generatedSchema The schema known at codegen time to be mapped
-     * @param configuredSchema The schema configured at run time to be mapped
+     * @param inputSchema The schema known at codegen time to be mapped
+     * @param outputSchema The schema configured at run time to be mapped
      */
-    public void add(Schema generatedSchema, Schema configuredSchema) {
-        schemata.put(generatedSchema.getName(), configuredSchema);
+    public void add(String inputSchema, String outputSchema) {
+        add(inputSchema, new SchemaImpl(outputSchema));
     }
 
     /**
      * Add schemata to this mapping
      *
-     * @param generatedSchema The schema known at codegen time to be mapped
-     * @param configuredSchemaName The schema configured at run time to be
-     *            mapped
+     * @param inputSchema The schema known at codegen time to be mapped
+     * @param outputSchema The schema configured at run time to be mapped
      */
-    public void add(Schema generatedSchema, String configuredSchemaName) {
-        Schema configuredSchema = new SchemaImpl(configuredSchemaName);
-        add(generatedSchema, configuredSchema);
+    public void add(String inputSchema, Schema outputSchema) {
+        schemata.put(inputSchema, outputSchema);
+    }
+
+    /**
+     * Add schemata to this mapping
+     *
+     * @param inputSchema The schema known at codegen time to be mapped
+     * @param outputSchema The schema configured at run time to be mapped
+     */
+    public void add(Schema inputSchema, Schema outputSchema) {
+        add(inputSchema.getName(), outputSchema);
+    }
+
+    /**
+     * Add schemata to this mapping
+     *
+     * @param inputSchema The schema known at codegen time to be mapped
+     * @param outputSchema The schema configured at run time to be mapped
+     */
+    public void add(Schema inputSchema, String outputSchema) {
+        add(inputSchema.getName(), new SchemaImpl(outputSchema));
     }
 
     /**
@@ -268,4 +308,38 @@ public class SchemaMapping implements Serializable {
         sb.append("]");
         return sb.toString();
     }
+
+    /**
+     * Convert jOOQ runtime {@link Settings} into the deprecated
+     * <code>SchemaMapping</code>
+     * <p>
+     * This method is for JOOQ INTERNAL USE only. Do not reference directly
+     */
+    public static SchemaMapping fromSettings(Settings settings) {
+        SchemaMapping result = new SchemaMapping(false);
+
+        if (settings != null) {
+            Rendering rendering = settings.getRendering();
+
+            if (rendering != null) {
+                RenderMapping r = rendering.getRenderMapping();
+
+                if (r != null) {
+                    if (!StringUtils.isEmpty(r.getDefaultSchema())) {
+                        result.use(r.getDefaultSchema());
+                    }
+
+                    for (MappedSchema schema : r.getSchemata()) {
+                        result.add(schema.getInput(), schema.getOutput());
+
+                        for (MappedTable table : schema.getTables()) {
+                            log.warn("TODO", "Re-implement table mapping for table " + table);
+                        }
+                    }
+                }
+            }
+        }
+
+        return result;
+    }
 }
diff --git a/jOOQ/src/main/java/org/jooq/conf/Execution.java b/jOOQ/src/main/java/org/jooq/conf/Execution.java
new file mode 100644
index 0000000000..2cd749371e
--- /dev/null
+++ b/jOOQ/src/main/java/org/jooq/conf/Execution.java
@@ -0,0 +1,93 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.0.5-b02-fcs 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2012.02.15 at 10:19:56 PM MEZ 
+//
+
+
+package org.jooq.conf;
+
+import java.io.Serializable;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for Execution complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="Execution">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;all>
+ *         &lt;element name="statementType" type="{http://www.jooq.org/xsd/jooq-runtime-2.0.5.xsd}StatementType" minOccurs="0"/>
+ *       &lt;/all>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "Execution", propOrder = {
+
+})
+public class Execution implements Serializable
+{
+
+    private final static long serialVersionUID = 205L;
+    @XmlElement(defaultValue = "PREPARED_STATEMENT")
+    protected StatementType statementType = StatementType.PREPARED_STATEMENT;
+
+    /**
+     * Default no-arg constructor
+     * 
+     */
+    public Execution() {
+        super();
+    }
+
+    /**
+     * Fully-initialising value constructor
+     * 
+     */
+    public Execution(final StatementType statementType) {
+        this.statementType = statementType;
+    }
+
+    /**
+     * Gets the value of the statementType property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link StatementType }
+     *     
+     */
+    public StatementType getStatementType() {
+        return statementType;
+    }
+
+    /**
+     * Sets the value of the statementType property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link StatementType }
+     *     
+     */
+    public void setStatementType(StatementType value) {
+        this.statementType = value;
+    }
+
+    public Execution withStatementType(StatementType value) {
+        setStatementType(value);
+        return this;
+    }
+
+}
diff --git a/jOOQ/src/main/java/org/jooq/conf/MappedSchema.java b/jOOQ/src/main/java/org/jooq/conf/MappedSchema.java
new file mode 100644
index 0000000000..d36b4bca43
--- /dev/null
+++ b/jOOQ/src/main/java/org/jooq/conf/MappedSchema.java
@@ -0,0 +1,157 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.0.5-b02-fcs 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2012.02.15 at 10:19:56 PM MEZ 
+//
+
+
+package org.jooq.conf;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementWrapper;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for MappedSchema complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="MappedSchema">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;all>
+ *         &lt;element name="input" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="output" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="tables" type="{http://www.jooq.org/xsd/jooq-runtime-2.0.5.xsd}MappedTables" minOccurs="0"/>
+ *       &lt;/all>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "MappedSchema", propOrder = {
+
+})
+public class MappedSchema implements Serializable
+{
+
+    private final static long serialVersionUID = 205L;
+    @XmlElement(required = true)
+    protected String input;
+    protected String output;
+    @XmlElementWrapper(name = "tables")
+    @XmlElement(name = "table")
+    protected List<MappedTable> tables;
+
+    /**
+     * Default no-arg constructor
+     * 
+     */
+    public MappedSchema() {
+        super();
+    }
+
+    /**
+     * Fully-initialising value constructor
+     * 
+     */
+    public MappedSchema(final String input, final String output, final List<MappedTable> tables) {
+        this.input = input;
+        this.output = output;
+        this.tables = tables;
+    }
+
+    /**
+     * Gets the value of the input property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getInput() {
+        return input;
+    }
+
+    /**
+     * Sets the value of the input property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setInput(String value) {
+        this.input = value;
+    }
+
+    /**
+     * Gets the value of the output property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getOutput() {
+        return output;
+    }
+
+    /**
+     * Sets the value of the output property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setOutput(String value) {
+        this.output = value;
+    }
+
+    public List<MappedTable> getTables() {
+        if (tables == null) {
+            tables = new ArrayList<MappedTable>();
+        }
+        return tables;
+    }
+
+    public MappedSchema withInput(String value) {
+        setInput(value);
+        return this;
+    }
+
+    public MappedSchema withOutput(String value) {
+        setOutput(value);
+        return this;
+    }
+
+    public MappedSchema withTables(MappedTable... values) {
+        if (values!= null) {
+            for (MappedTable value: values) {
+                getTables().add(value);
+            }
+        }
+        return this;
+    }
+
+    public MappedSchema withTables(Collection<MappedTable> values) {
+        if (values!= null) {
+            getTables().addAll(values);
+        }
+        return this;
+    }
+
+}
diff --git a/jOOQ/src/main/java/org/jooq/conf/MappedTable.java b/jOOQ/src/main/java/org/jooq/conf/MappedTable.java
new file mode 100644
index 0000000000..eb50c70bee
--- /dev/null
+++ b/jOOQ/src/main/java/org/jooq/conf/MappedTable.java
@@ -0,0 +1,126 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.0.5-b02-fcs 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2012.02.15 at 10:19:56 PM MEZ 
+//
+
+
+package org.jooq.conf;
+
+import java.io.Serializable;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for MappedTable complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="MappedTable">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;all>
+ *         &lt;element name="input" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="output" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *       &lt;/all>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "MappedTable", propOrder = {
+
+})
+public class MappedTable implements Serializable
+{
+
+    private final static long serialVersionUID = 205L;
+    @XmlElement(required = true)
+    protected String input;
+    @XmlElement(required = true)
+    protected String output;
+
+    /**
+     * Default no-arg constructor
+     * 
+     */
+    public MappedTable() {
+        super();
+    }
+
+    /**
+     * Fully-initialising value constructor
+     * 
+     */
+    public MappedTable(final String input, final String output) {
+        this.input = input;
+        this.output = output;
+    }
+
+    /**
+     * Gets the value of the input property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getInput() {
+        return input;
+    }
+
+    /**
+     * Sets the value of the input property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setInput(String value) {
+        this.input = value;
+    }
+
+    /**
+     * Gets the value of the output property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getOutput() {
+        return output;
+    }
+
+    /**
+     * Sets the value of the output property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setOutput(String value) {
+        this.output = value;
+    }
+
+    public MappedTable withInput(String value) {
+        setInput(value);
+        return this;
+    }
+
+    public MappedTable withOutput(String value) {
+        setOutput(value);
+        return this;
+    }
+
+}
diff --git a/jOOQ/src/main/java/org/jooq/conf/RenderMapping.java b/jOOQ/src/main/java/org/jooq/conf/RenderMapping.java
new file mode 100644
index 0000000000..110cf1c959
--- /dev/null
+++ b/jOOQ/src/main/java/org/jooq/conf/RenderMapping.java
@@ -0,0 +1,124 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.0.5-b02-fcs 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2012.02.15 at 10:19:56 PM MEZ 
+//
+
+
+package org.jooq.conf;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementWrapper;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for RenderMapping complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="RenderMapping">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;all>
+ *         &lt;element name="defaultSchema" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="schemata" type="{http://www.jooq.org/xsd/jooq-runtime-2.0.5.xsd}MappedSchemata" minOccurs="0"/>
+ *       &lt;/all>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "RenderMapping", propOrder = {
+
+})
+public class RenderMapping implements Serializable
+{
+
+    private final static long serialVersionUID = 205L;
+    protected String defaultSchema;
+    @XmlElementWrapper(name = "schemata")
+    @XmlElement(name = "schema")
+    protected List<MappedSchema> schemata;
+
+    /**
+     * Default no-arg constructor
+     * 
+     */
+    public RenderMapping() {
+        super();
+    }
+
+    /**
+     * Fully-initialising value constructor
+     * 
+     */
+    public RenderMapping(final String defaultSchema, final List<MappedSchema> schemata) {
+        this.defaultSchema = defaultSchema;
+        this.schemata = schemata;
+    }
+
+    /**
+     * Gets the value of the defaultSchema property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getDefaultSchema() {
+        return defaultSchema;
+    }
+
+    /**
+     * Sets the value of the defaultSchema property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setDefaultSchema(String value) {
+        this.defaultSchema = value;
+    }
+
+    public List<MappedSchema> getSchemata() {
+        if (schemata == null) {
+            schemata = new ArrayList<MappedSchema>();
+        }
+        return schemata;
+    }
+
+    public RenderMapping withDefaultSchema(String value) {
+        setDefaultSchema(value);
+        return this;
+    }
+
+    public RenderMapping withSchemata(MappedSchema... values) {
+        if (values!= null) {
+            for (MappedSchema value: values) {
+                getSchemata().add(value);
+            }
+        }
+        return this;
+    }
+
+    public RenderMapping withSchemata(Collection<MappedSchema> values) {
+        if (values!= null) {
+            getSchemata().addAll(values);
+        }
+        return this;
+    }
+
+}
diff --git a/jOOQ/src/main/java/org/jooq/conf/Rendering.java b/jOOQ/src/main/java/org/jooq/conf/Rendering.java
new file mode 100644
index 0000000000..0c42fa27ac
--- /dev/null
+++ b/jOOQ/src/main/java/org/jooq/conf/Rendering.java
@@ -0,0 +1,91 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.0.5-b02-fcs 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2012.02.15 at 10:19:56 PM MEZ 
+//
+
+
+package org.jooq.conf;
+
+import java.io.Serializable;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for Rendering complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="Rendering">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;all>
+ *         &lt;element name="renderMapping" type="{http://www.jooq.org/xsd/jooq-runtime-2.0.5.xsd}RenderMapping" minOccurs="0"/>
+ *       &lt;/all>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "Rendering", propOrder = {
+
+})
+public class Rendering implements Serializable
+{
+
+    private final static long serialVersionUID = 205L;
+    protected RenderMapping renderMapping;
+
+    /**
+     * Default no-arg constructor
+     * 
+     */
+    public Rendering() {
+        super();
+    }
+
+    /**
+     * Fully-initialising value constructor
+     * 
+     */
+    public Rendering(final RenderMapping renderMapping) {
+        this.renderMapping = renderMapping;
+    }
+
+    /**
+     * Gets the value of the renderMapping property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link RenderMapping }
+     *     
+     */
+    public RenderMapping getRenderMapping() {
+        return renderMapping;
+    }
+
+    /**
+     * Sets the value of the renderMapping property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link RenderMapping }
+     *     
+     */
+    public void setRenderMapping(RenderMapping value) {
+        this.renderMapping = value;
+    }
+
+    public Rendering withRenderMapping(RenderMapping value) {
+        setRenderMapping(value);
+        return this;
+    }
+
+}
diff --git a/jOOQ/src/main/java/org/jooq/conf/Settings.java b/jOOQ/src/main/java/org/jooq/conf/Settings.java
new file mode 100644
index 0000000000..f4759f79ba
--- /dev/null
+++ b/jOOQ/src/main/java/org/jooq/conf/Settings.java
@@ -0,0 +1,123 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.0.5-b02-fcs 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2012.02.15 at 10:19:56 PM MEZ 
+//
+
+
+package org.jooq.conf;
+
+import java.io.Serializable;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for Settings complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="Settings">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;all>
+ *         &lt;element name="rendering" type="{http://www.jooq.org/xsd/jooq-runtime-2.0.5.xsd}Rendering" minOccurs="0"/>
+ *         &lt;element name="execution" type="{http://www.jooq.org/xsd/jooq-runtime-2.0.5.xsd}Execution" minOccurs="0"/>
+ *       &lt;/all>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "Settings", propOrder = {
+
+})
+public class Settings implements Serializable
+{
+
+    private final static long serialVersionUID = 205L;
+    protected Rendering rendering;
+    protected Execution execution;
+
+    /**
+     * Default no-arg constructor
+     * 
+     */
+    public Settings() {
+        super();
+    }
+
+    /**
+     * Fully-initialising value constructor
+     * 
+     */
+    public Settings(final Rendering rendering, final Execution execution) {
+        this.rendering = rendering;
+        this.execution = execution;
+    }
+
+    /**
+     * Gets the value of the rendering property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Rendering }
+     *     
+     */
+    public Rendering getRendering() {
+        return rendering;
+    }
+
+    /**
+     * Sets the value of the rendering property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Rendering }
+     *     
+     */
+    public void setRendering(Rendering value) {
+        this.rendering = value;
+    }
+
+    /**
+     * Gets the value of the execution property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Execution }
+     *     
+     */
+    public Execution getExecution() {
+        return execution;
+    }
+
+    /**
+     * Sets the value of the execution property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Execution }
+     *     
+     */
+    public void setExecution(Execution value) {
+        this.execution = value;
+    }
+
+    public Settings withRendering(Rendering value) {
+        setRendering(value);
+        return this;
+    }
+
+    public Settings withExecution(Execution value) {
+        setExecution(value);
+        return this;
+    }
+
+}
diff --git a/jOOQ/src/main/java/org/jooq/conf/StatementType.java b/jOOQ/src/main/java/org/jooq/conf/StatementType.java
new file mode 100644
index 0000000000..165edc1bcd
--- /dev/null
+++ b/jOOQ/src/main/java/org/jooq/conf/StatementType.java
@@ -0,0 +1,43 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.0.5-b02-fcs 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2012.02.15 at 10:19:56 PM MEZ 
+//
+
+
+package org.jooq.conf;
+
+import javax.xml.bind.annotation.XmlEnum;
+
+
+/**
+ * <p>Java class for StatementType.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * <pre>
+ * &lt;simpleType name="StatementType">
+ *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *     &lt;enumeration value="STATEMENT"/>
+ *     &lt;enumeration value="PREPARED_STATEMENT"/>
+ *   &lt;/restriction>
+ * &lt;/simpleType>
+ * </pre>
+ * 
+ */
+@XmlEnum
+public enum StatementType {
+
+    STATEMENT,
+    PREPARED_STATEMENT;
+
+    public String value() {
+        return name();
+    }
+
+    public static StatementType fromValue(String v) {
+        return valueOf(v);
+    }
+
+}
diff --git a/jOOQ/src/main/java/org/jooq/conf/package-info.java b/jOOQ/src/main/java/org/jooq/conf/package-info.java
new file mode 100644
index 0000000000..aa37c6d23a
--- /dev/null
+++ b/jOOQ/src/main/java/org/jooq/conf/package-info.java
@@ -0,0 +1,9 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.0.5-b02-fcs 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2012.02.15 at 10:19:56 PM MEZ 
+//
+
+@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.jooq.org/xsd/jooq-runtime-2.0.5.xsd")
+package org.jooq.conf;
diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractContext.java b/jOOQ/src/main/java/org/jooq/impl/AbstractContext.java
index 5cec96f229..afc5740896 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AbstractContext.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AbstractContext.java
@@ -40,7 +40,7 @@ import java.sql.Connection;
 import org.jooq.Configuration;
 import org.jooq.Context;
 import org.jooq.SQLDialect;
-import org.jooq.SchemaMapping;
+import org.jooq.conf.Settings;
 
 /**
  * @author Lukas Eder
@@ -133,10 +133,16 @@ abstract class AbstractContext<C extends Context<C>> implements Context<C> {
     }
 
     @Override
-    public final SchemaMapping getSchemaMapping() {
+    @Deprecated
+    public final org.jooq.SchemaMapping getSchemaMapping() {
         return configuration.getSchemaMapping();
     }
 
+    @Override
+    public final Settings getSettings() {
+        return configuration.getSettings();
+    }
+
     void toString(StringBuilder sb) {
         sb.append(  "bind index   [");
         sb.append(index);
diff --git a/jOOQ/src/main/java/org/jooq/impl/AttachableImpl.java b/jOOQ/src/main/java/org/jooq/impl/AttachableImpl.java
index 53eea0021b..38d4173b76 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AttachableImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AttachableImpl.java
@@ -43,8 +43,8 @@ import org.jooq.Attachable;
 import org.jooq.AttachableInternal;
 import org.jooq.Configuration;
 import org.jooq.SQLDialect;
-import org.jooq.SchemaMapping;
 import org.jooq.Store;
+import org.jooq.conf.Settings;
 import org.jooq.tools.JooqLogger;
 
 /**
@@ -109,10 +109,15 @@ class AttachableImpl implements AttachableInternal {
         return getConfiguration().getDialect();
     }
 
-    final SchemaMapping getSchemaMapping() {
+    @Deprecated
+    final org.jooq.SchemaMapping getSchemaMapping() {
         return getConfiguration().getSchemaMapping();
     }
 
+    final Settings getSettings() {
+        return getConfiguration().getSettings();
+    }
+
     @Override
     public final List<Attachable> getAttachables() {
         return delegate.getAttachables();
diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultConfiguration.java b/jOOQ/src/main/java/org/jooq/impl/DefaultConfiguration.java
index b0020e7f1c..7437caebd9 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DefaultConfiguration.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DefaultConfiguration.java
@@ -39,7 +39,7 @@ import java.sql.Connection;
 
 import org.jooq.Configuration;
 import org.jooq.SQLDialect;
-import org.jooq.SchemaMapping;
+import org.jooq.conf.Settings;
 
 /**
  * The default configuration, if no other configuration is supplied
@@ -51,9 +51,9 @@ final class DefaultConfiguration implements Configuration {
     /**
      * Generated UID
      */
-    private static final long           serialVersionUID             = -5746537675969065088L;
+    private static final long  serialVersionUID      = -5746537675969065088L;
 
-    static final Configuration          DEFAULT_CONFIGURATION        = new DefaultConfiguration();
+    static final Configuration DEFAULT_CONFIGURATION = new DefaultConfiguration();
 
     @SuppressWarnings("deprecation")
     @Override
@@ -67,8 +67,14 @@ final class DefaultConfiguration implements Configuration {
     }
 
     @Override
-    public SchemaMapping getSchemaMapping() {
-        return SchemaMapping.NO_MAPPING;
+    @Deprecated
+    public org.jooq.SchemaMapping getSchemaMapping() {
+        return org.jooq.SchemaMapping.NO_MAPPING;
+    }
+
+    @Override
+    public Settings getSettings() {
+        return new Settings();
     }
 
     /**
@@ -82,6 +88,6 @@ final class DefaultConfiguration implements Configuration {
 
     @Override
     public String toString() {
-        return new Factory(getConnection(), getDialect(), getSchemaMapping()).toString();
+        return new Factory(getConnection(), getDialect(), getSettings()).toString();
     }
 }
diff --git a/jOOQ/src/main/java/org/jooq/impl/Factory.java b/jOOQ/src/main/java/org/jooq/impl/Factory.java
index 524aa7d498..8bfe3e238e 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Factory.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Factory.java
@@ -100,7 +100,6 @@ import org.jooq.Result;
 import org.jooq.ResultQuery;
 import org.jooq.SQLDialect;
 import org.jooq.Schema;
-import org.jooq.SchemaMapping;
 import org.jooq.Select;
 import org.jooq.SelectQuery;
 import org.jooq.SelectSelectStep;
@@ -118,6 +117,7 @@ import org.jooq.UpdateQuery;
 import org.jooq.UpdateSetStep;
 import org.jooq.WindowIgnoreNullsStep;
 import org.jooq.WindowOverStep;
+import org.jooq.conf.Settings;
 import org.jooq.exception.DataAccessException;
 import org.jooq.exception.InvalidResultException;
 import org.jooq.exception.SQLDialectNotSupportedException;
@@ -154,14 +154,17 @@ public class Factory implements FactoryOperations {
     /**
      * Generated UID
      */
-    private static final long       serialVersionUID  = 2681360188806309513L;
-    private static final JooqLogger log               = JooqLogger.getLogger(Factory.class);
+    private static final long            serialVersionUID  = 2681360188806309513L;
+    private static final JooqLogger      log               = JooqLogger.getLogger(Factory.class);
 
-    private static final Factory[]  DEFAULT_INSTANCES = new Factory[SQLDialect.values().length];
+    private static final Factory[]       DEFAULT_INSTANCES = new Factory[SQLDialect.values().length];
 
-    private transient Connection    connection;
-    private final SQLDialect        dialect;
-    private final SchemaMapping     mapping;
+    private transient Connection         connection;
+    private final SQLDialect             dialect;
+
+    @SuppressWarnings("deprecation")
+    private final org.jooq.SchemaMapping mapping;
+    private final Settings               settings;
 
     // -------------------------------------------------------------------------
     // Constructors
@@ -175,7 +178,7 @@ public class Factory implements FactoryOperations {
      * @param dialect The dialect to use with objects created from this factory
      */
     public Factory(Connection connection, SQLDialect dialect) {
-        this(connection, dialect, new SchemaMapping());
+        this(connection, dialect, new Settings(), null);
     }
 
     /**
@@ -187,11 +190,38 @@ public class Factory implements FactoryOperations {
      * @param dialect The dialect to use with objects created from this factory
      * @param mapping The schema mapping to use with objects created from this
      *            factory
+     * @deprecated - 2.0.5 - Use
+     *             {@link #Factory(Connection, SQLDialect, Settings)} instead
      */
-    public Factory(Connection connection, SQLDialect dialect, SchemaMapping mapping) {
+    @Deprecated
+    public Factory(Connection connection, SQLDialect dialect, org.jooq.SchemaMapping mapping) {
+        this(connection, dialect, null, null);
+    }
+
+    /**
+     * Create a factory with connection, a dialect and a schema mapping
+     * configured
+     *
+     * @param connection The connection to use with objects created from this
+     *            factory
+     * @param dialect The dialect to use with objects created from this factory
+     * @param settings The runtime settings to apply to objects created from
+     *            this factory
+     */
+    @SuppressWarnings("deprecation")
+    public Factory(Connection connection, SQLDialect dialect, Settings settings) {
+        this(connection, dialect, settings, org.jooq.SchemaMapping.fromSettings(settings));
+    }
+
+    /**
+     * Do the instanciation
+     */
+    @SuppressWarnings("deprecation")
+    private Factory(Connection connection, SQLDialect dialect, Settings settings, org.jooq.SchemaMapping mapping) {
         this.connection = connection;
         this.dialect = dialect;
-        this.mapping = mapping != null ? mapping : new SchemaMapping();
+        this.settings = settings != null ? settings : new Settings();
+        this.mapping = mapping != null ? mapping : org.jooq.SchemaMapping.fromSettings(settings);
     }
 
     // -------------------------------------------------------------------------
@@ -218,10 +248,19 @@ public class Factory implements FactoryOperations {
      * {@inheritDoc}
      */
     @Override
-    public final SchemaMapping getSchemaMapping() {
+    @Deprecated
+    public final org.jooq.SchemaMapping getSchemaMapping() {
         return mapping;
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public final Settings getSettings() {
+        return settings;
+    }
+
     // -------------------------------------------------------------------------
     // RenderContext and BindContext accessors
     // -------------------------------------------------------------------------
@@ -1198,6 +1237,7 @@ public class Factory implements FactoryOperations {
     /**
      * {@inheritDoc}
      */
+    @SuppressWarnings("deprecation")
     @Override
     public final int use(Schema schema) {
         int result = 0;
@@ -4604,7 +4644,7 @@ public class Factory implements FactoryOperations {
             return getNewFactory(DefaultConfiguration.DEFAULT_CONFIGURATION);
         }
         else {
-            return new Factory(configuration.getConnection(), configuration.getDialect(), configuration.getSchemaMapping());
+            return new Factory(configuration.getConnection(), configuration.getDialect(), configuration.getSettings());
         }
     }
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Util.java b/jOOQ/src/main/java/org/jooq/impl/Util.java
index 0068135b49..d7dd126c24 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Util.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Util.java
@@ -66,7 +66,6 @@ import org.jooq.QueryPartInternal;
 import org.jooq.Record;
 import org.jooq.RenderContext;
 import org.jooq.Schema;
-import org.jooq.SchemaMapping;
 import org.jooq.Table;
 import org.jooq.Type;
 import org.jooq.exception.DataAccessException;
@@ -759,6 +758,7 @@ final class Util {
     /**
      * Map a {@link Schema} according to the configured {@link SchemaMapping}
      */
+    @SuppressWarnings("deprecation")
     static Schema getMappedSchema(Configuration configuration, Schema schema) {
         if (configuration.getSchemaMapping() != null) {
             return configuration.getSchemaMapping().map(schema);
@@ -771,6 +771,7 @@ final class Util {
     /**
      * Map a {@link Table} according to the configured {@link SchemaMapping}
      */
+    @SuppressWarnings("deprecation")
     static Table<?> getMappedTable(Configuration configuration, Table<?> table) {
         if (configuration.getSchemaMapping() != null) {
             return configuration.getSchemaMapping().map(table);
diff --git a/jOOQ/src/main/java/org/jooq/util/ase/ASEFactory.java b/jOOQ/src/main/java/org/jooq/util/ase/ASEFactory.java
index 412941c9ec..18d1f5bf2d 100644
--- a/jOOQ/src/main/java/org/jooq/util/ase/ASEFactory.java
+++ b/jOOQ/src/main/java/org/jooq/util/ase/ASEFactory.java
@@ -34,6 +34,7 @@ import java.sql.Connection;
 
 import org.jooq.SQLDialect;
 import org.jooq.SchemaMapping;
+import org.jooq.conf.Settings;
 import org.jooq.impl.Factory;
 
 /**
@@ -41,6 +42,7 @@ import org.jooq.impl.Factory;
  *
  * @author Lukas Eder
  */
+@SuppressWarnings("deprecation")
 public class ASEFactory extends Factory {
 
     /**
@@ -55,11 +57,26 @@ public class ASEFactory extends Factory {
      *            factory
      * @param mapping The schema mapping to use with objects created from this
      *            factory
+     * @deprecated - 2.0.5 - Use {@link #ASEFactory(Connection, Settings)}
+     *             instead
      */
+    @Deprecated
     public ASEFactory(Connection connection, SchemaMapping mapping) {
         super(connection, SQLDialect.ASE, mapping);
     }
 
+    /**
+     * Create a factory with connection and a settings configured
+     *
+     * @param connection The connection to use with objects created from this
+     *            factory
+     * @param settings The runtime settings to apply to objects created from
+     *            this factory
+     */
+    public ASEFactory(Connection connection, Settings settings) {
+        super(connection, SQLDialect.ASE, settings);
+    }
+
     /**
      * Create a factory with connection
      *
diff --git a/jOOQ/src/main/java/org/jooq/util/db2/DB2Factory.java b/jOOQ/src/main/java/org/jooq/util/db2/DB2Factory.java
index 21c4a50cc6..e8259025c3 100644
--- a/jOOQ/src/main/java/org/jooq/util/db2/DB2Factory.java
+++ b/jOOQ/src/main/java/org/jooq/util/db2/DB2Factory.java
@@ -39,6 +39,7 @@ import java.sql.Connection;
 
 import org.jooq.SQLDialect;
 import org.jooq.SchemaMapping;
+import org.jooq.conf.Settings;
 import org.jooq.impl.Factory;
 
 /**
@@ -46,6 +47,7 @@ import org.jooq.impl.Factory;
  *
  * @author Lukas Eder
  */
+@SuppressWarnings("deprecation")
 public class DB2Factory extends Factory {
 
     /**
@@ -60,11 +62,26 @@ public class DB2Factory extends Factory {
      *            factory
      * @param mapping The schema mapping to use with objects created from this
      *            factory
+     * @deprecated - 2.0.5 - Use {@link #DB2Factory(Connection, Settings)}
+     *             instead
      */
+    @Deprecated
     public DB2Factory(Connection connection, SchemaMapping mapping) {
         super(connection, SQLDialect.DB2, mapping);
     }
 
+    /**
+     * Create a factory with connection and a settings configured
+     *
+     * @param connection The connection to use with objects created from this
+     *            factory
+     * @param settings The runtime settings to apply to objects created from
+     *            this factory
+     */
+    public DB2Factory(Connection connection, Settings settings) {
+        super(connection, SQLDialect.DB2, settings);
+    }
+
     /**
      * Create a factory with connection
      *
diff --git a/jOOQ/src/main/java/org/jooq/util/derby/DerbyFactory.java b/jOOQ/src/main/java/org/jooq/util/derby/DerbyFactory.java
index 1825ece7dd..7298e2688f 100644
--- a/jOOQ/src/main/java/org/jooq/util/derby/DerbyFactory.java
+++ b/jOOQ/src/main/java/org/jooq/util/derby/DerbyFactory.java
@@ -39,6 +39,7 @@ import java.sql.Connection;
 
 import org.jooq.SQLDialect;
 import org.jooq.SchemaMapping;
+import org.jooq.conf.Settings;
 import org.jooq.impl.Factory;
 
 /**
@@ -46,6 +47,7 @@ import org.jooq.impl.Factory;
  *
  * @author Lukas Eder
  */
+@SuppressWarnings("deprecation")
 public class DerbyFactory extends Factory {
 
     /**
@@ -60,11 +62,26 @@ public class DerbyFactory extends Factory {
      *            factory
      * @param mapping The schema mapping to use with objects created from this
      *            factory
+     * @deprecated - 2.0.5 - Use {@link #DerbyFactory(Connection, Settings)}
+     *             instead
      */
+    @Deprecated
     public DerbyFactory(Connection connection, SchemaMapping mapping) {
         super(connection, SQLDialect.DERBY, mapping);
     }
 
+    /**
+     * Create a factory with connection and a settings configured
+     *
+     * @param connection The connection to use with objects created from this
+     *            factory
+     * @param settings The runtime settings to apply to objects created from
+     *            this factory
+     */
+    public DerbyFactory(Connection connection, Settings settings) {
+        super(connection, SQLDialect.DERBY, settings);
+    }
+
     /**
      * Create a factory with connection
      *
diff --git a/jOOQ/src/main/java/org/jooq/util/h2/H2Factory.java b/jOOQ/src/main/java/org/jooq/util/h2/H2Factory.java
index fef4721dfa..469fab16c4 100644
--- a/jOOQ/src/main/java/org/jooq/util/h2/H2Factory.java
+++ b/jOOQ/src/main/java/org/jooq/util/h2/H2Factory.java
@@ -39,6 +39,7 @@ import java.sql.Connection;
 
 import org.jooq.SQLDialect;
 import org.jooq.SchemaMapping;
+import org.jooq.conf.Settings;
 import org.jooq.impl.Factory;
 
 /**
@@ -46,6 +47,7 @@ import org.jooq.impl.Factory;
  *
  * @author Lukas Eder
  */
+@SuppressWarnings("deprecation")
 public class H2Factory extends Factory {
 
     /**
@@ -60,11 +62,26 @@ public class H2Factory extends Factory {
      *            factory
      * @param mapping The schema mapping to use with objects created from this
      *            factory
+     * @deprecated - 2.0.5 - Use {@link #H2Factory(Connection, Settings)}
+     *             instead
      */
+    @Deprecated
     public H2Factory(Connection connection, SchemaMapping mapping) {
         super(connection, SQLDialect.H2, mapping);
     }
 
+    /**
+     * Create a factory with connection and a settings configured
+     *
+     * @param connection The connection to use with objects created from this
+     *            factory
+     * @param settings The runtime settings to apply to objects created from
+     *            this factory
+     */
+    public H2Factory(Connection connection, Settings settings) {
+        super(connection, SQLDialect.H2, settings);
+    }
+
     /**
      * Create a factory with connection
      *
diff --git a/jOOQ/src/main/java/org/jooq/util/hsqldb/HSQLDBFactory.java b/jOOQ/src/main/java/org/jooq/util/hsqldb/HSQLDBFactory.java
index c13c4a6029..b74f9049ff 100644
--- a/jOOQ/src/main/java/org/jooq/util/hsqldb/HSQLDBFactory.java
+++ b/jOOQ/src/main/java/org/jooq/util/hsqldb/HSQLDBFactory.java
@@ -39,6 +39,7 @@ import java.sql.Connection;
 
 import org.jooq.SQLDialect;
 import org.jooq.SchemaMapping;
+import org.jooq.conf.Settings;
 import org.jooq.impl.Factory;
 
 /**
@@ -46,6 +47,7 @@ import org.jooq.impl.Factory;
  *
  * @author Lukas Eder
  */
+@SuppressWarnings("deprecation")
 public class HSQLDBFactory extends Factory {
 
     /**
@@ -60,11 +62,26 @@ public class HSQLDBFactory extends Factory {
      *            factory
      * @param mapping The schema mapping to use with objects created from this
      *            factory
+     * @deprecated - 2.0.5 - Use {@link #HSQLDBFactory(Connection, Settings)}
+     *             instead
      */
+    @Deprecated
     public HSQLDBFactory(Connection connection, SchemaMapping mapping) {
         super(connection, SQLDialect.HSQLDB, mapping);
     }
 
+    /**
+     * Create a factory with connection and a settings configured
+     *
+     * @param connection The connection to use with objects created from this
+     *            factory
+     * @param settings The runtime settings to apply to objects created from
+     *            this factory
+     */
+    public HSQLDBFactory(Connection connection, Settings settings) {
+        super(connection, SQLDialect.HSQLDB, settings);
+    }
+
     /**
      * Create a factory with connection
      *
diff --git a/jOOQ/src/main/java/org/jooq/util/ingres/IngresFactory.java b/jOOQ/src/main/java/org/jooq/util/ingres/IngresFactory.java
index 363b5b67ff..e1ad631827 100644
--- a/jOOQ/src/main/java/org/jooq/util/ingres/IngresFactory.java
+++ b/jOOQ/src/main/java/org/jooq/util/ingres/IngresFactory.java
@@ -39,6 +39,7 @@ import java.sql.Connection;
 
 import org.jooq.SQLDialect;
 import org.jooq.SchemaMapping;
+import org.jooq.conf.Settings;
 import org.jooq.impl.Factory;
 
 /**
@@ -46,6 +47,7 @@ import org.jooq.impl.Factory;
  *
  * @author Lukas Eder
  */
+@SuppressWarnings("deprecation")
 public class IngresFactory extends Factory {
 
     /**
@@ -60,11 +62,26 @@ public class IngresFactory extends Factory {
      *            factory
      * @param mapping The schema mapping to use with objects created from this
      *            factory
+     * @deprecated - 2.0.5 - Use {@link #IngresFactory(Connection, Settings)}
+     *             instead
      */
+    @Deprecated
     public IngresFactory(Connection connection, SchemaMapping mapping) {
         super(connection, SQLDialect.INGRES, mapping);
     }
 
+    /**
+     * Create a factory with connection and a settings configured
+     *
+     * @param connection The connection to use with objects created from this
+     *            factory
+     * @param settings The runtime settings to apply to objects created from
+     *            this factory
+     */
+    public IngresFactory(Connection connection, Settings settings) {
+        super(connection, SQLDialect.INGRES, settings);
+    }
+
     /**
      * Create a factory with connection
      *
diff --git a/jOOQ/src/main/java/org/jooq/util/mysql/MySQLFactory.java b/jOOQ/src/main/java/org/jooq/util/mysql/MySQLFactory.java
index abb520f506..b8bd7823ee 100644
--- a/jOOQ/src/main/java/org/jooq/util/mysql/MySQLFactory.java
+++ b/jOOQ/src/main/java/org/jooq/util/mysql/MySQLFactory.java
@@ -40,6 +40,7 @@ import java.sql.Connection;
 import org.jooq.Field;
 import org.jooq.SQLDialect;
 import org.jooq.SchemaMapping;
+import org.jooq.conf.Settings;
 import org.jooq.impl.Factory;
 
 /**
@@ -47,6 +48,7 @@ import org.jooq.impl.Factory;
  *
  * @author Lukas Eder
  */
+@SuppressWarnings("deprecation")
 public class MySQLFactory extends Factory {
 
     /**
@@ -61,11 +63,26 @@ public class MySQLFactory extends Factory {
      *            factory
      * @param mapping The schema mapping to use with objects created from this
      *            factory
+     * @deprecated - 2.0.5 - Use {@link #MySQLFactory(Connection, Settings)}
+     *             instead
      */
+    @Deprecated
     public MySQLFactory(Connection connection, SchemaMapping mapping) {
         super(connection, SQLDialect.MYSQL, mapping);
     }
 
+    /**
+     * Create a factory with connection and a settings configured
+     *
+     * @param connection The connection to use with objects created from this
+     *            factory
+     * @param settings The runtime settings to apply to objects created from
+     *            this factory
+     */
+    public MySQLFactory(Connection connection, Settings settings) {
+        super(connection, SQLDialect.MYSQL, settings);
+    }
+
     /**
      * Create a factory with connection
      *
diff --git a/jOOQ/src/main/java/org/jooq/util/oracle/OracleFactory.java b/jOOQ/src/main/java/org/jooq/util/oracle/OracleFactory.java
index f96127424e..4cc3077012 100644
--- a/jOOQ/src/main/java/org/jooq/util/oracle/OracleFactory.java
+++ b/jOOQ/src/main/java/org/jooq/util/oracle/OracleFactory.java
@@ -42,6 +42,7 @@ import org.jooq.Field;
 import org.jooq.RenderContext;
 import org.jooq.SQLDialect;
 import org.jooq.SchemaMapping;
+import org.jooq.conf.Settings;
 import org.jooq.impl.CustomField;
 import org.jooq.impl.Factory;
 import org.jooq.impl.SQLDataType;
@@ -51,6 +52,7 @@ import org.jooq.impl.SQLDataType;
  *
  * @author Lukas Eder
  */
+@SuppressWarnings("deprecation")
 public class OracleFactory extends Factory {
 
     /**
@@ -65,11 +67,26 @@ public class OracleFactory extends Factory {
      *            factory
      * @param mapping The schema mapping to use with objects created from this
      *            factory
+     * @deprecated - 2.0.5 - Use {@link #OracleFactory(Connection, Settings)}
+     *             instead
      */
+    @Deprecated
     public OracleFactory(Connection connection, SchemaMapping mapping) {
         super(connection, SQLDialect.ORACLE, mapping);
     }
 
+    /**
+     * Create a factory with connection and a settings configured
+     *
+     * @param connection The connection to use with objects created from this
+     *            factory
+     * @param settings The runtime settings to apply to objects created from
+     *            this factory
+     */
+    public OracleFactory(Connection connection, Settings settings) {
+        super(connection, SQLDialect.ORACLE, settings);
+    }
+
     /**
      * Create a factory with connection
      *
diff --git a/jOOQ/src/main/java/org/jooq/util/postgres/PostgresFactory.java b/jOOQ/src/main/java/org/jooq/util/postgres/PostgresFactory.java
index 821db90dd3..cc99d88e7b 100644
--- a/jOOQ/src/main/java/org/jooq/util/postgres/PostgresFactory.java
+++ b/jOOQ/src/main/java/org/jooq/util/postgres/PostgresFactory.java
@@ -39,6 +39,7 @@ import java.sql.Connection;
 
 import org.jooq.SQLDialect;
 import org.jooq.SchemaMapping;
+import org.jooq.conf.Settings;
 import org.jooq.impl.Factory;
 
 /**
@@ -46,6 +47,7 @@ import org.jooq.impl.Factory;
  *
  * @author Lukas Eder
  */
+@SuppressWarnings("deprecation")
 public class PostgresFactory extends Factory {
 
     /**
@@ -60,11 +62,26 @@ public class PostgresFactory extends Factory {
      *            factory
      * @param mapping The schema mapping to use with objects created from this
      *            factory
+     * @deprecated - 2.0.5 - Use {@link #PostgresFactory(Connection, Settings)}
+     *             instead
      */
+    @Deprecated
     public PostgresFactory(Connection connection, SchemaMapping mapping) {
         super(connection, SQLDialect.POSTGRES, mapping);
     }
 
+    /**
+     * Create a factory with connection and a settings configured
+     *
+     * @param connection The connection to use with objects created from this
+     *            factory
+     * @param settings The runtime settings to apply to objects created from
+     *            this factory
+     */
+    public PostgresFactory(Connection connection, Settings settings) {
+        super(connection, SQLDialect.POSTGRES, settings);
+    }
+
     /**
      * Create a factory with connection
      *
diff --git a/jOOQ/src/main/java/org/jooq/util/sqlite/SQLiteFactory.java b/jOOQ/src/main/java/org/jooq/util/sqlite/SQLiteFactory.java
index 6d6a7902af..dfd414b78e 100644
--- a/jOOQ/src/main/java/org/jooq/util/sqlite/SQLiteFactory.java
+++ b/jOOQ/src/main/java/org/jooq/util/sqlite/SQLiteFactory.java
@@ -40,6 +40,7 @@ import java.sql.Connection;
 import org.jooq.Field;
 import org.jooq.SQLDialect;
 import org.jooq.SchemaMapping;
+import org.jooq.conf.Settings;
 import org.jooq.impl.Factory;
 
 /**
@@ -47,6 +48,7 @@ import org.jooq.impl.Factory;
  *
  * @author Lukas Eder
  */
+@SuppressWarnings("deprecation")
 public class SQLiteFactory extends Factory {
 
     /**
@@ -61,11 +63,26 @@ public class SQLiteFactory extends Factory {
      *            factory
      * @param mapping The schema mapping to use with objects created from this
      *            factory
+     * @deprecated - 2.0.5 - Use {@link #SQLiteFactory(Connection, Settings)}
+     *             instead
      */
+    @Deprecated
     public SQLiteFactory(Connection connection, SchemaMapping mapping) {
         super(connection, SQLDialect.SQLITE, mapping);
     }
 
+    /**
+     * Create a factory with connection and a settings configured
+     *
+     * @param connection The connection to use with objects created from this
+     *            factory
+     * @param settings The runtime settings to apply to objects created from
+     *            this factory
+     */
+    public SQLiteFactory(Connection connection, Settings settings) {
+        super(connection, SQLDialect.SQLITE, settings);
+    }
+
     /**
      * Create a factory with connection
      *
diff --git a/jOOQ/src/main/java/org/jooq/util/sqlserver/SQLServerFactory.java b/jOOQ/src/main/java/org/jooq/util/sqlserver/SQLServerFactory.java
index ab52605bf8..8922590b8c 100644
--- a/jOOQ/src/main/java/org/jooq/util/sqlserver/SQLServerFactory.java
+++ b/jOOQ/src/main/java/org/jooq/util/sqlserver/SQLServerFactory.java
@@ -39,6 +39,7 @@ import java.sql.Connection;
 
 import org.jooq.SQLDialect;
 import org.jooq.SchemaMapping;
+import org.jooq.conf.Settings;
 import org.jooq.impl.Factory;
 
 /**
@@ -46,6 +47,7 @@ import org.jooq.impl.Factory;
  *
  * @author Lukas Eder
  */
+@SuppressWarnings("deprecation")
 public class SQLServerFactory extends Factory {
 
     /**
@@ -60,11 +62,26 @@ public class SQLServerFactory extends Factory {
      *            factory
      * @param mapping The schema mapping to use with objects created from this
      *            factory
+     * @deprecated - 2.0.5 - Use {@link #SQLServerFactory(Connection, Settings)}
+     *             instead
      */
+    @Deprecated
     public SQLServerFactory(Connection connection, SchemaMapping mapping) {
         super(connection, SQLDialect.SQLSERVER, mapping);
     }
 
+    /**
+     * Create a factory with connection and a settings configured
+     *
+     * @param connection The connection to use with objects created from this
+     *            factory
+     * @param settings The runtime settings to apply to objects created from
+     *            this factory
+     */
+    public SQLServerFactory(Connection connection, Settings settings) {
+        super(connection, SQLDialect.SQLSERVER, settings);
+    }
+
     /**
      * Create a factory with connection
      *
diff --git a/jOOQ/src/main/java/org/jooq/util/sybase/SybaseFactory.java b/jOOQ/src/main/java/org/jooq/util/sybase/SybaseFactory.java
index 20bbc09a15..4a2f478d72 100644
--- a/jOOQ/src/main/java/org/jooq/util/sybase/SybaseFactory.java
+++ b/jOOQ/src/main/java/org/jooq/util/sybase/SybaseFactory.java
@@ -34,6 +34,7 @@ import java.sql.Connection;
 
 import org.jooq.SQLDialect;
 import org.jooq.SchemaMapping;
+import org.jooq.conf.Settings;
 import org.jooq.impl.Factory;
 
 /**
@@ -41,6 +42,7 @@ import org.jooq.impl.Factory;
  *
  * @author Espen Stromsnes
  */
+@SuppressWarnings("deprecation")
 public class SybaseFactory extends Factory {
 
     /**
@@ -55,11 +57,26 @@ public class SybaseFactory extends Factory {
      *            factory
      * @param mapping The schema mapping to use with objects created from this
      *            factory
+     * @deprecated - 2.0.5 - Use {@link #SybaseFactory(Connection, Settings)}
+     *             instead
      */
+    @Deprecated
     public SybaseFactory(Connection connection, SchemaMapping mapping) {
         super(connection, SQLDialect.SYBASE, mapping);
     }
 
+    /**
+     * Create a factory with connection and a settings configured
+     *
+     * @param connection The connection to use with objects created from this
+     *            factory
+     * @param settings The runtime settings to apply to objects created from
+     *            this factory
+     */
+    public SybaseFactory(Connection connection, Settings settings) {
+        super(connection, SQLDialect.SYBASE, settings);
+    }
+
     /**
      * Create a factory with connection
      *
diff --git a/jOOQ/src/main/resources/xsd/jooq-runtime-2.0.5.xsd b/jOOQ/src/main/resources/xsd/jooq-runtime-2.0.5.xsd
new file mode 100644
index 0000000000..2821b4ff24
--- /dev/null
+++ b/jOOQ/src/main/resources/xsd/jooq-runtime-2.0.5.xsd
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schema
+	xmlns="http://www.w3.org/2001/XMLSchema"
+	xmlns:jooq-runtime="http://www.jooq.org/xsd/jooq-runtime-2.0.5.xsd"
+	xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
+    xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc"
+    jaxb:version="1.0" jaxb:extensionBindingPrefixes="xjc"
+	targetNamespace="http://www.jooq.org/xsd/jooq-runtime-2.0.5.xsd">
+
+	<annotation>
+	    <appinfo>
+	        <jaxb:globalBindings>
+	            <xjc:serializable uid="205"/>
+	        </jaxb:globalBindings>
+	    </appinfo>
+	</annotation>
+
+    <element name="settings" type="jooq-runtime:Settings"/>
+
+	<complexType name="Settings">
+		<all>
+			<!-- Configure query rendering properties -->
+			<element name="rendering" type="jooq-runtime:Rendering" minOccurs="0" maxOccurs="1"/>
+
+			<!-- Configure query execution properties -->
+			<element name="execution" type="jooq-runtime:Execution" minOccurs="0" maxOccurs="1"/>
+		</all>
+	</complexType>
+
+	<complexType name="Rendering">
+		<all>
+			<!-- Configure render mapping for runtime schema / table rewriting in
+			     generated SQL -->
+			<element name="renderMapping" type="jooq-runtime:RenderMapping" minOccurs="0" maxOccurs="1"/>
+		</all>
+	</complexType>
+
+	<complexType name="RenderMapping">
+		<all>
+			<!-- The default schema as defined in org.jooq.Schema.getName()
+			     This schema will be omitted in rendered SQL -->
+			<element name="defaultSchema" type="string" minOccurs="0" maxOccurs="1"/>
+
+			<!-- The mapped schemata configuration -->
+			<element name="schemata" type="jooq-runtime:MappedSchemata" minOccurs="0" maxOccurs="1"/>
+		</all>
+	</complexType>
+
+	<complexType name="MappedSchemata">
+		<sequence>
+			<element name="schema" type="jooq-runtime:MappedSchema" minOccurs="0" maxOccurs="unbounded"/>
+		</sequence>
+	</complexType>
+
+	<complexType name="MappedSchema">
+		<all>
+			<!-- The input schema as defined in org.jooq.Schema.getName() -->
+			<element name="input" type="string" minOccurs="1" maxOccurs="1"/>
+
+			<!-- The output schema as it will be rendered in SQL
+			     When this is omitted, you can still apply table mapping -->
+			<element name="output" type="string" minOccurs="0" maxOccurs="1"/>
+
+			<!-- Configure table mapping for runtime table rewriting in
+			     generated SQL -->
+			<element name="tables" type="jooq-runtime:MappedTables" minOccurs="0" maxOccurs="1"/>
+		</all>
+	</complexType>
+
+	<complexType name="MappedTables">
+		<sequence>
+			<element name="table" type="jooq-runtime:MappedTable" minOccurs="0" maxOccurs="unbounded"/>
+		</sequence>
+	</complexType>
+
+	<complexType name="MappedTable">
+		<all>
+			<!-- The input schema as defined in org.jooq.Table.getName() -->
+			<element name="input" type="string" minOccurs="1" maxOccurs="1"/>
+
+			<!-- The output schema as it will be rendered in SQL -->
+			<element name="output" type="string" minOccurs="1" maxOccurs="1"/>
+		</all>
+	</complexType>
+
+	<complexType name="Execution">
+		<all>
+			<!-- The type of statement that is to be executed -->
+			<element name="statementType" type="jooq-runtime:StatementType" minOccurs="0" maxOccurs="1" default="PREPARED_STATEMENT"/>
+		</all>
+	</complexType>
+
+	<simpleType name="StatementType">
+		<restriction base="string">
+			<enumeration value="STATEMENT"/>
+			<enumeration value="PREPARED_STATEMENT"/>
+		</restriction>
+	</simpleType>
+</schema>
\ No newline at end of file