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 88c8903a15..57b7e82530 100644
--- a/jOOQ-codegen/src/main/java/org/jooq/util/DefaultGenerator.java
+++ b/jOOQ-codegen/src/main/java/org/jooq/util/DefaultGenerator.java
@@ -61,7 +61,6 @@ import org.jooq.MasterDataType;
 import org.jooq.Parameter;
 import org.jooq.Record;
 import org.jooq.Result;
-import org.jooq.SQLDialect;
 import org.jooq.Select;
 import org.jooq.Sequence;
 import org.jooq.Table;
@@ -1732,10 +1731,7 @@ public class DefaultGenerator implements Generator {
         printJavadoc(out, "Create a new routine call instance");
         out.println("\tpublic " + strategy.getJavaClassName(routine) + "() {");
         out.print("\t\tsuper(");
-        out.print(SQLDialect.class);
-        out.print(".");
-        out.print(database.getDialect().name());
-        out.print(", \"");
+        out.print("\"");
         out.print(routine.getName());
         out.print("\", ");
         out.print(strategy.getFullJavaIdentifier(schema));
diff --git a/jOOQ-test/examples/org/jooq/examples/mysql/sakila/routines/FilmInStock.java b/jOOQ-test/examples/org/jooq/examples/mysql/sakila/routines/FilmInStock.java
index 85e412e364..344e499234 100644
--- a/jOOQ-test/examples/org/jooq/examples/mysql/sakila/routines/FilmInStock.java
+++ b/jOOQ-test/examples/org/jooq/examples/mysql/sakila/routines/FilmInStock.java
@@ -8,7 +8,7 @@ package org.jooq.examples.mysql.sakila.routines;
  */
 public class FilmInStock extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = -2101392470;
+	private static final long serialVersionUID = -1398821343;
 
 
 	/**
@@ -30,7 +30,7 @@ public class FilmInStock extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 	 * Create a new routine call instance
 	 */
 	public FilmInStock() {
-		super(org.jooq.SQLDialect.MYSQL, "film_in_stock", org.jooq.examples.mysql.sakila.Sakila.SAKILA);
+		super("film_in_stock", org.jooq.examples.mysql.sakila.Sakila.SAKILA);
 
 		addInParameter(P_FILM_ID);
 		addInParameter(P_STORE_ID);
diff --git a/jOOQ-test/examples/org/jooq/examples/mysql/sakila/routines/FilmNotInStock.java b/jOOQ-test/examples/org/jooq/examples/mysql/sakila/routines/FilmNotInStock.java
index 2897ce9fe7..5f37121045 100644
--- a/jOOQ-test/examples/org/jooq/examples/mysql/sakila/routines/FilmNotInStock.java
+++ b/jOOQ-test/examples/org/jooq/examples/mysql/sakila/routines/FilmNotInStock.java
@@ -8,7 +8,7 @@ package org.jooq.examples.mysql.sakila.routines;
  */
 public class FilmNotInStock extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = 1665410204;
+	private static final long serialVersionUID = 136011591;
 
 
 	/**
@@ -30,7 +30,7 @@ public class FilmNotInStock extends org.jooq.impl.AbstractRoutine<java.lang.Void
 	 * Create a new routine call instance
 	 */
 	public FilmNotInStock() {
-		super(org.jooq.SQLDialect.MYSQL, "film_not_in_stock", org.jooq.examples.mysql.sakila.Sakila.SAKILA);
+		super("film_not_in_stock", org.jooq.examples.mysql.sakila.Sakila.SAKILA);
 
 		addInParameter(P_FILM_ID);
 		addInParameter(P_STORE_ID);
diff --git a/jOOQ-test/examples/org/jooq/examples/mysql/sakila/routines/GetCustomerBalance.java b/jOOQ-test/examples/org/jooq/examples/mysql/sakila/routines/GetCustomerBalance.java
index 9c8ccd7ca4..03d36c2e04 100644
--- a/jOOQ-test/examples/org/jooq/examples/mysql/sakila/routines/GetCustomerBalance.java
+++ b/jOOQ-test/examples/org/jooq/examples/mysql/sakila/routines/GetCustomerBalance.java
@@ -8,7 +8,7 @@ package org.jooq.examples.mysql.sakila.routines;
  */
 public class GetCustomerBalance extends org.jooq.impl.AbstractRoutine<java.math.BigDecimal> {
 
-	private static final long serialVersionUID = 1238363717;
+	private static final long serialVersionUID = 1079769348;
 
 
 	/**
@@ -30,7 +30,7 @@ public class GetCustomerBalance extends org.jooq.impl.AbstractRoutine<java.math.
 	 * Create a new routine call instance
 	 */
 	public GetCustomerBalance() {
-		super(org.jooq.SQLDialect.MYSQL, "get_customer_balance", org.jooq.examples.mysql.sakila.Sakila.SAKILA, org.jooq.impl.SQLDataType.DECIMAL);
+		super("get_customer_balance", org.jooq.examples.mysql.sakila.Sakila.SAKILA, org.jooq.impl.SQLDataType.DECIMAL);
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(P_CUSTOMER_ID);
diff --git a/jOOQ-test/examples/org/jooq/examples/mysql/sakila/routines/InventoryHeldByCustomer.java b/jOOQ-test/examples/org/jooq/examples/mysql/sakila/routines/InventoryHeldByCustomer.java
index 7d3ab9c768..7248b1c968 100644
--- a/jOOQ-test/examples/org/jooq/examples/mysql/sakila/routines/InventoryHeldByCustomer.java
+++ b/jOOQ-test/examples/org/jooq/examples/mysql/sakila/routines/InventoryHeldByCustomer.java
@@ -8,7 +8,7 @@ package org.jooq.examples.mysql.sakila.routines;
  */
 public class InventoryHeldByCustomer extends org.jooq.impl.AbstractRoutine<java.lang.Integer> {
 
-	private static final long serialVersionUID = -1179829565;
+	private static final long serialVersionUID = -1873033922;
 
 
 	/**
@@ -25,7 +25,7 @@ public class InventoryHeldByCustomer extends org.jooq.impl.AbstractRoutine<java.
 	 * Create a new routine call instance
 	 */
 	public InventoryHeldByCustomer() {
-		super(org.jooq.SQLDialect.MYSQL, "inventory_held_by_customer", org.jooq.examples.mysql.sakila.Sakila.SAKILA, org.jooq.impl.SQLDataType.INTEGER);
+		super("inventory_held_by_customer", org.jooq.examples.mysql.sakila.Sakila.SAKILA, org.jooq.impl.SQLDataType.INTEGER);
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(P_INVENTORY_ID);
diff --git a/jOOQ-test/examples/org/jooq/examples/mysql/sakila/routines/InventoryInStock.java b/jOOQ-test/examples/org/jooq/examples/mysql/sakila/routines/InventoryInStock.java
index 42f9800e03..16751a7fb3 100644
--- a/jOOQ-test/examples/org/jooq/examples/mysql/sakila/routines/InventoryInStock.java
+++ b/jOOQ-test/examples/org/jooq/examples/mysql/sakila/routines/InventoryInStock.java
@@ -8,7 +8,7 @@ package org.jooq.examples.mysql.sakila.routines;
  */
 public class InventoryInStock extends org.jooq.impl.AbstractRoutine<java.lang.Byte> {
 
-	private static final long serialVersionUID = -407588345;
+	private static final long serialVersionUID = -924685636;
 
 
 	/**
@@ -25,7 +25,7 @@ public class InventoryInStock extends org.jooq.impl.AbstractRoutine<java.lang.By
 	 * Create a new routine call instance
 	 */
 	public InventoryInStock() {
-		super(org.jooq.SQLDialect.MYSQL, "inventory_in_stock", org.jooq.examples.mysql.sakila.Sakila.SAKILA, org.jooq.impl.SQLDataType.TINYINT);
+		super("inventory_in_stock", org.jooq.examples.mysql.sakila.Sakila.SAKILA, org.jooq.impl.SQLDataType.TINYINT);
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(P_INVENTORY_ID);
diff --git a/jOOQ-test/examples/org/jooq/examples/mysql/sakila/routines/RewardsReport.java b/jOOQ-test/examples/org/jooq/examples/mysql/sakila/routines/RewardsReport.java
index 76cbfdaf50..e8cb9e9fc6 100644
--- a/jOOQ-test/examples/org/jooq/examples/mysql/sakila/routines/RewardsReport.java
+++ b/jOOQ-test/examples/org/jooq/examples/mysql/sakila/routines/RewardsReport.java
@@ -10,7 +10,7 @@ package org.jooq.examples.mysql.sakila.routines;
  */
 public class RewardsReport extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = -104106522;
+	private static final long serialVersionUID = 1300386401;
 
 
 	/**
@@ -32,7 +32,7 @@ public class RewardsReport extends org.jooq.impl.AbstractRoutine<java.lang.Void>
 	 * Create a new routine call instance
 	 */
 	public RewardsReport() {
-		super(org.jooq.SQLDialect.MYSQL, "rewards_report", org.jooq.examples.mysql.sakila.Sakila.SAKILA);
+		super("rewards_report", org.jooq.examples.mysql.sakila.Sakila.SAKILA);
 
 		addInParameter(MIN_MONTHLY_PURCHASES);
 		addInParameter(MIN_DOLLAR_AMOUNT_PURCHASED);
diff --git a/jOOQ-test/examples/org/jooq/examples/oracle/sys/packages/dbms_xplan/BuildPlanXml.java b/jOOQ-test/examples/org/jooq/examples/oracle/sys/packages/dbms_xplan/BuildPlanXml.java
index f8b44df20a..f108bdc8b3 100644
--- a/jOOQ-test/examples/org/jooq/examples/oracle/sys/packages/dbms_xplan/BuildPlanXml.java
+++ b/jOOQ-test/examples/org/jooq/examples/oracle/sys/packages/dbms_xplan/BuildPlanXml.java
@@ -8,7 +8,7 @@ package org.jooq.examples.oracle.sys.packages.dbms_xplan;
  */
 public class BuildPlanXml extends org.jooq.impl.AbstractRoutine<java.lang.Object> {
 
-	private static final long serialVersionUID = 841625147;
+	private static final long serialVersionUID = -924109584;
 
 
 	/**
@@ -58,7 +58,7 @@ public class BuildPlanXml extends org.jooq.impl.AbstractRoutine<java.lang.Object
 	 * Create a new routine call instance
 	 */
 	public BuildPlanXml() {
-		super(org.jooq.SQLDialect.ORACLE, "BUILD_PLAN_XML", org.jooq.examples.oracle.sys.Sys.SYS, org.jooq.examples.oracle.sys.packages.DbmsXplan.DBMS_XPLAN, org.jooq.util.oracle.OracleDataType.getDefaultDataType("UNDEFINED"));
+		super("BUILD_PLAN_XML", org.jooq.examples.oracle.sys.Sys.SYS, org.jooq.examples.oracle.sys.packages.DbmsXplan.DBMS_XPLAN, org.jooq.util.oracle.OracleDataType.getDefaultDataType("UNDEFINED"));
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(TABLE_NAME);
diff --git a/jOOQ-test/examples/org/jooq/examples/oracle/sys/packages/dbms_xplan/DiffPlan.java b/jOOQ-test/examples/org/jooq/examples/oracle/sys/packages/dbms_xplan/DiffPlan.java
index 96b6425381..de7272fd7b 100644
--- a/jOOQ-test/examples/org/jooq/examples/oracle/sys/packages/dbms_xplan/DiffPlan.java
+++ b/jOOQ-test/examples/org/jooq/examples/oracle/sys/packages/dbms_xplan/DiffPlan.java
@@ -8,7 +8,7 @@ package org.jooq.examples.oracle.sys.packages.dbms_xplan;
  */
 public class DiffPlan extends org.jooq.impl.AbstractRoutine<java.lang.String> {
 
-	private static final long serialVersionUID = -26015612;
+	private static final long serialVersionUID = 1629200505;
 
 
 	/**
@@ -35,7 +35,7 @@ public class DiffPlan extends org.jooq.impl.AbstractRoutine<java.lang.String> {
 	 * Create a new routine call instance
 	 */
 	public DiffPlan() {
-		super(org.jooq.SQLDialect.ORACLE, "DIFF_PLAN", org.jooq.examples.oracle.sys.Sys.SYS, org.jooq.examples.oracle.sys.packages.DbmsXplan.DBMS_XPLAN, org.jooq.impl.SQLDataType.VARCHAR);
+		super("DIFF_PLAN", org.jooq.examples.oracle.sys.Sys.SYS, org.jooq.examples.oracle.sys.packages.DbmsXplan.DBMS_XPLAN, org.jooq.impl.SQLDataType.VARCHAR);
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(SQL_TEXT);
diff --git a/jOOQ-test/examples/org/jooq/examples/oracle/sys/packages/dbms_xplan/DiffPlanAwr.java b/jOOQ-test/examples/org/jooq/examples/oracle/sys/packages/dbms_xplan/DiffPlanAwr.java
index a9dfcad510..649cc8492c 100644
--- a/jOOQ-test/examples/org/jooq/examples/oracle/sys/packages/dbms_xplan/DiffPlanAwr.java
+++ b/jOOQ-test/examples/org/jooq/examples/oracle/sys/packages/dbms_xplan/DiffPlanAwr.java
@@ -8,7 +8,7 @@ package org.jooq.examples.oracle.sys.packages.dbms_xplan;
  */
 public class DiffPlanAwr extends org.jooq.impl.AbstractRoutine<java.lang.String> {
 
-	private static final long serialVersionUID = 1476319517;
+	private static final long serialVersionUID = -990539502;
 
 
 	/**
@@ -35,7 +35,7 @@ public class DiffPlanAwr extends org.jooq.impl.AbstractRoutine<java.lang.String>
 	 * Create a new routine call instance
 	 */
 	public DiffPlanAwr() {
-		super(org.jooq.SQLDialect.ORACLE, "DIFF_PLAN_AWR", org.jooq.examples.oracle.sys.Sys.SYS, org.jooq.examples.oracle.sys.packages.DbmsXplan.DBMS_XPLAN, org.jooq.impl.SQLDataType.VARCHAR);
+		super("DIFF_PLAN_AWR", org.jooq.examples.oracle.sys.Sys.SYS, org.jooq.examples.oracle.sys.packages.DbmsXplan.DBMS_XPLAN, org.jooq.impl.SQLDataType.VARCHAR);
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(SQL_ID);
diff --git a/jOOQ-test/examples/org/jooq/examples/oracle/sys/packages/dbms_xplan/DiffPlanCursor.java b/jOOQ-test/examples/org/jooq/examples/oracle/sys/packages/dbms_xplan/DiffPlanCursor.java
index d82b292480..ffef38f9c6 100644
--- a/jOOQ-test/examples/org/jooq/examples/oracle/sys/packages/dbms_xplan/DiffPlanCursor.java
+++ b/jOOQ-test/examples/org/jooq/examples/oracle/sys/packages/dbms_xplan/DiffPlanCursor.java
@@ -8,7 +8,7 @@ package org.jooq.examples.oracle.sys.packages.dbms_xplan;
  */
 public class DiffPlanCursor extends org.jooq.impl.AbstractRoutine<java.lang.String> {
 
-	private static final long serialVersionUID = 1324457595;
+	private static final long serialVersionUID = 1728883494;
 
 
 	/**
@@ -35,7 +35,7 @@ public class DiffPlanCursor extends org.jooq.impl.AbstractRoutine<java.lang.Stri
 	 * Create a new routine call instance
 	 */
 	public DiffPlanCursor() {
-		super(org.jooq.SQLDialect.ORACLE, "DIFF_PLAN_CURSOR", org.jooq.examples.oracle.sys.Sys.SYS, org.jooq.examples.oracle.sys.packages.DbmsXplan.DBMS_XPLAN, org.jooq.impl.SQLDataType.VARCHAR);
+		super("DIFF_PLAN_CURSOR", org.jooq.examples.oracle.sys.Sys.SYS, org.jooq.examples.oracle.sys.packages.DbmsXplan.DBMS_XPLAN, org.jooq.impl.SQLDataType.VARCHAR);
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(SQL_ID);
diff --git a/jOOQ-test/examples/org/jooq/examples/oracle/sys/packages/dbms_xplan/DiffPlanOutline.java b/jOOQ-test/examples/org/jooq/examples/oracle/sys/packages/dbms_xplan/DiffPlanOutline.java
index 88ae8f5f8d..f7f799d8cb 100644
--- a/jOOQ-test/examples/org/jooq/examples/oracle/sys/packages/dbms_xplan/DiffPlanOutline.java
+++ b/jOOQ-test/examples/org/jooq/examples/oracle/sys/packages/dbms_xplan/DiffPlanOutline.java
@@ -8,7 +8,7 @@ package org.jooq.examples.oracle.sys.packages.dbms_xplan;
  */
 public class DiffPlanOutline extends org.jooq.impl.AbstractRoutine<java.lang.String> {
 
-	private static final long serialVersionUID = -1261440657;
+	private static final long serialVersionUID = 593228708;
 
 
 	/**
@@ -40,7 +40,7 @@ public class DiffPlanOutline extends org.jooq.impl.AbstractRoutine<java.lang.Str
 	 * Create a new routine call instance
 	 */
 	public DiffPlanOutline() {
-		super(org.jooq.SQLDialect.ORACLE, "DIFF_PLAN_OUTLINE", org.jooq.examples.oracle.sys.Sys.SYS, org.jooq.examples.oracle.sys.packages.DbmsXplan.DBMS_XPLAN, org.jooq.impl.SQLDataType.VARCHAR);
+		super("DIFF_PLAN_OUTLINE", org.jooq.examples.oracle.sys.Sys.SYS, org.jooq.examples.oracle.sys.packages.DbmsXplan.DBMS_XPLAN, org.jooq.impl.SQLDataType.VARCHAR);
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(SQL_TEXT);
diff --git a/jOOQ-test/examples/org/jooq/examples/oracle/sys/packages/dbms_xplan/DiffPlanSqlBaseline.java b/jOOQ-test/examples/org/jooq/examples/oracle/sys/packages/dbms_xplan/DiffPlanSqlBaseline.java
index ac666bdeb0..edce8aa2bb 100644
--- a/jOOQ-test/examples/org/jooq/examples/oracle/sys/packages/dbms_xplan/DiffPlanSqlBaseline.java
+++ b/jOOQ-test/examples/org/jooq/examples/oracle/sys/packages/dbms_xplan/DiffPlanSqlBaseline.java
@@ -8,7 +8,7 @@ package org.jooq.examples.oracle.sys.packages.dbms_xplan;
  */
 public class DiffPlanSqlBaseline extends org.jooq.impl.AbstractRoutine<java.lang.String> {
 
-	private static final long serialVersionUID = 1313887923;
+	private static final long serialVersionUID = -454362456;
 
 
 	/**
@@ -30,7 +30,7 @@ public class DiffPlanSqlBaseline extends org.jooq.impl.AbstractRoutine<java.lang
 	 * Create a new routine call instance
 	 */
 	public DiffPlanSqlBaseline() {
-		super(org.jooq.SQLDialect.ORACLE, "DIFF_PLAN_SQL_BASELINE", org.jooq.examples.oracle.sys.Sys.SYS, org.jooq.examples.oracle.sys.packages.DbmsXplan.DBMS_XPLAN, org.jooq.impl.SQLDataType.VARCHAR);
+		super("DIFF_PLAN_SQL_BASELINE", org.jooq.examples.oracle.sys.Sys.SYS, org.jooq.examples.oracle.sys.packages.DbmsXplan.DBMS_XPLAN, org.jooq.impl.SQLDataType.VARCHAR);
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(BASELINE_PLAN_NAME1);
diff --git a/jOOQ-test/examples/org/jooq/examples/oracle/sys/packages/dbms_xplan/Display.java b/jOOQ-test/examples/org/jooq/examples/oracle/sys/packages/dbms_xplan/Display.java
index f59e66caf0..3b8cb1841a 100644
--- a/jOOQ-test/examples/org/jooq/examples/oracle/sys/packages/dbms_xplan/Display.java
+++ b/jOOQ-test/examples/org/jooq/examples/oracle/sys/packages/dbms_xplan/Display.java
@@ -8,7 +8,7 @@ package org.jooq.examples.oracle.sys.packages.dbms_xplan;
  */
 public class Display extends org.jooq.impl.AbstractRoutine<org.jooq.examples.oracle.sys.udt.records.DbmsXplanTypeTableRecord> {
 
-	private static final long serialVersionUID = -1631181207;
+	private static final long serialVersionUID = 303823828;
 
 
 	/**
@@ -40,7 +40,7 @@ public class Display extends org.jooq.impl.AbstractRoutine<org.jooq.examples.ora
 	 * Create a new routine call instance
 	 */
 	public Display() {
-		super(org.jooq.SQLDialect.ORACLE, "DISPLAY", org.jooq.examples.oracle.sys.Sys.SYS, org.jooq.examples.oracle.sys.packages.DbmsXplan.DBMS_XPLAN, org.jooq.examples.oracle.sys.udt.DbmsXplanType.DBMS_XPLAN_TYPE.getDataType().asArrayDataType(org.jooq.examples.oracle.sys.udt.records.DbmsXplanTypeTableRecord.class));
+		super("DISPLAY", org.jooq.examples.oracle.sys.Sys.SYS, org.jooq.examples.oracle.sys.packages.DbmsXplan.DBMS_XPLAN, org.jooq.examples.oracle.sys.udt.DbmsXplanType.DBMS_XPLAN_TYPE.getDataType().asArrayDataType(org.jooq.examples.oracle.sys.udt.records.DbmsXplanTypeTableRecord.class));
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(TABLE_NAME);
diff --git a/jOOQ-test/examples/org/jooq/examples/oracle/sys/packages/dbms_xplan/DisplayAwr.java b/jOOQ-test/examples/org/jooq/examples/oracle/sys/packages/dbms_xplan/DisplayAwr.java
index c6ee86975f..3aae44aed9 100644
--- a/jOOQ-test/examples/org/jooq/examples/oracle/sys/packages/dbms_xplan/DisplayAwr.java
+++ b/jOOQ-test/examples/org/jooq/examples/oracle/sys/packages/dbms_xplan/DisplayAwr.java
@@ -8,7 +8,7 @@ package org.jooq.examples.oracle.sys.packages.dbms_xplan;
  */
 public class DisplayAwr extends org.jooq.impl.AbstractRoutine<org.jooq.examples.oracle.sys.udt.records.DbmsXplanTypeTableRecord> {
 
-	private static final long serialVersionUID = -2009883404;
+	private static final long serialVersionUID = 1351358879;
 
 
 	/**
@@ -40,7 +40,7 @@ public class DisplayAwr extends org.jooq.impl.AbstractRoutine<org.jooq.examples.
 	 * Create a new routine call instance
 	 */
 	public DisplayAwr() {
-		super(org.jooq.SQLDialect.ORACLE, "DISPLAY_AWR", org.jooq.examples.oracle.sys.Sys.SYS, org.jooq.examples.oracle.sys.packages.DbmsXplan.DBMS_XPLAN, org.jooq.examples.oracle.sys.udt.DbmsXplanType.DBMS_XPLAN_TYPE.getDataType().asArrayDataType(org.jooq.examples.oracle.sys.udt.records.DbmsXplanTypeTableRecord.class));
+		super("DISPLAY_AWR", org.jooq.examples.oracle.sys.Sys.SYS, org.jooq.examples.oracle.sys.packages.DbmsXplan.DBMS_XPLAN, org.jooq.examples.oracle.sys.udt.DbmsXplanType.DBMS_XPLAN_TYPE.getDataType().asArrayDataType(org.jooq.examples.oracle.sys.udt.records.DbmsXplanTypeTableRecord.class));
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(SQL_ID);
diff --git a/jOOQ-test/examples/org/jooq/examples/oracle/sys/packages/dbms_xplan/DisplayCursor.java b/jOOQ-test/examples/org/jooq/examples/oracle/sys/packages/dbms_xplan/DisplayCursor.java
index b63796ef45..b18f0ba479 100644
--- a/jOOQ-test/examples/org/jooq/examples/oracle/sys/packages/dbms_xplan/DisplayCursor.java
+++ b/jOOQ-test/examples/org/jooq/examples/oracle/sys/packages/dbms_xplan/DisplayCursor.java
@@ -8,7 +8,7 @@ package org.jooq.examples.oracle.sys.packages.dbms_xplan;
  */
 public class DisplayCursor extends org.jooq.impl.AbstractRoutine<org.jooq.examples.oracle.sys.udt.records.DbmsXplanTypeTableRecord> {
 
-	private static final long serialVersionUID = -520700923;
+	private static final long serialVersionUID = 725735674;
 
 
 	/**
@@ -35,7 +35,7 @@ public class DisplayCursor extends org.jooq.impl.AbstractRoutine<org.jooq.exampl
 	 * Create a new routine call instance
 	 */
 	public DisplayCursor() {
-		super(org.jooq.SQLDialect.ORACLE, "DISPLAY_CURSOR", org.jooq.examples.oracle.sys.Sys.SYS, org.jooq.examples.oracle.sys.packages.DbmsXplan.DBMS_XPLAN, org.jooq.examples.oracle.sys.udt.DbmsXplanType.DBMS_XPLAN_TYPE.getDataType().asArrayDataType(org.jooq.examples.oracle.sys.udt.records.DbmsXplanTypeTableRecord.class));
+		super("DISPLAY_CURSOR", org.jooq.examples.oracle.sys.Sys.SYS, org.jooq.examples.oracle.sys.packages.DbmsXplan.DBMS_XPLAN, org.jooq.examples.oracle.sys.udt.DbmsXplanType.DBMS_XPLAN_TYPE.getDataType().asArrayDataType(org.jooq.examples.oracle.sys.udt.records.DbmsXplanTypeTableRecord.class));
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(SQL_ID);
diff --git a/jOOQ-test/examples/org/jooq/examples/oracle/sys/packages/dbms_xplan/DisplayPlan.java b/jOOQ-test/examples/org/jooq/examples/oracle/sys/packages/dbms_xplan/DisplayPlan.java
index 0fa748fd0c..a8430396a9 100644
--- a/jOOQ-test/examples/org/jooq/examples/oracle/sys/packages/dbms_xplan/DisplayPlan.java
+++ b/jOOQ-test/examples/org/jooq/examples/oracle/sys/packages/dbms_xplan/DisplayPlan.java
@@ -8,7 +8,7 @@ package org.jooq.examples.oracle.sys.packages.dbms_xplan;
  */
 public class DisplayPlan extends org.jooq.impl.AbstractRoutine<java.lang.String> {
 
-	private static final long serialVersionUID = -850892877;
+	private static final long serialVersionUID = -305042904;
 
 
 	/**
@@ -45,7 +45,7 @@ public class DisplayPlan extends org.jooq.impl.AbstractRoutine<java.lang.String>
 	 * Create a new routine call instance
 	 */
 	public DisplayPlan() {
-		super(org.jooq.SQLDialect.ORACLE, "DISPLAY_PLAN", org.jooq.examples.oracle.sys.Sys.SYS, org.jooq.examples.oracle.sys.packages.DbmsXplan.DBMS_XPLAN, org.jooq.impl.SQLDataType.CLOB);
+		super("DISPLAY_PLAN", org.jooq.examples.oracle.sys.Sys.SYS, org.jooq.examples.oracle.sys.packages.DbmsXplan.DBMS_XPLAN, org.jooq.impl.SQLDataType.CLOB);
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(TABLE_NAME);
diff --git a/jOOQ-test/examples/org/jooq/examples/oracle/sys/packages/dbms_xplan/DisplaySqlPlanBaseline.java b/jOOQ-test/examples/org/jooq/examples/oracle/sys/packages/dbms_xplan/DisplaySqlPlanBaseline.java
index a9cb8534e6..31a355c445 100644
--- a/jOOQ-test/examples/org/jooq/examples/oracle/sys/packages/dbms_xplan/DisplaySqlPlanBaseline.java
+++ b/jOOQ-test/examples/org/jooq/examples/oracle/sys/packages/dbms_xplan/DisplaySqlPlanBaseline.java
@@ -8,7 +8,7 @@ package org.jooq.examples.oracle.sys.packages.dbms_xplan;
  */
 public class DisplaySqlPlanBaseline extends org.jooq.impl.AbstractRoutine<org.jooq.examples.oracle.sys.udt.records.DbmsXplanTypeTableRecord> {
 
-	private static final long serialVersionUID = 1736754896;
+	private static final long serialVersionUID = -973826501;
 
 
 	/**
@@ -35,7 +35,7 @@ public class DisplaySqlPlanBaseline extends org.jooq.impl.AbstractRoutine<org.jo
 	 * Create a new routine call instance
 	 */
 	public DisplaySqlPlanBaseline() {
-		super(org.jooq.SQLDialect.ORACLE, "DISPLAY_SQL_PLAN_BASELINE", org.jooq.examples.oracle.sys.Sys.SYS, org.jooq.examples.oracle.sys.packages.DbmsXplan.DBMS_XPLAN, org.jooq.examples.oracle.sys.udt.DbmsXplanType.DBMS_XPLAN_TYPE.getDataType().asArrayDataType(org.jooq.examples.oracle.sys.udt.records.DbmsXplanTypeTableRecord.class));
+		super("DISPLAY_SQL_PLAN_BASELINE", org.jooq.examples.oracle.sys.Sys.SYS, org.jooq.examples.oracle.sys.packages.DbmsXplan.DBMS_XPLAN, org.jooq.examples.oracle.sys.udt.DbmsXplanType.DBMS_XPLAN_TYPE.getDataType().asArrayDataType(org.jooq.examples.oracle.sys.udt.records.DbmsXplanTypeTableRecord.class));
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(SQL_HANDLE);
diff --git a/jOOQ-test/examples/org/jooq/examples/oracle/sys/packages/dbms_xplan/DisplaySqlset.java b/jOOQ-test/examples/org/jooq/examples/oracle/sys/packages/dbms_xplan/DisplaySqlset.java
index ed9c023b27..6158a965c7 100644
--- a/jOOQ-test/examples/org/jooq/examples/oracle/sys/packages/dbms_xplan/DisplaySqlset.java
+++ b/jOOQ-test/examples/org/jooq/examples/oracle/sys/packages/dbms_xplan/DisplaySqlset.java
@@ -8,7 +8,7 @@ package org.jooq.examples.oracle.sys.packages.dbms_xplan;
  */
 public class DisplaySqlset extends org.jooq.impl.AbstractRoutine<org.jooq.examples.oracle.sys.udt.records.DbmsXplanTypeTableRecord> {
 
-	private static final long serialVersionUID = 463536992;
+	private static final long serialVersionUID = 544915531;
 
 
 	/**
@@ -45,7 +45,7 @@ public class DisplaySqlset extends org.jooq.impl.AbstractRoutine<org.jooq.exampl
 	 * Create a new routine call instance
 	 */
 	public DisplaySqlset() {
-		super(org.jooq.SQLDialect.ORACLE, "DISPLAY_SQLSET", org.jooq.examples.oracle.sys.Sys.SYS, org.jooq.examples.oracle.sys.packages.DbmsXplan.DBMS_XPLAN, org.jooq.examples.oracle.sys.udt.DbmsXplanType.DBMS_XPLAN_TYPE.getDataType().asArrayDataType(org.jooq.examples.oracle.sys.udt.records.DbmsXplanTypeTableRecord.class));
+		super("DISPLAY_SQLSET", org.jooq.examples.oracle.sys.Sys.SYS, org.jooq.examples.oracle.sys.packages.DbmsXplan.DBMS_XPLAN, org.jooq.examples.oracle.sys.udt.DbmsXplanType.DBMS_XPLAN_TYPE.getDataType().asArrayDataType(org.jooq.examples.oracle.sys.udt.records.DbmsXplanTypeTableRecord.class));
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(SQLSET_NAME);
diff --git a/jOOQ-test/examples/org/jooq/examples/oracle/sys/packages/dbms_xplan/FormatNumber.java b/jOOQ-test/examples/org/jooq/examples/oracle/sys/packages/dbms_xplan/FormatNumber.java
index 6b14d40178..585ea147ae 100644
--- a/jOOQ-test/examples/org/jooq/examples/oracle/sys/packages/dbms_xplan/FormatNumber.java
+++ b/jOOQ-test/examples/org/jooq/examples/oracle/sys/packages/dbms_xplan/FormatNumber.java
@@ -8,7 +8,7 @@ package org.jooq.examples.oracle.sys.packages.dbms_xplan;
  */
 public class FormatNumber extends org.jooq.impl.AbstractRoutine<java.lang.String> {
 
-	private static final long serialVersionUID = -499679878;
+	private static final long serialVersionUID = -1315978139;
 
 
 	/**
@@ -25,7 +25,7 @@ public class FormatNumber extends org.jooq.impl.AbstractRoutine<java.lang.String
 	 * Create a new routine call instance
 	 */
 	public FormatNumber() {
-		super(org.jooq.SQLDialect.ORACLE, "FORMAT_NUMBER", org.jooq.examples.oracle.sys.Sys.SYS, org.jooq.examples.oracle.sys.packages.DbmsXplan.DBMS_XPLAN, org.jooq.impl.SQLDataType.VARCHAR);
+		super("FORMAT_NUMBER", org.jooq.examples.oracle.sys.Sys.SYS, org.jooq.examples.oracle.sys.packages.DbmsXplan.DBMS_XPLAN, org.jooq.impl.SQLDataType.VARCHAR);
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(NUM);
diff --git a/jOOQ-test/examples/org/jooq/examples/oracle/sys/packages/dbms_xplan/FormatNumber2.java b/jOOQ-test/examples/org/jooq/examples/oracle/sys/packages/dbms_xplan/FormatNumber2.java
index a09f5a6903..343e617687 100644
--- a/jOOQ-test/examples/org/jooq/examples/oracle/sys/packages/dbms_xplan/FormatNumber2.java
+++ b/jOOQ-test/examples/org/jooq/examples/oracle/sys/packages/dbms_xplan/FormatNumber2.java
@@ -8,7 +8,7 @@ package org.jooq.examples.oracle.sys.packages.dbms_xplan;
  */
 public class FormatNumber2 extends org.jooq.impl.AbstractRoutine<java.lang.String> {
 
-	private static final long serialVersionUID = -859904286;
+	private static final long serialVersionUID = 860763735;
 
 
 	/**
@@ -25,7 +25,7 @@ public class FormatNumber2 extends org.jooq.impl.AbstractRoutine<java.lang.Strin
 	 * Create a new routine call instance
 	 */
 	public FormatNumber2() {
-		super(org.jooq.SQLDialect.ORACLE, "FORMAT_NUMBER2", org.jooq.examples.oracle.sys.Sys.SYS, org.jooq.examples.oracle.sys.packages.DbmsXplan.DBMS_XPLAN, org.jooq.impl.SQLDataType.VARCHAR);
+		super("FORMAT_NUMBER2", org.jooq.examples.oracle.sys.Sys.SYS, org.jooq.examples.oracle.sys.packages.DbmsXplan.DBMS_XPLAN, org.jooq.impl.SQLDataType.VARCHAR);
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(NUM);
diff --git a/jOOQ-test/examples/org/jooq/examples/oracle/sys/packages/dbms_xplan/FormatSize.java b/jOOQ-test/examples/org/jooq/examples/oracle/sys/packages/dbms_xplan/FormatSize.java
index 783905cfa3..2df3067736 100644
--- a/jOOQ-test/examples/org/jooq/examples/oracle/sys/packages/dbms_xplan/FormatSize.java
+++ b/jOOQ-test/examples/org/jooq/examples/oracle/sys/packages/dbms_xplan/FormatSize.java
@@ -8,7 +8,7 @@ package org.jooq.examples.oracle.sys.packages.dbms_xplan;
  */
 public class FormatSize extends org.jooq.impl.AbstractRoutine<java.lang.String> {
 
-	private static final long serialVersionUID = 649815234;
+	private static final long serialVersionUID = 354110061;
 
 
 	/**
@@ -25,7 +25,7 @@ public class FormatSize extends org.jooq.impl.AbstractRoutine<java.lang.String>
 	 * Create a new routine call instance
 	 */
 	public FormatSize() {
-		super(org.jooq.SQLDialect.ORACLE, "FORMAT_SIZE", org.jooq.examples.oracle.sys.Sys.SYS, org.jooq.examples.oracle.sys.packages.DbmsXplan.DBMS_XPLAN, org.jooq.impl.SQLDataType.VARCHAR);
+		super("FORMAT_SIZE", org.jooq.examples.oracle.sys.Sys.SYS, org.jooq.examples.oracle.sys.packages.DbmsXplan.DBMS_XPLAN, org.jooq.impl.SQLDataType.VARCHAR);
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(NUM);
diff --git a/jOOQ-test/examples/org/jooq/examples/oracle/sys/packages/dbms_xplan/FormatSize2.java b/jOOQ-test/examples/org/jooq/examples/oracle/sys/packages/dbms_xplan/FormatSize2.java
index a5a0bbf2a8..bb55af79a7 100644
--- a/jOOQ-test/examples/org/jooq/examples/oracle/sys/packages/dbms_xplan/FormatSize2.java
+++ b/jOOQ-test/examples/org/jooq/examples/oracle/sys/packages/dbms_xplan/FormatSize2.java
@@ -8,7 +8,7 @@ package org.jooq.examples.oracle.sys.packages.dbms_xplan;
  */
 public class FormatSize2 extends org.jooq.impl.AbstractRoutine<java.lang.String> {
 
-	private static final long serialVersionUID = -1290109430;
+	private static final long serialVersionUID = -977301825;
 
 
 	/**
@@ -25,7 +25,7 @@ public class FormatSize2 extends org.jooq.impl.AbstractRoutine<java.lang.String>
 	 * Create a new routine call instance
 	 */
 	public FormatSize2() {
-		super(org.jooq.SQLDialect.ORACLE, "FORMAT_SIZE2", org.jooq.examples.oracle.sys.Sys.SYS, org.jooq.examples.oracle.sys.packages.DbmsXplan.DBMS_XPLAN, org.jooq.impl.SQLDataType.VARCHAR);
+		super("FORMAT_SIZE2", org.jooq.examples.oracle.sys.Sys.SYS, org.jooq.examples.oracle.sys.packages.DbmsXplan.DBMS_XPLAN, org.jooq.impl.SQLDataType.VARCHAR);
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(NUM);
diff --git a/jOOQ-test/examples/org/jooq/examples/oracle/sys/packages/dbms_xplan/FormatTimeS.java b/jOOQ-test/examples/org/jooq/examples/oracle/sys/packages/dbms_xplan/FormatTimeS.java
index 42e1df0a90..4138c6d157 100644
--- a/jOOQ-test/examples/org/jooq/examples/oracle/sys/packages/dbms_xplan/FormatTimeS.java
+++ b/jOOQ-test/examples/org/jooq/examples/oracle/sys/packages/dbms_xplan/FormatTimeS.java
@@ -8,7 +8,7 @@ package org.jooq.examples.oracle.sys.packages.dbms_xplan;
  */
 public class FormatTimeS extends org.jooq.impl.AbstractRoutine<java.lang.String> {
 
-	private static final long serialVersionUID = -457187586;
+	private static final long serialVersionUID = 2039736297;
 
 
 	/**
@@ -25,7 +25,7 @@ public class FormatTimeS extends org.jooq.impl.AbstractRoutine<java.lang.String>
 	 * Create a new routine call instance
 	 */
 	public FormatTimeS() {
-		super(org.jooq.SQLDialect.ORACLE, "FORMAT_TIME_S", org.jooq.examples.oracle.sys.Sys.SYS, org.jooq.examples.oracle.sys.packages.DbmsXplan.DBMS_XPLAN, org.jooq.impl.SQLDataType.VARCHAR);
+		super("FORMAT_TIME_S", org.jooq.examples.oracle.sys.Sys.SYS, org.jooq.examples.oracle.sys.packages.DbmsXplan.DBMS_XPLAN, org.jooq.impl.SQLDataType.VARCHAR);
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(NUM);
diff --git a/jOOQ-test/examples/org/jooq/examples/oracle/sys/packages/dbms_xplan/GetPlandiffReportXml.java b/jOOQ-test/examples/org/jooq/examples/oracle/sys/packages/dbms_xplan/GetPlandiffReportXml.java
index 1b2ea7dd69..2aab31bc82 100644
--- a/jOOQ-test/examples/org/jooq/examples/oracle/sys/packages/dbms_xplan/GetPlandiffReportXml.java
+++ b/jOOQ-test/examples/org/jooq/examples/oracle/sys/packages/dbms_xplan/GetPlandiffReportXml.java
@@ -8,7 +8,7 @@ package org.jooq.examples.oracle.sys.packages.dbms_xplan;
  */
 public class GetPlandiffReportXml extends org.jooq.impl.AbstractRoutine<java.lang.Object> {
 
-	private static final long serialVersionUID = -664101623;
+	private static final long serialVersionUID = 169611380;
 
 
 	/**
@@ -38,7 +38,7 @@ public class GetPlandiffReportXml extends org.jooq.impl.AbstractRoutine<java.lan
 	 * Create a new routine call instance
 	 */
 	public GetPlandiffReportXml() {
-		super(org.jooq.SQLDialect.ORACLE, "GET_PLANDIFF_REPORT_XML", org.jooq.examples.oracle.sys.Sys.SYS, org.jooq.examples.oracle.sys.packages.DbmsXplan.DBMS_XPLAN, org.jooq.util.oracle.OracleDataType.getDefaultDataType("UNDEFINED"));
+		super("GET_PLANDIFF_REPORT_XML", org.jooq.examples.oracle.sys.Sys.SYS, org.jooq.examples.oracle.sys.packages.DbmsXplan.DBMS_XPLAN, org.jooq.util.oracle.OracleDataType.getDefaultDataType("UNDEFINED"));
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(REPORT_REF);
diff --git a/jOOQ-test/examples/org/jooq/examples/oracle/sys/packages/dbms_xplan/PreparePlanXmlQuery.java b/jOOQ-test/examples/org/jooq/examples/oracle/sys/packages/dbms_xplan/PreparePlanXmlQuery.java
index b7640ce394..de82bea997 100644
--- a/jOOQ-test/examples/org/jooq/examples/oracle/sys/packages/dbms_xplan/PreparePlanXmlQuery.java
+++ b/jOOQ-test/examples/org/jooq/examples/oracle/sys/packages/dbms_xplan/PreparePlanXmlQuery.java
@@ -8,7 +8,7 @@ package org.jooq.examples.oracle.sys.packages.dbms_xplan;
  */
 public class PreparePlanXmlQuery extends org.jooq.impl.AbstractRoutine<java.lang.String> {
 
-	private static final long serialVersionUID = -1897106572;
+	private static final long serialVersionUID = -1208991009;
 
 
 	/**
@@ -25,7 +25,7 @@ public class PreparePlanXmlQuery extends org.jooq.impl.AbstractRoutine<java.lang
 	 * Create a new routine call instance
 	 */
 	public PreparePlanXmlQuery() {
-		super(org.jooq.SQLDialect.ORACLE, "PREPARE_PLAN_XML_QUERY", org.jooq.examples.oracle.sys.Sys.SYS, org.jooq.examples.oracle.sys.packages.DbmsXplan.DBMS_XPLAN, org.jooq.impl.SQLDataType.VARCHAR);
+		super("PREPARE_PLAN_XML_QUERY", org.jooq.examples.oracle.sys.Sys.SYS, org.jooq.examples.oracle.sys.packages.DbmsXplan.DBMS_XPLAN, org.jooq.impl.SQLDataType.VARCHAR);
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(PLAN_QUERY);
diff --git a/jOOQ-test/examples/org/jooq/examples/oracle/sys/packages/dbms_xplan/PrepareRecords.java b/jOOQ-test/examples/org/jooq/examples/oracle/sys/packages/dbms_xplan/PrepareRecords.java
index 4a7e9e2c6d..332695438c 100644
--- a/jOOQ-test/examples/org/jooq/examples/oracle/sys/packages/dbms_xplan/PrepareRecords.java
+++ b/jOOQ-test/examples/org/jooq/examples/oracle/sys/packages/dbms_xplan/PrepareRecords.java
@@ -8,7 +8,7 @@ package org.jooq.examples.oracle.sys.packages.dbms_xplan;
  */
 public class PrepareRecords extends org.jooq.impl.AbstractRoutine<org.jooq.examples.oracle.sys.udt.records.DbmsXplanTypeTableRecord> {
 
-	private static final long serialVersionUID = 1188041584;
+	private static final long serialVersionUID = 1327322139;
 
 
 	/**
@@ -30,7 +30,7 @@ public class PrepareRecords extends org.jooq.impl.AbstractRoutine<org.jooq.examp
 	 * Create a new routine call instance
 	 */
 	public PrepareRecords() {
-		super(org.jooq.SQLDialect.ORACLE, "PREPARE_RECORDS", org.jooq.examples.oracle.sys.Sys.SYS, org.jooq.examples.oracle.sys.packages.DbmsXplan.DBMS_XPLAN, org.jooq.examples.oracle.sys.udt.DbmsXplanType.DBMS_XPLAN_TYPE.getDataType().asArrayDataType(org.jooq.examples.oracle.sys.udt.records.DbmsXplanTypeTableRecord.class));
+		super("PREPARE_RECORDS", org.jooq.examples.oracle.sys.Sys.SYS, org.jooq.examples.oracle.sys.packages.DbmsXplan.DBMS_XPLAN, org.jooq.examples.oracle.sys.udt.DbmsXplanType.DBMS_XPLAN_TYPE.getDataType().asArrayDataType(org.jooq.examples.oracle.sys.udt.records.DbmsXplanTypeTableRecord.class));
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(PLAN_CUR);
diff --git a/jOOQ-test/examples/org/jooq/examples/oracle/sys/packages/dbms_xplan/ValidateFormat.java b/jOOQ-test/examples/org/jooq/examples/oracle/sys/packages/dbms_xplan/ValidateFormat.java
index 6ef6b8bb38..4028b0a3ce 100644
--- a/jOOQ-test/examples/org/jooq/examples/oracle/sys/packages/dbms_xplan/ValidateFormat.java
+++ b/jOOQ-test/examples/org/jooq/examples/oracle/sys/packages/dbms_xplan/ValidateFormat.java
@@ -8,7 +8,7 @@ package org.jooq.examples.oracle.sys.packages.dbms_xplan;
  */
 public class ValidateFormat extends org.jooq.impl.AbstractRoutine<java.lang.Object> {
 
-	private static final long serialVersionUID = -1047665620;
+	private static final long serialVersionUID = 1376721367;
 
 
 	/**
@@ -41,7 +41,7 @@ public class ValidateFormat extends org.jooq.impl.AbstractRoutine<java.lang.Obje
 	 * Create a new routine call instance
 	 */
 	public ValidateFormat() {
-		super(org.jooq.SQLDialect.ORACLE, "VALIDATE_FORMAT", org.jooq.examples.oracle.sys.Sys.SYS, org.jooq.examples.oracle.sys.packages.DbmsXplan.DBMS_XPLAN, org.jooq.util.oracle.OracleDataType.getDefaultDataType("PL/SQL BOOLEAN"));
+		super("VALIDATE_FORMAT", org.jooq.examples.oracle.sys.Sys.SYS, org.jooq.examples.oracle.sys.packages.DbmsXplan.DBMS_XPLAN, org.jooq.util.oracle.OracleDataType.getDefaultDataType("PL/SQL BOOLEAN"));
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(HASPLANSTATS);
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/routines/Ufngetaccountingenddate.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/routines/Ufngetaccountingenddate.java
index 0b7fdec8a6..16ae307bd7 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/routines/Ufngetaccountingenddate.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/routines/Ufngetaccountingenddate.java
@@ -8,7 +8,7 @@ package org.jooq.examples.sqlserver.adventureworks.dbo.routines;
  */
 public class Ufngetaccountingenddate extends org.jooq.impl.AbstractRoutine<java.sql.Timestamp> {
 
-	private static final long serialVersionUID = 1822719901;
+	private static final long serialVersionUID = -1298575809;
 
 
 	/**
@@ -20,7 +20,7 @@ public class Ufngetaccountingenddate extends org.jooq.impl.AbstractRoutine<java.
 	 * Create a new routine call instance
 	 */
 	public Ufngetaccountingenddate() {
-		super(org.jooq.SQLDialect.SQLSERVER, "ufnGetAccountingEndDate", org.jooq.examples.sqlserver.adventureworks.dbo.Dbo.DBO, org.jooq.impl.SQLDataType.TIMESTAMP);
+		super("ufnGetAccountingEndDate", org.jooq.examples.sqlserver.adventureworks.dbo.Dbo.DBO, org.jooq.impl.SQLDataType.TIMESTAMP);
 
 		setReturnParameter(RETURN_VALUE);
 	}
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/routines/Ufngetaccountingstartdate.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/routines/Ufngetaccountingstartdate.java
index 7c0aca9b13..0e467640dd 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/routines/Ufngetaccountingstartdate.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/routines/Ufngetaccountingstartdate.java
@@ -8,7 +8,7 @@ package org.jooq.examples.sqlserver.adventureworks.dbo.routines;
  */
 public class Ufngetaccountingstartdate extends org.jooq.impl.AbstractRoutine<java.sql.Timestamp> {
 
-	private static final long serialVersionUID = -1675116056;
+	private static final long serialVersionUID = -1534871450;
 
 
 	/**
@@ -20,7 +20,7 @@ public class Ufngetaccountingstartdate extends org.jooq.impl.AbstractRoutine<jav
 	 * Create a new routine call instance
 	 */
 	public Ufngetaccountingstartdate() {
-		super(org.jooq.SQLDialect.SQLSERVER, "ufnGetAccountingStartDate", org.jooq.examples.sqlserver.adventureworks.dbo.Dbo.DBO, org.jooq.impl.SQLDataType.TIMESTAMP);
+		super("ufnGetAccountingStartDate", org.jooq.examples.sqlserver.adventureworks.dbo.Dbo.DBO, org.jooq.impl.SQLDataType.TIMESTAMP);
 
 		setReturnParameter(RETURN_VALUE);
 	}
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/routines/Ufngetcontactinformation.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/routines/Ufngetcontactinformation.java
index 6d75cc12fa..649359d142 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/routines/Ufngetcontactinformation.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/routines/Ufngetcontactinformation.java
@@ -8,7 +8,7 @@ package org.jooq.examples.sqlserver.adventureworks.dbo.routines;
  */
 public class Ufngetcontactinformation extends org.jooq.impl.AbstractRoutine<java.lang.Object> {
 
-	private static final long serialVersionUID = 1768070995;
+	private static final long serialVersionUID = 1636143209;
 
 
 	/**
@@ -28,7 +28,7 @@ public class Ufngetcontactinformation extends org.jooq.impl.AbstractRoutine<java
 	 * Create a new routine call instance
 	 */
 	public Ufngetcontactinformation() {
-		super(org.jooq.SQLDialect.SQLSERVER, "ufnGetContactInformation", org.jooq.examples.sqlserver.adventureworks.dbo.Dbo.DBO, org.jooq.util.sqlserver.SQLServerDataType.getDefaultDataType("TABLE"));
+		super("ufnGetContactInformation", org.jooq.examples.sqlserver.adventureworks.dbo.Dbo.DBO, org.jooq.util.sqlserver.SQLServerDataType.getDefaultDataType("TABLE"));
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(CONTACTID);
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/routines/Ufngetdocumentstatustext.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/routines/Ufngetdocumentstatustext.java
index 32d9a8c81e..497ab5ec66 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/routines/Ufngetdocumentstatustext.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/routines/Ufngetdocumentstatustext.java
@@ -8,7 +8,7 @@ package org.jooq.examples.sqlserver.adventureworks.dbo.routines;
  */
 public class Ufngetdocumentstatustext extends org.jooq.impl.AbstractRoutine<java.lang.String> {
 
-	private static final long serialVersionUID = 1663601478;
+	private static final long serialVersionUID = 830575178;
 
 
 	/**
@@ -25,7 +25,7 @@ public class Ufngetdocumentstatustext extends org.jooq.impl.AbstractRoutine<java
 	 * Create a new routine call instance
 	 */
 	public Ufngetdocumentstatustext() {
-		super(org.jooq.SQLDialect.SQLSERVER, "ufnGetDocumentStatusText", org.jooq.examples.sqlserver.adventureworks.dbo.Dbo.DBO, org.jooq.impl.SQLDataType.NVARCHAR);
+		super("ufnGetDocumentStatusText", org.jooq.examples.sqlserver.adventureworks.dbo.Dbo.DBO, org.jooq.impl.SQLDataType.NVARCHAR);
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(STATUS);
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/routines/Ufngetproductdealerprice.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/routines/Ufngetproductdealerprice.java
index 0234225bf6..31c5e6fda1 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/routines/Ufngetproductdealerprice.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/routines/Ufngetproductdealerprice.java
@@ -8,7 +8,7 @@ package org.jooq.examples.sqlserver.adventureworks.dbo.routines;
  */
 public class Ufngetproductdealerprice extends org.jooq.impl.AbstractRoutine<java.math.BigDecimal> {
 
-	private static final long serialVersionUID = 1367886330;
+	private static final long serialVersionUID = -745857806;
 
 
 	/**
@@ -30,7 +30,7 @@ public class Ufngetproductdealerprice extends org.jooq.impl.AbstractRoutine<java
 	 * Create a new routine call instance
 	 */
 	public Ufngetproductdealerprice() {
-		super(org.jooq.SQLDialect.SQLSERVER, "ufnGetProductDealerPrice", org.jooq.examples.sqlserver.adventureworks.dbo.Dbo.DBO, org.jooq.impl.SQLDataType.NUMERIC);
+		super("ufnGetProductDealerPrice", org.jooq.examples.sqlserver.adventureworks.dbo.Dbo.DBO, org.jooq.impl.SQLDataType.NUMERIC);
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(PRODUCTID);
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/routines/Ufngetproductlistprice.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/routines/Ufngetproductlistprice.java
index 14855133ae..47a50b1dae 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/routines/Ufngetproductlistprice.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/routines/Ufngetproductlistprice.java
@@ -8,7 +8,7 @@ package org.jooq.examples.sqlserver.adventureworks.dbo.routines;
  */
 public class Ufngetproductlistprice extends org.jooq.impl.AbstractRoutine<java.math.BigDecimal> {
 
-	private static final long serialVersionUID = 1727048693;
+	private static final long serialVersionUID = 1494131649;
 
 
 	/**
@@ -30,7 +30,7 @@ public class Ufngetproductlistprice extends org.jooq.impl.AbstractRoutine<java.m
 	 * Create a new routine call instance
 	 */
 	public Ufngetproductlistprice() {
-		super(org.jooq.SQLDialect.SQLSERVER, "ufnGetProductListPrice", org.jooq.examples.sqlserver.adventureworks.dbo.Dbo.DBO, org.jooq.impl.SQLDataType.NUMERIC);
+		super("ufnGetProductListPrice", org.jooq.examples.sqlserver.adventureworks.dbo.Dbo.DBO, org.jooq.impl.SQLDataType.NUMERIC);
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(PRODUCTID);
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/routines/Ufngetproductstandardcost.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/routines/Ufngetproductstandardcost.java
index 96a6d1fc73..3d06f39edd 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/routines/Ufngetproductstandardcost.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/routines/Ufngetproductstandardcost.java
@@ -8,7 +8,7 @@ package org.jooq.examples.sqlserver.adventureworks.dbo.routines;
  */
 public class Ufngetproductstandardcost extends org.jooq.impl.AbstractRoutine<java.math.BigDecimal> {
 
-	private static final long serialVersionUID = 1568915080;
+	private static final long serialVersionUID = -205622584;
 
 
 	/**
@@ -30,7 +30,7 @@ public class Ufngetproductstandardcost extends org.jooq.impl.AbstractRoutine<jav
 	 * Create a new routine call instance
 	 */
 	public Ufngetproductstandardcost() {
-		super(org.jooq.SQLDialect.SQLSERVER, "ufnGetProductStandardCost", org.jooq.examples.sqlserver.adventureworks.dbo.Dbo.DBO, org.jooq.impl.SQLDataType.NUMERIC);
+		super("ufnGetProductStandardCost", org.jooq.examples.sqlserver.adventureworks.dbo.Dbo.DBO, org.jooq.impl.SQLDataType.NUMERIC);
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(PRODUCTID);
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/routines/Ufngetpurchaseorderstatustext.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/routines/Ufngetpurchaseorderstatustext.java
index 5aa273c81d..f0ca9e8923 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/routines/Ufngetpurchaseorderstatustext.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/routines/Ufngetpurchaseorderstatustext.java
@@ -8,7 +8,7 @@ package org.jooq.examples.sqlserver.adventureworks.dbo.routines;
  */
 public class Ufngetpurchaseorderstatustext extends org.jooq.impl.AbstractRoutine<java.lang.String> {
 
-	private static final long serialVersionUID = 674216456;
+	private static final long serialVersionUID = -1313601352;
 
 
 	/**
@@ -25,7 +25,7 @@ public class Ufngetpurchaseorderstatustext extends org.jooq.impl.AbstractRoutine
 	 * Create a new routine call instance
 	 */
 	public Ufngetpurchaseorderstatustext() {
-		super(org.jooq.SQLDialect.SQLSERVER, "ufnGetPurchaseOrderStatusText", org.jooq.examples.sqlserver.adventureworks.dbo.Dbo.DBO, org.jooq.impl.SQLDataType.NVARCHAR);
+		super("ufnGetPurchaseOrderStatusText", org.jooq.examples.sqlserver.adventureworks.dbo.Dbo.DBO, org.jooq.impl.SQLDataType.NVARCHAR);
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(STATUS);
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/routines/Ufngetsalesorderstatustext.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/routines/Ufngetsalesorderstatustext.java
index 16fe248ec4..1aeb9a4f4f 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/routines/Ufngetsalesorderstatustext.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/routines/Ufngetsalesorderstatustext.java
@@ -8,7 +8,7 @@ package org.jooq.examples.sqlserver.adventureworks.dbo.routines;
  */
 public class Ufngetsalesorderstatustext extends org.jooq.impl.AbstractRoutine<java.lang.String> {
 
-	private static final long serialVersionUID = 1435616749;
+	private static final long serialVersionUID = 1866693781;
 
 
 	/**
@@ -25,7 +25,7 @@ public class Ufngetsalesorderstatustext extends org.jooq.impl.AbstractRoutine<ja
 	 * Create a new routine call instance
 	 */
 	public Ufngetsalesorderstatustext() {
-		super(org.jooq.SQLDialect.SQLSERVER, "ufnGetSalesOrderStatusText", org.jooq.examples.sqlserver.adventureworks.dbo.Dbo.DBO, org.jooq.impl.SQLDataType.NVARCHAR);
+		super("ufnGetSalesOrderStatusText", org.jooq.examples.sqlserver.adventureworks.dbo.Dbo.DBO, org.jooq.impl.SQLDataType.NVARCHAR);
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(STATUS);
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/routines/Ufngetstock.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/routines/Ufngetstock.java
index 3c18cc2670..64e07af43b 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/routines/Ufngetstock.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/routines/Ufngetstock.java
@@ -8,7 +8,7 @@ package org.jooq.examples.sqlserver.adventureworks.dbo.routines;
  */
 public class Ufngetstock extends org.jooq.impl.AbstractRoutine<java.lang.Integer> {
 
-	private static final long serialVersionUID = -1565491317;
+	private static final long serialVersionUID = 292621223;
 
 
 	/**
@@ -25,7 +25,7 @@ public class Ufngetstock extends org.jooq.impl.AbstractRoutine<java.lang.Integer
 	 * Create a new routine call instance
 	 */
 	public Ufngetstock() {
-		super(org.jooq.SQLDialect.SQLSERVER, "ufnGetStock", org.jooq.examples.sqlserver.adventureworks.dbo.Dbo.DBO, org.jooq.impl.SQLDataType.INTEGER);
+		super("ufnGetStock", org.jooq.examples.sqlserver.adventureworks.dbo.Dbo.DBO, org.jooq.impl.SQLDataType.INTEGER);
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(PRODUCTID);
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/routines/Ufnleadingzeros.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/routines/Ufnleadingzeros.java
index c2a4a1cc21..13aade4bb9 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/routines/Ufnleadingzeros.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/routines/Ufnleadingzeros.java
@@ -8,7 +8,7 @@ package org.jooq.examples.sqlserver.adventureworks.dbo.routines;
  */
 public class Ufnleadingzeros extends org.jooq.impl.AbstractRoutine<java.lang.String> {
 
-	private static final long serialVersionUID = 1209535429;
+	private static final long serialVersionUID = -1498764545;
 
 
 	/**
@@ -25,7 +25,7 @@ public class Ufnleadingzeros extends org.jooq.impl.AbstractRoutine<java.lang.Str
 	 * Create a new routine call instance
 	 */
 	public Ufnleadingzeros() {
-		super(org.jooq.SQLDialect.SQLSERVER, "ufnLeadingZeros", org.jooq.examples.sqlserver.adventureworks.dbo.Dbo.DBO, org.jooq.impl.SQLDataType.VARCHAR);
+		super("ufnLeadingZeros", org.jooq.examples.sqlserver.adventureworks.dbo.Dbo.DBO, org.jooq.impl.SQLDataType.VARCHAR);
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(VALUE);
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/routines/Uspgetbillofmaterials.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/routines/Uspgetbillofmaterials.java
index 0329553f0f..ee9ef73ab0 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/routines/Uspgetbillofmaterials.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/routines/Uspgetbillofmaterials.java
@@ -8,7 +8,7 @@ package org.jooq.examples.sqlserver.adventureworks.dbo.routines;
  */
 public class Uspgetbillofmaterials extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = -1518305889;
+	private static final long serialVersionUID = 2120177495;
 
 
 	/**
@@ -25,7 +25,7 @@ public class Uspgetbillofmaterials extends org.jooq.impl.AbstractRoutine<java.la
 	 * Create a new routine call instance
 	 */
 	public Uspgetbillofmaterials() {
-		super(org.jooq.SQLDialect.SQLSERVER, "uspGetBillOfMaterials", org.jooq.examples.sqlserver.adventureworks.dbo.Dbo.DBO);
+		super("uspGetBillOfMaterials", org.jooq.examples.sqlserver.adventureworks.dbo.Dbo.DBO);
 
 		addInParameter(STARTPRODUCTID);
 		addInParameter(CHECKDATE);
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/routines/Uspgetemployeemanagers.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/routines/Uspgetemployeemanagers.java
index 380cd0fa84..77ff7528ee 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/routines/Uspgetemployeemanagers.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/routines/Uspgetemployeemanagers.java
@@ -8,7 +8,7 @@ package org.jooq.examples.sqlserver.adventureworks.dbo.routines;
  */
 public class Uspgetemployeemanagers extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = -2052262546;
+	private static final long serialVersionUID = -272877800;
 
 
 	/**
@@ -20,7 +20,7 @@ public class Uspgetemployeemanagers extends org.jooq.impl.AbstractRoutine<java.l
 	 * Create a new routine call instance
 	 */
 	public Uspgetemployeemanagers() {
-		super(org.jooq.SQLDialect.SQLSERVER, "uspGetEmployeeManagers", org.jooq.examples.sqlserver.adventureworks.dbo.Dbo.DBO);
+		super("uspGetEmployeeManagers", org.jooq.examples.sqlserver.adventureworks.dbo.Dbo.DBO);
 
 		addInParameter(EMPLOYEEID);
 	}
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/routines/Uspgetmanageremployees.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/routines/Uspgetmanageremployees.java
index a5824b23d8..730bb5c3fb 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/routines/Uspgetmanageremployees.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/routines/Uspgetmanageremployees.java
@@ -8,7 +8,7 @@ package org.jooq.examples.sqlserver.adventureworks.dbo.routines;
  */
 public class Uspgetmanageremployees extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = -895001312;
+	private static final long serialVersionUID = -590724594;
 
 
 	/**
@@ -20,7 +20,7 @@ public class Uspgetmanageremployees extends org.jooq.impl.AbstractRoutine<java.l
 	 * Create a new routine call instance
 	 */
 	public Uspgetmanageremployees() {
-		super(org.jooq.SQLDialect.SQLSERVER, "uspGetManagerEmployees", org.jooq.examples.sqlserver.adventureworks.dbo.Dbo.DBO);
+		super("uspGetManagerEmployees", org.jooq.examples.sqlserver.adventureworks.dbo.Dbo.DBO);
 
 		addInParameter(MANAGERID);
 	}
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/routines/Uspgetwhereusedproductid.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/routines/Uspgetwhereusedproductid.java
index b7ab737587..351caf3205 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/routines/Uspgetwhereusedproductid.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/routines/Uspgetwhereusedproductid.java
@@ -8,7 +8,7 @@ package org.jooq.examples.sqlserver.adventureworks.dbo.routines;
  */
 public class Uspgetwhereusedproductid extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = 2006420459;
+	private static final long serialVersionUID = -1346701541;
 
 
 	/**
@@ -25,7 +25,7 @@ public class Uspgetwhereusedproductid extends org.jooq.impl.AbstractRoutine<java
 	 * Create a new routine call instance
 	 */
 	public Uspgetwhereusedproductid() {
-		super(org.jooq.SQLDialect.SQLSERVER, "uspGetWhereUsedProductID", org.jooq.examples.sqlserver.adventureworks.dbo.Dbo.DBO);
+		super("uspGetWhereUsedProductID", org.jooq.examples.sqlserver.adventureworks.dbo.Dbo.DBO);
 
 		addInParameter(STARTPRODUCTID);
 		addInParameter(CHECKDATE);
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/routines/Usplogerror.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/routines/Usplogerror.java
index b2ef394e4a..b29b47790d 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/routines/Usplogerror.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/routines/Usplogerror.java
@@ -8,7 +8,7 @@ package org.jooq.examples.sqlserver.adventureworks.dbo.routines;
  */
 public class Usplogerror extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = 1205552959;
+	private static final long serialVersionUID = 1561605041;
 
 
 	/**
@@ -20,7 +20,7 @@ public class Usplogerror extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 	 * Create a new routine call instance
 	 */
 	public Usplogerror() {
-		super(org.jooq.SQLDialect.SQLSERVER, "uspLogError", org.jooq.examples.sqlserver.adventureworks.dbo.Dbo.DBO);
+		super("uspLogError", org.jooq.examples.sqlserver.adventureworks.dbo.Dbo.DBO);
 
 		addInOutParameter(ERRORLOGID);
 	}
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/routines/Uspprinterror.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/routines/Uspprinterror.java
index 6d61c064b0..e8032994ac 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/routines/Uspprinterror.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/routines/Uspprinterror.java
@@ -8,13 +8,13 @@ package org.jooq.examples.sqlserver.adventureworks.dbo.routines;
  */
 public class Uspprinterror extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = -1015896184;
+	private static final long serialVersionUID = -1542888904;
 
 
 	/**
 	 * Create a new routine call instance
 	 */
 	public Uspprinterror() {
-		super(org.jooq.SQLDialect.SQLSERVER, "uspPrintError", org.jooq.examples.sqlserver.adventureworks.dbo.Dbo.DBO);
+		super("uspPrintError", org.jooq.examples.sqlserver.adventureworks.dbo.Dbo.DBO);
 	}
 }
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/routines/Uspupdateemployeehireinfo.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/routines/Uspupdateemployeehireinfo.java
index a9751f1535..a04e62b029 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/routines/Uspupdateemployeehireinfo.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/routines/Uspupdateemployeehireinfo.java
@@ -8,7 +8,7 @@ package org.jooq.examples.sqlserver.adventureworks.humanresources.routines;
  */
 public class Uspupdateemployeehireinfo extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = -2140094999;
+	private static final long serialVersionUID = 797195309;
 
 
 	/**
@@ -50,7 +50,7 @@ public class Uspupdateemployeehireinfo extends org.jooq.impl.AbstractRoutine<jav
 	 * Create a new routine call instance
 	 */
 	public Uspupdateemployeehireinfo() {
-		super(org.jooq.SQLDialect.SQLSERVER, "uspUpdateEmployeeHireInfo", org.jooq.examples.sqlserver.adventureworks.humanresources.Humanresources.HUMANRESOURCES);
+		super("uspUpdateEmployeeHireInfo", org.jooq.examples.sqlserver.adventureworks.humanresources.Humanresources.HUMANRESOURCES);
 
 		addInParameter(EMPLOYEEID);
 		addInParameter(TITLE);
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/routines/Uspupdateemployeelogin.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/routines/Uspupdateemployeelogin.java
index 3967857cf6..1c1bdfab85 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/routines/Uspupdateemployeelogin.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/routines/Uspupdateemployeelogin.java
@@ -8,7 +8,7 @@ package org.jooq.examples.sqlserver.adventureworks.humanresources.routines;
  */
 public class Uspupdateemployeelogin extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = -348747616;
+	private static final long serialVersionUID = 691031632;
 
 
 	/**
@@ -45,7 +45,7 @@ public class Uspupdateemployeelogin extends org.jooq.impl.AbstractRoutine<java.l
 	 * Create a new routine call instance
 	 */
 	public Uspupdateemployeelogin() {
-		super(org.jooq.SQLDialect.SQLSERVER, "uspUpdateEmployeeLogin", org.jooq.examples.sqlserver.adventureworks.humanresources.Humanresources.HUMANRESOURCES);
+		super("uspUpdateEmployeeLogin", org.jooq.examples.sqlserver.adventureworks.humanresources.Humanresources.HUMANRESOURCES);
 
 		addInParameter(EMPLOYEEID);
 		addInParameter(MANAGERID);
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/routines/Uspupdateemployeepersonalinfo.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/routines/Uspupdateemployeepersonalinfo.java
index ac9ae572fe..64c18b61b0 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/routines/Uspupdateemployeepersonalinfo.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/routines/Uspupdateemployeepersonalinfo.java
@@ -8,7 +8,7 @@ package org.jooq.examples.sqlserver.adventureworks.humanresources.routines;
  */
 public class Uspupdateemployeepersonalinfo extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = 1948652912;
+	private static final long serialVersionUID = -2090327500;
 
 
 	/**
@@ -40,7 +40,7 @@ public class Uspupdateemployeepersonalinfo extends org.jooq.impl.AbstractRoutine
 	 * Create a new routine call instance
 	 */
 	public Uspupdateemployeepersonalinfo() {
-		super(org.jooq.SQLDialect.SQLSERVER, "uspUpdateEmployeePersonalInfo", org.jooq.examples.sqlserver.adventureworks.humanresources.Humanresources.HUMANRESOURCES);
+		super("uspUpdateEmployeePersonalInfo", org.jooq.examples.sqlserver.adventureworks.humanresources.Humanresources.HUMANRESOURCES);
 
 		addInParameter(EMPLOYEEID);
 		addInParameter(NATIONALIDNUMBER);
diff --git a/jOOQ-test/src/org/jooq/test/ase/generatedclasses/enums/TLanguage.java b/jOOQ-test/src/org/jooq/test/ase/generatedclasses/enums/TLanguage.java
index c78c915f3a..56f990abae 100644
--- a/jOOQ-test/src/org/jooq/test/ase/generatedclasses/enums/TLanguage.java
+++ b/jOOQ-test/src/org/jooq/test/ase/generatedclasses/enums/TLanguage.java
@@ -7,22 +7,6 @@ package org.jooq.test.ase.generatedclasses.enums;
  * This class is generated by jOOQ.
  */
 public enum TLanguage implements org.jooq.MasterDataType<java.lang.Integer> {
-
-	/**
-	 * English
-	 */
-	en(1, "en", "English"),
-
-	/**
-	 * Deutsch
-	 */
-	de(2, "de", "Deutsch"),
-
-	/**
-	 * Français
-	 */
-	fr(3, "fr", "Français"),
-	pt(4, "pt", null),
 	;
 
 	private final java.lang.Integer id;
diff --git a/jOOQ-test/src/org/jooq/test/ase/generatedclasses/enums/T_658_11.java b/jOOQ-test/src/org/jooq/test/ase/generatedclasses/enums/T_658_11.java
index 308f73dbf1..726060e3ca 100644
--- a/jOOQ-test/src/org/jooq/test/ase/generatedclasses/enums/T_658_11.java
+++ b/jOOQ-test/src/org/jooq/test/ase/generatedclasses/enums/T_658_11.java
@@ -7,21 +7,6 @@ package org.jooq.test.ase.generatedclasses.enums;
  * This class is generated by jOOQ.
  */
 public enum T_658_11 implements org.jooq.MasterDataType<java.lang.String> {
-
-	/**
-	 * A  
-	 */
-	A__("A  "),
-
-	/**
-	 * B  
-	 */
-	B__("B  "),
-
-	/**
-	 * C  
-	 */
-	C__("C  "),
 	;
 
 	private final java.lang.String id;
diff --git a/jOOQ-test/src/org/jooq/test/ase/generatedclasses/enums/T_658_12.java b/jOOQ-test/src/org/jooq/test/ase/generatedclasses/enums/T_658_12.java
index ef68f32f74..2679ef98b3 100644
--- a/jOOQ-test/src/org/jooq/test/ase/generatedclasses/enums/T_658_12.java
+++ b/jOOQ-test/src/org/jooq/test/ase/generatedclasses/enums/T_658_12.java
@@ -7,21 +7,6 @@ package org.jooq.test.ase.generatedclasses.enums;
  * This class is generated by jOOQ.
  */
 public enum T_658_12 implements org.jooq.MasterDataType<java.lang.String> {
-
-	/**
-	 * A  
-	 */
-	A__("A  ", "A  "),
-
-	/**
-	 * B  
-	 */
-	B__("B  ", "B  "),
-
-	/**
-	 * C  
-	 */
-	C__("C  ", "C  "),
 	;
 
 	private final java.lang.String id;
diff --git a/jOOQ-test/src/org/jooq/test/ase/generatedclasses/enums/T_658_21.java b/jOOQ-test/src/org/jooq/test/ase/generatedclasses/enums/T_658_21.java
index 208afb3868..16862247c5 100644
--- a/jOOQ-test/src/org/jooq/test/ase/generatedclasses/enums/T_658_21.java
+++ b/jOOQ-test/src/org/jooq/test/ase/generatedclasses/enums/T_658_21.java
@@ -7,21 +7,6 @@ package org.jooq.test.ase.generatedclasses.enums;
  * This class is generated by jOOQ.
  */
 public enum T_658_21 implements org.jooq.MasterDataType<java.lang.Integer> {
-
-	/**
-	 * 1
-	 */
-	_1(1),
-
-	/**
-	 * 2
-	 */
-	_2(2),
-
-	/**
-	 * 3
-	 */
-	_3(3),
 	;
 
 	private final java.lang.Integer id;
diff --git a/jOOQ-test/src/org/jooq/test/ase/generatedclasses/enums/T_658_22.java b/jOOQ-test/src/org/jooq/test/ase/generatedclasses/enums/T_658_22.java
index 216f6f8a62..1cc59bfc60 100644
--- a/jOOQ-test/src/org/jooq/test/ase/generatedclasses/enums/T_658_22.java
+++ b/jOOQ-test/src/org/jooq/test/ase/generatedclasses/enums/T_658_22.java
@@ -7,21 +7,6 @@ package org.jooq.test.ase.generatedclasses.enums;
  * This class is generated by jOOQ.
  */
 public enum T_658_22 implements org.jooq.MasterDataType<java.lang.Integer> {
-
-	/**
-	 * 1
-	 */
-	_1(1, 1),
-
-	/**
-	 * 2
-	 */
-	_2(2, 2),
-
-	/**
-	 * 3
-	 */
-	_3(3, 3),
 	;
 
 	private final java.lang.Integer id;
diff --git a/jOOQ-test/src/org/jooq/test/ase/generatedclasses/enums/T_658_31.java b/jOOQ-test/src/org/jooq/test/ase/generatedclasses/enums/T_658_31.java
index 14ccc9f11b..18167ecd70 100644
--- a/jOOQ-test/src/org/jooq/test/ase/generatedclasses/enums/T_658_31.java
+++ b/jOOQ-test/src/org/jooq/test/ase/generatedclasses/enums/T_658_31.java
@@ -7,21 +7,6 @@ package org.jooq.test.ase.generatedclasses.enums;
  * This class is generated by jOOQ.
  */
 public enum T_658_31 implements org.jooq.MasterDataType<java.lang.Long> {
-
-	/**
-	 * 1
-	 */
-	_1(1L),
-
-	/**
-	 * 2
-	 */
-	_2(2L),
-
-	/**
-	 * 3
-	 */
-	_3(3L),
 	;
 
 	private final java.lang.Long id;
diff --git a/jOOQ-test/src/org/jooq/test/ase/generatedclasses/enums/T_658_32.java b/jOOQ-test/src/org/jooq/test/ase/generatedclasses/enums/T_658_32.java
index d90fc1935e..35b9b85c34 100644
--- a/jOOQ-test/src/org/jooq/test/ase/generatedclasses/enums/T_658_32.java
+++ b/jOOQ-test/src/org/jooq/test/ase/generatedclasses/enums/T_658_32.java
@@ -7,21 +7,6 @@ package org.jooq.test.ase.generatedclasses.enums;
  * This class is generated by jOOQ.
  */
 public enum T_658_32 implements org.jooq.MasterDataType<java.lang.Long> {
-
-	/**
-	 * 1
-	 */
-	_1(1L, 1L),
-
-	/**
-	 * 2
-	 */
-	_2(2L, 2L),
-
-	/**
-	 * 3
-	 */
-	_3(3L, 3L),
 	;
 
 	private final java.lang.Long id;
diff --git a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/routines/F317.java b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/routines/F317.java
index d1703fecd6..e9d7986753 100644
--- a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/routines/F317.java
+++ b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/routines/F317.java
@@ -8,7 +8,7 @@ package org.jooq.test.db2.generatedclasses.routines;
  */
 public class F317 extends org.jooq.impl.AbstractRoutine<java.lang.Integer> {
 
-	private static final long serialVersionUID = 601024316;
+	private static final long serialVersionUID = -165538977;
 
 
 	/**
@@ -40,7 +40,7 @@ public class F317 extends org.jooq.impl.AbstractRoutine<java.lang.Integer> {
 	 * Create a new routine call instance
 	 */
 	public F317() {
-		super(org.jooq.SQLDialect.DB2, "F317", org.jooq.test.db2.generatedclasses.Lukas.LUKAS, org.jooq.impl.SQLDataType.INTEGER);
+		super("F317", org.jooq.test.db2.generatedclasses.Lukas.LUKAS, org.jooq.impl.SQLDataType.INTEGER);
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(P1);
diff --git a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/routines/FAuthorExists.java b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/routines/FAuthorExists.java
index 0388e675e9..dee7922a4f 100644
--- a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/routines/FAuthorExists.java
+++ b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/routines/FAuthorExists.java
@@ -8,7 +8,7 @@ package org.jooq.test.db2.generatedclasses.routines;
  */
 public class FAuthorExists extends org.jooq.impl.AbstractRoutine<java.lang.Integer> {
 
-	private static final long serialVersionUID = -1447388815;
+	private static final long serialVersionUID = 1228369056;
 
 
 	/**
@@ -25,7 +25,7 @@ public class FAuthorExists extends org.jooq.impl.AbstractRoutine<java.lang.Integ
 	 * Create a new routine call instance
 	 */
 	public FAuthorExists() {
-		super(org.jooq.SQLDialect.DB2, "F_AUTHOR_EXISTS", org.jooq.test.db2.generatedclasses.Lukas.LUKAS, org.jooq.impl.SQLDataType.INTEGER);
+		super("F_AUTHOR_EXISTS", org.jooq.test.db2.generatedclasses.Lukas.LUKAS, org.jooq.impl.SQLDataType.INTEGER);
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(AUTHOR_NAME);
diff --git a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/routines/FNumber.java b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/routines/FNumber.java
index 7f2c7c088c..0fb3fe47d9 100644
--- a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/routines/FNumber.java
+++ b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/routines/FNumber.java
@@ -8,7 +8,7 @@ package org.jooq.test.db2.generatedclasses.routines;
  */
 public class FNumber extends org.jooq.impl.AbstractRoutine<java.lang.Integer> {
 
-	private static final long serialVersionUID = 1800951327;
+	private static final long serialVersionUID = -1611651156;
 
 
 	/**
@@ -25,7 +25,7 @@ public class FNumber extends org.jooq.impl.AbstractRoutine<java.lang.Integer> {
 	 * Create a new routine call instance
 	 */
 	public FNumber() {
-		super(org.jooq.SQLDialect.DB2, "F_NUMBER", org.jooq.test.db2.generatedclasses.Lukas.LUKAS, org.jooq.impl.SQLDataType.INTEGER);
+		super("F_NUMBER", org.jooq.test.db2.generatedclasses.Lukas.LUKAS, org.jooq.impl.SQLDataType.INTEGER);
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(N);
diff --git a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/routines/FOne.java b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/routines/FOne.java
index f1216b4721..4da56dbe9a 100644
--- a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/routines/FOne.java
+++ b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/routines/FOne.java
@@ -8,7 +8,7 @@ package org.jooq.test.db2.generatedclasses.routines;
  */
 public class FOne extends org.jooq.impl.AbstractRoutine<java.lang.Integer> {
 
-	private static final long serialVersionUID = 1275898620;
+	private static final long serialVersionUID = -1677169151;
 
 
 	/**
@@ -20,7 +20,7 @@ public class FOne extends org.jooq.impl.AbstractRoutine<java.lang.Integer> {
 	 * Create a new routine call instance
 	 */
 	public FOne() {
-		super(org.jooq.SQLDialect.DB2, "F_ONE", org.jooq.test.db2.generatedclasses.Lukas.LUKAS, org.jooq.impl.SQLDataType.INTEGER);
+		super("F_ONE", org.jooq.test.db2.generatedclasses.Lukas.LUKAS, org.jooq.impl.SQLDataType.INTEGER);
 
 		setReturnParameter(RETURN_VALUE);
 	}
diff --git a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/routines/P391.java b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/routines/P391.java
index ba71abcf61..6c6f6c08c2 100644
--- a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/routines/P391.java
+++ b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/routines/P391.java
@@ -8,7 +8,7 @@ package org.jooq.test.db2.generatedclasses.routines;
  */
 public class P391 extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = -971186860;
+	private static final long serialVersionUID = -167633897;
 
 
 	/**
@@ -45,7 +45,7 @@ public class P391 extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 	 * Create a new routine call instance
 	 */
 	public P391() {
-		super(org.jooq.SQLDialect.DB2, "P391", org.jooq.test.db2.generatedclasses.Lukas.LUKAS);
+		super("P391", org.jooq.test.db2.generatedclasses.Lukas.LUKAS);
 
 		addInParameter(I1);
 		addInOutParameter(IO1);
diff --git a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/routines/PAuthorExists.java b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/routines/PAuthorExists.java
index 7b8779c548..e493c78270 100644
--- a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/routines/PAuthorExists.java
+++ b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/routines/PAuthorExists.java
@@ -8,7 +8,7 @@ package org.jooq.test.db2.generatedclasses.routines;
  */
 public class PAuthorExists extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = 240595329;
+	private static final long serialVersionUID = 1464707502;
 
 
 	/**
@@ -25,7 +25,7 @@ public class PAuthorExists extends org.jooq.impl.AbstractRoutine<java.lang.Void>
 	 * Create a new routine call instance
 	 */
 	public PAuthorExists() {
-		super(org.jooq.SQLDialect.DB2, "P_AUTHOR_EXISTS", org.jooq.test.db2.generatedclasses.Lukas.LUKAS);
+		super("P_AUTHOR_EXISTS", org.jooq.test.db2.generatedclasses.Lukas.LUKAS);
 
 		addInParameter(AUTHOR_NAME);
 		addOutParameter(RESULT);
diff --git a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/routines/PCreateAuthor.java b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/routines/PCreateAuthor.java
index 0c6c4c1497..743a5c9b4f 100644
--- a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/routines/PCreateAuthor.java
+++ b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/routines/PCreateAuthor.java
@@ -8,13 +8,13 @@ package org.jooq.test.db2.generatedclasses.routines;
  */
 public class PCreateAuthor extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = 1245466533;
+	private static final long serialVersionUID = -546258804;
 
 
 	/**
 	 * Create a new routine call instance
 	 */
 	public PCreateAuthor() {
-		super(org.jooq.SQLDialect.DB2, "P_CREATE_AUTHOR", org.jooq.test.db2.generatedclasses.Lukas.LUKAS);
+		super("P_CREATE_AUTHOR", org.jooq.test.db2.generatedclasses.Lukas.LUKAS);
 	}
 }
diff --git a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/routines/PCreateAuthorByName.java b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/routines/PCreateAuthorByName.java
index 75c167e27a..deb66eaf56 100644
--- a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/routines/PCreateAuthorByName.java
+++ b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/routines/PCreateAuthorByName.java
@@ -8,7 +8,7 @@ package org.jooq.test.db2.generatedclasses.routines;
  */
 public class PCreateAuthorByName extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = 1270783149;
+	private static final long serialVersionUID = -2081815214;
 
 
 	/**
@@ -25,7 +25,7 @@ public class PCreateAuthorByName extends org.jooq.impl.AbstractRoutine<java.lang
 	 * Create a new routine call instance
 	 */
 	public PCreateAuthorByName() {
-		super(org.jooq.SQLDialect.DB2, "P_CREATE_AUTHOR_BY_NAME", org.jooq.test.db2.generatedclasses.Lukas.LUKAS);
+		super("P_CREATE_AUTHOR_BY_NAME", org.jooq.test.db2.generatedclasses.Lukas.LUKAS);
 
 		addInParameter(FIRST_NAME);
 		addInParameter(LAST_NAME);
diff --git a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/routines/PUnused.java b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/routines/PUnused.java
index 8c5e9ffa2d..dc649725f0 100644
--- a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/routines/PUnused.java
+++ b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/routines/PUnused.java
@@ -8,7 +8,7 @@ package org.jooq.test.db2.generatedclasses.routines;
  */
 public class PUnused extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = 1290146272;
+	private static final long serialVersionUID = 1193416239;
 
 
 	/**
@@ -30,7 +30,7 @@ public class PUnused extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 	 * Create a new routine call instance
 	 */
 	public PUnused() {
-		super(org.jooq.SQLDialect.DB2, "P_UNUSED", org.jooq.test.db2.generatedclasses.Lukas.LUKAS);
+		super("P_UNUSED", org.jooq.test.db2.generatedclasses.Lukas.LUKAS);
 
 		addInParameter(IN1);
 		addOutParameter(OUT1);
diff --git a/jOOQ-test/src/org/jooq/test/h2/generatedclasses/routines/F317.java b/jOOQ-test/src/org/jooq/test/h2/generatedclasses/routines/F317.java
index 0ba0686910..c7a2a95948 100644
--- a/jOOQ-test/src/org/jooq/test/h2/generatedclasses/routines/F317.java
+++ b/jOOQ-test/src/org/jooq/test/h2/generatedclasses/routines/F317.java
@@ -8,7 +8,7 @@ package org.jooq.test.h2.generatedclasses.routines;
  */
 public class F317 extends org.jooq.impl.AbstractRoutine<java.lang.Integer> {
 
-	private static final long serialVersionUID = -851593250;
+	private static final long serialVersionUID = 580251765;
 
 
 	/**
@@ -40,7 +40,7 @@ public class F317 extends org.jooq.impl.AbstractRoutine<java.lang.Integer> {
 	 * Create a new routine call instance
 	 */
 	public F317() {
-		super(org.jooq.SQLDialect.H2, "F317", org.jooq.test.h2.generatedclasses.Public.PUBLIC, org.jooq.impl.SQLDataType.INTEGER);
+		super("F317", org.jooq.test.h2.generatedclasses.Public.PUBLIC, org.jooq.impl.SQLDataType.INTEGER);
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(P1);
diff --git a/jOOQ-test/src/org/jooq/test/h2/generatedclasses/routines/FArrays1.java b/jOOQ-test/src/org/jooq/test/h2/generatedclasses/routines/FArrays1.java
index d2f88d57ec..94ab8776ca 100644
--- a/jOOQ-test/src/org/jooq/test/h2/generatedclasses/routines/FArrays1.java
+++ b/jOOQ-test/src/org/jooq/test/h2/generatedclasses/routines/FArrays1.java
@@ -8,7 +8,7 @@ package org.jooq.test.h2.generatedclasses.routines;
  */
 public class FArrays1 extends org.jooq.impl.AbstractRoutine<java.lang.Object[]> {
 
-	private static final long serialVersionUID = 387907555;
+	private static final long serialVersionUID = 1114183660;
 
 
 	/**
@@ -31,7 +31,7 @@ public class FArrays1 extends org.jooq.impl.AbstractRoutine<java.lang.Object[]>
 	 * Create a new routine call instance
 	 */
 	public FArrays1() {
-		super(org.jooq.SQLDialect.H2, "F_ARRAYS1", org.jooq.test.h2.generatedclasses.Public.PUBLIC, org.jooq.impl.SQLDataType.OTHER.getArrayDataType());
+		super("F_ARRAYS1", org.jooq.test.h2.generatedclasses.Public.PUBLIC, org.jooq.impl.SQLDataType.OTHER.getArrayDataType());
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(P1);
diff --git a/jOOQ-test/src/org/jooq/test/h2/generatedclasses/routines/FArrays2.java b/jOOQ-test/src/org/jooq/test/h2/generatedclasses/routines/FArrays2.java
index bc5d786d32..1af165aed6 100644
--- a/jOOQ-test/src/org/jooq/test/h2/generatedclasses/routines/FArrays2.java
+++ b/jOOQ-test/src/org/jooq/test/h2/generatedclasses/routines/FArrays2.java
@@ -8,7 +8,7 @@ package org.jooq.test.h2.generatedclasses.routines;
  */
 public class FArrays2 extends org.jooq.impl.AbstractRoutine<java.lang.Object[]> {
 
-	private static final long serialVersionUID = 595114756;
+	private static final long serialVersionUID = 1575400205;
 
 
 	/**
@@ -31,7 +31,7 @@ public class FArrays2 extends org.jooq.impl.AbstractRoutine<java.lang.Object[]>
 	 * Create a new routine call instance
 	 */
 	public FArrays2() {
-		super(org.jooq.SQLDialect.H2, "F_ARRAYS2", org.jooq.test.h2.generatedclasses.Public.PUBLIC, org.jooq.impl.SQLDataType.OTHER.getArrayDataType());
+		super("F_ARRAYS2", org.jooq.test.h2.generatedclasses.Public.PUBLIC, org.jooq.impl.SQLDataType.OTHER.getArrayDataType());
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(P1);
diff --git a/jOOQ-test/src/org/jooq/test/h2/generatedclasses/routines/FArrays3.java b/jOOQ-test/src/org/jooq/test/h2/generatedclasses/routines/FArrays3.java
index b6848f27c2..aed756318b 100644
--- a/jOOQ-test/src/org/jooq/test/h2/generatedclasses/routines/FArrays3.java
+++ b/jOOQ-test/src/org/jooq/test/h2/generatedclasses/routines/FArrays3.java
@@ -8,7 +8,7 @@ package org.jooq.test.h2.generatedclasses.routines;
  */
 public class FArrays3 extends org.jooq.impl.AbstractRoutine<java.lang.Object[]> {
 
-	private static final long serialVersionUID = 802321957;
+	private static final long serialVersionUID = 2036616750;
 
 
 	/**
@@ -31,7 +31,7 @@ public class FArrays3 extends org.jooq.impl.AbstractRoutine<java.lang.Object[]>
 	 * Create a new routine call instance
 	 */
 	public FArrays3() {
-		super(org.jooq.SQLDialect.H2, "F_ARRAYS3", org.jooq.test.h2.generatedclasses.Public.PUBLIC, org.jooq.impl.SQLDataType.OTHER.getArrayDataType());
+		super("F_ARRAYS3", org.jooq.test.h2.generatedclasses.Public.PUBLIC, org.jooq.impl.SQLDataType.OTHER.getArrayDataType());
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(P1);
diff --git a/jOOQ-test/src/org/jooq/test/h2/generatedclasses/routines/FAuthorExists.java b/jOOQ-test/src/org/jooq/test/h2/generatedclasses/routines/FAuthorExists.java
index 77d0d71458..9fb18efa05 100644
--- a/jOOQ-test/src/org/jooq/test/h2/generatedclasses/routines/FAuthorExists.java
+++ b/jOOQ-test/src/org/jooq/test/h2/generatedclasses/routines/FAuthorExists.java
@@ -8,7 +8,7 @@ package org.jooq.test.h2.generatedclasses.routines;
  */
 public class FAuthorExists extends org.jooq.impl.AbstractRoutine<java.lang.Integer> {
 
-	private static final long serialVersionUID = 905052866;
+	private static final long serialVersionUID = 1261265625;
 
 
 	/**
@@ -25,7 +25,7 @@ public class FAuthorExists extends org.jooq.impl.AbstractRoutine<java.lang.Integ
 	 * Create a new routine call instance
 	 */
 	public FAuthorExists() {
-		super(org.jooq.SQLDialect.H2, "F_AUTHOR_EXISTS", org.jooq.test.h2.generatedclasses.Public.PUBLIC, org.jooq.impl.SQLDataType.INTEGER);
+		super("F_AUTHOR_EXISTS", org.jooq.test.h2.generatedclasses.Public.PUBLIC, org.jooq.impl.SQLDataType.INTEGER);
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(P2);
diff --git a/jOOQ-test/src/org/jooq/test/h2/generatedclasses/routines/FGetOneCursor.java b/jOOQ-test/src/org/jooq/test/h2/generatedclasses/routines/FGetOneCursor.java
index 8b70de58b0..b8d2162d81 100644
--- a/jOOQ-test/src/org/jooq/test/h2/generatedclasses/routines/FGetOneCursor.java
+++ b/jOOQ-test/src/org/jooq/test/h2/generatedclasses/routines/FGetOneCursor.java
@@ -8,7 +8,7 @@ package org.jooq.test.h2.generatedclasses.routines;
  */
 public class FGetOneCursor extends org.jooq.impl.AbstractRoutine<org.jooq.Result<org.jooq.Record>> {
 
-	private static final long serialVersionUID = 890945793;
+	private static final long serialVersionUID = -1815405672;
 
 
 	/**
@@ -28,7 +28,7 @@ public class FGetOneCursor extends org.jooq.impl.AbstractRoutine<org.jooq.Result
 	 * Create a new routine call instance
 	 */
 	public FGetOneCursor() {
-		super(org.jooq.SQLDialect.H2, "F_GET_ONE_CURSOR", org.jooq.test.h2.generatedclasses.Public.PUBLIC, org.jooq.impl.SQLDataType.RESULT);
+		super("F_GET_ONE_CURSOR", org.jooq.test.h2.generatedclasses.Public.PUBLIC, org.jooq.impl.SQLDataType.RESULT);
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(P2);
diff --git a/jOOQ-test/src/org/jooq/test/h2/generatedclasses/routines/FNumber.java b/jOOQ-test/src/org/jooq/test/h2/generatedclasses/routines/FNumber.java
index df2c51f58c..8d14fdcd97 100644
--- a/jOOQ-test/src/org/jooq/test/h2/generatedclasses/routines/FNumber.java
+++ b/jOOQ-test/src/org/jooq/test/h2/generatedclasses/routines/FNumber.java
@@ -8,7 +8,7 @@ package org.jooq.test.h2.generatedclasses.routines;
  */
 public class FNumber extends org.jooq.impl.AbstractRoutine<java.lang.Integer> {
 
-	private static final long serialVersionUID = 9135352;
+	private static final long serialVersionUID = -819593599;
 
 
 	/**
@@ -25,7 +25,7 @@ public class FNumber extends org.jooq.impl.AbstractRoutine<java.lang.Integer> {
 	 * Create a new routine call instance
 	 */
 	public FNumber() {
-		super(org.jooq.SQLDialect.H2, "F_NUMBER", org.jooq.test.h2.generatedclasses.Public.PUBLIC, org.jooq.impl.SQLDataType.INTEGER);
+		super("F_NUMBER", org.jooq.test.h2.generatedclasses.Public.PUBLIC, org.jooq.impl.SQLDataType.INTEGER);
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(P1);
diff --git a/jOOQ-test/src/org/jooq/test/h2/generatedclasses/routines/FOne.java b/jOOQ-test/src/org/jooq/test/h2/generatedclasses/routines/FOne.java
index d3e0e60d72..b86cd61847 100644
--- a/jOOQ-test/src/org/jooq/test/h2/generatedclasses/routines/FOne.java
+++ b/jOOQ-test/src/org/jooq/test/h2/generatedclasses/routines/FOne.java
@@ -8,7 +8,7 @@ package org.jooq.test.h2.generatedclasses.routines;
  */
 public class FOne extends org.jooq.impl.AbstractRoutine<java.lang.Integer> {
 
-	private static final long serialVersionUID = -1058638526;
+	private static final long serialVersionUID = -1256811765;
 
 
 	/**
@@ -20,7 +20,7 @@ public class FOne extends org.jooq.impl.AbstractRoutine<java.lang.Integer> {
 	 * Create a new routine call instance
 	 */
 	public FOne() {
-		super(org.jooq.SQLDialect.H2, "F_ONE", org.jooq.test.h2.generatedclasses.Public.PUBLIC, org.jooq.impl.SQLDataType.INTEGER);
+		super("F_ONE", org.jooq.test.h2.generatedclasses.Public.PUBLIC, org.jooq.impl.SQLDataType.INTEGER);
 
 		setReturnParameter(RETURN_VALUE);
 	}
diff --git a/jOOQ-test/src/org/jooq/test/h2/generatedclasses/routines/PCreateAuthor.java b/jOOQ-test/src/org/jooq/test/h2/generatedclasses/routines/PCreateAuthor.java
index 88b101eece..eaeb71081e 100644
--- a/jOOQ-test/src/org/jooq/test/h2/generatedclasses/routines/PCreateAuthor.java
+++ b/jOOQ-test/src/org/jooq/test/h2/generatedclasses/routines/PCreateAuthor.java
@@ -8,13 +8,13 @@ package org.jooq.test.h2.generatedclasses.routines;
  */
 public class PCreateAuthor extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = -426281969;
+	private static final long serialVersionUID = 1101387928;
 
 
 	/**
 	 * Create a new routine call instance
 	 */
 	public PCreateAuthor() {
-		super(org.jooq.SQLDialect.H2, "P_CREATE_AUTHOR", org.jooq.test.h2.generatedclasses.Public.PUBLIC);
+		super("P_CREATE_AUTHOR", org.jooq.test.h2.generatedclasses.Public.PUBLIC);
 	}
 }
diff --git a/jOOQ-test/src/org/jooq/test/h2/generatedclasses/routines/PCreateAuthorByName.java b/jOOQ-test/src/org/jooq/test/h2/generatedclasses/routines/PCreateAuthorByName.java
index 09c907ba98..9980371d7a 100644
--- a/jOOQ-test/src/org/jooq/test/h2/generatedclasses/routines/PCreateAuthorByName.java
+++ b/jOOQ-test/src/org/jooq/test/h2/generatedclasses/routines/PCreateAuthorByName.java
@@ -8,7 +8,7 @@ package org.jooq.test.h2.generatedclasses.routines;
  */
 public class PCreateAuthorByName extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = -313035427;
+	private static final long serialVersionUID = -1676101580;
 
 
 	/**
@@ -25,7 +25,7 @@ public class PCreateAuthorByName extends org.jooq.impl.AbstractRoutine<java.lang
 	 * Create a new routine call instance
 	 */
 	public PCreateAuthorByName() {
-		super(org.jooq.SQLDialect.H2, "P_CREATE_AUTHOR_BY_NAME", org.jooq.test.h2.generatedclasses.Public.PUBLIC);
+		super("P_CREATE_AUTHOR_BY_NAME", org.jooq.test.h2.generatedclasses.Public.PUBLIC);
 
 		addInParameter(P2);
 		addInParameter(P3);
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/Keys.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/Keys.java
index 4a636a1c01..8705458256 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/Keys.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/Keys.java
@@ -8,7 +8,7 @@ package org.jooq.test.hsqldb.generatedclasses;
  *
  * A class modelling foreign key relationships between tables of the PUBLIC schema
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 @SuppressWarnings({"unchecked"})
 public class Keys extends org.jooq.impl.AbstractKeys {
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/Public.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/Public.java
index a2ae039dfd..297ae1c8aa 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/Public.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/Public.java
@@ -6,11 +6,11 @@ package org.jooq.test.hsqldb.generatedclasses;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public class Public extends org.jooq.impl.SchemaImpl {
 
-	private static final long serialVersionUID = -1888174792;
+	private static final long serialVersionUID = 1351298297;
 
 	/**
 	 * The singleton instance of PUBLIC
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 f748ef6a68..623f40579b 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/PublicFactory.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/PublicFactory.java
@@ -6,11 +6,11 @@ package org.jooq.test.hsqldb.generatedclasses;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public class PublicFactory extends org.jooq.util.hsqldb.HSQLDBFactory {
 
-	private static final long serialVersionUID = 627466022;
+	private static final long serialVersionUID = 1264186885;
 
 	/**
 	 * Create a factory with a connection
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/Routines.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/Routines.java
index e487817500..ae4782ed84 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/Routines.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/Routines.java
@@ -8,7 +8,7 @@ package org.jooq.test.hsqldb.generatedclasses;
  *
  * Convenience access to all stored procedures and functions in PUBLIC
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public final class Routines {
 
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/Sequences.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/Sequences.java
index f93ff70af5..7345225b24 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/Sequences.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/Sequences.java
@@ -8,7 +8,7 @@ package org.jooq.test.hsqldb.generatedclasses;
  *
  * Convenience access to all sequences in PUBLIC
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public final class Sequences {
 
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/Tables.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/Tables.java
index e1702a7231..160a523347 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/Tables.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/Tables.java
@@ -8,7 +8,7 @@ package org.jooq.test.hsqldb.generatedclasses;
  *
  * Convenience access to all tables in PUBLIC
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public final class Tables {
 
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/enums/BooleanTrueFalseLc.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/enums/BooleanTrueFalseLc.java
index e65d53ddd4..401c236bc1 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/enums/BooleanTrueFalseLc.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/enums/BooleanTrueFalseLc.java
@@ -6,7 +6,7 @@ package org.jooq.test.hsqldb.generatedclasses.enums;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public enum BooleanTrueFalseLc implements org.jooq.EnumType {
 	true_("true"),
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/enums/BooleanTrueFalseUc.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/enums/BooleanTrueFalseUc.java
index cfde3c30e0..931b64e262 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/enums/BooleanTrueFalseUc.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/enums/BooleanTrueFalseUc.java
@@ -6,7 +6,7 @@ package org.jooq.test.hsqldb.generatedclasses.enums;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public enum BooleanTrueFalseUc implements org.jooq.EnumType {
 	TRUE("TRUE"),
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/enums/BooleanYesNoLc.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/enums/BooleanYesNoLc.java
index 907a4538d6..59fe209e2e 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/enums/BooleanYesNoLc.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/enums/BooleanYesNoLc.java
@@ -6,7 +6,7 @@ package org.jooq.test.hsqldb.generatedclasses.enums;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public enum BooleanYesNoLc implements org.jooq.EnumType {
 	yes("yes"),
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/enums/BooleanYesNoUc.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/enums/BooleanYesNoUc.java
index a1e1c6fdf2..92629b88ce 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/enums/BooleanYesNoUc.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/enums/BooleanYesNoUc.java
@@ -6,7 +6,7 @@ package org.jooq.test.hsqldb.generatedclasses.enums;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public enum BooleanYesNoUc implements org.jooq.EnumType {
 	YES("YES"),
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/enums/BooleanYnLc.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/enums/BooleanYnLc.java
index 771d45464c..880a081c8c 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/enums/BooleanYnLc.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/enums/BooleanYnLc.java
@@ -6,7 +6,7 @@ package org.jooq.test.hsqldb.generatedclasses.enums;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public enum BooleanYnLc implements org.jooq.EnumType {
 	y("y"),
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/enums/BooleanYnUc.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/enums/BooleanYnUc.java
index 675b28fd74..fb0959a1cc 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/enums/BooleanYnUc.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/enums/BooleanYnUc.java
@@ -6,7 +6,7 @@ package org.jooq.test.hsqldb.generatedclasses.enums;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public enum BooleanYnUc implements org.jooq.EnumType {
 	Y("Y"),
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/enums/Boolean_10.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/enums/Boolean_10.java
index ce9da0cd2a..cd3c74ba19 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/enums/Boolean_10.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/enums/Boolean_10.java
@@ -6,7 +6,7 @@ package org.jooq.test.hsqldb.generatedclasses.enums;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public enum Boolean_10 implements org.jooq.EnumType {
 	_1("1"),
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/enums/TLanguage.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/enums/TLanguage.java
index fdae300f50..f2019055d4 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/enums/TLanguage.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/enums/TLanguage.java
@@ -6,7 +6,7 @@ package org.jooq.test.hsqldb.generatedclasses.enums;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public enum TLanguage implements org.jooq.MasterDataType<java.lang.Integer> {
 
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/enums/T_658_11.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/enums/T_658_11.java
index 6e275de833..60574a2721 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/enums/T_658_11.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/enums/T_658_11.java
@@ -6,7 +6,7 @@ package org.jooq.test.hsqldb.generatedclasses.enums;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public enum T_658_11 implements org.jooq.MasterDataType<java.lang.String> {
 
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/enums/T_658_12.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/enums/T_658_12.java
index 3550fd355f..b203881265 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/enums/T_658_12.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/enums/T_658_12.java
@@ -6,7 +6,7 @@ package org.jooq.test.hsqldb.generatedclasses.enums;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public enum T_658_12 implements org.jooq.MasterDataType<java.lang.String> {
 
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/enums/T_658_21.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/enums/T_658_21.java
index cb69828e64..db59483c3e 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/enums/T_658_21.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/enums/T_658_21.java
@@ -6,7 +6,7 @@ package org.jooq.test.hsqldb.generatedclasses.enums;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public enum T_658_21 implements org.jooq.MasterDataType<java.lang.Integer> {
 
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/enums/T_658_22.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/enums/T_658_22.java
index e5e7af408c..beba8f5f3a 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/enums/T_658_22.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/enums/T_658_22.java
@@ -6,7 +6,7 @@ package org.jooq.test.hsqldb.generatedclasses.enums;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public enum T_658_22 implements org.jooq.MasterDataType<java.lang.Integer> {
 
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/enums/T_658_31.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/enums/T_658_31.java
index aa487dff6d..9863a668ba 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/enums/T_658_31.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/enums/T_658_31.java
@@ -6,7 +6,7 @@ package org.jooq.test.hsqldb.generatedclasses.enums;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public enum T_658_31 implements org.jooq.MasterDataType<java.lang.Long> {
 
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/enums/T_658_32.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/enums/T_658_32.java
index da76e7b9f2..2ff5942b1a 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/enums/T_658_32.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/enums/T_658_32.java
@@ -6,7 +6,7 @@ package org.jooq.test.hsqldb.generatedclasses.enums;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public enum T_658_32 implements org.jooq.MasterDataType<java.lang.Long> {
 
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/routines/F317.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/routines/F317.java
index f740143466..44e222acd1 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/routines/F317.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/routines/F317.java
@@ -6,11 +6,11 @@ package org.jooq.test.hsqldb.generatedclasses.routines;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public class F317 extends org.jooq.impl.AbstractRoutine<java.lang.Integer> {
 
-	private static final long serialVersionUID = -2103928480;
+	private static final long serialVersionUID = 1440598450;
 
 
 	/**
@@ -42,7 +42,7 @@ public class F317 extends org.jooq.impl.AbstractRoutine<java.lang.Integer> {
 	 * Create a new routine call instance
 	 */
 	public F317() {
-		super(org.jooq.SQLDialect.HSQLDB, "F317", org.jooq.test.hsqldb.generatedclasses.Public.PUBLIC, org.jooq.impl.SQLDataType.INTEGER);
+		super("F317", org.jooq.test.hsqldb.generatedclasses.Public.PUBLIC, org.jooq.impl.SQLDataType.INTEGER);
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(P1);
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/routines/FArrays1.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/routines/FArrays1.java
index 506d72d8c8..70021d0d9f 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/routines/FArrays1.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/routines/FArrays1.java
@@ -6,11 +6,11 @@ package org.jooq.test.hsqldb.generatedclasses.routines;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public class FArrays1 extends org.jooq.impl.AbstractRoutine<java.lang.Integer[]> {
 
-	private static final long serialVersionUID = -524421976;
+	private static final long serialVersionUID = 914725560;
 
 
 	/**
@@ -27,7 +27,7 @@ public class FArrays1 extends org.jooq.impl.AbstractRoutine<java.lang.Integer[]>
 	 * Create a new routine call instance
 	 */
 	public FArrays1() {
-		super(org.jooq.SQLDialect.HSQLDB, "F_ARRAYS1", org.jooq.test.hsqldb.generatedclasses.Public.PUBLIC, org.jooq.impl.SQLDataType.INTEGER.getArrayDataType());
+		super("F_ARRAYS1", org.jooq.test.hsqldb.generatedclasses.Public.PUBLIC, org.jooq.impl.SQLDataType.INTEGER.getArrayDataType());
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(IN_ARRAY);
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/routines/FArrays2.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/routines/FArrays2.java
index 7f75ec94c3..25a1e22cfc 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/routines/FArrays2.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/routines/FArrays2.java
@@ -6,11 +6,11 @@ package org.jooq.test.hsqldb.generatedclasses.routines;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public class FArrays2 extends org.jooq.impl.AbstractRoutine<java.lang.Long[]> {
 
-	private static final long serialVersionUID = 718227250;
+	private static final long serialVersionUID = -217802172;
 
 
 	/**
@@ -27,7 +27,7 @@ public class FArrays2 extends org.jooq.impl.AbstractRoutine<java.lang.Long[]> {
 	 * Create a new routine call instance
 	 */
 	public FArrays2() {
-		super(org.jooq.SQLDialect.HSQLDB, "F_ARRAYS2", org.jooq.test.hsqldb.generatedclasses.Public.PUBLIC, org.jooq.impl.SQLDataType.BIGINT.getArrayDataType());
+		super("F_ARRAYS2", org.jooq.test.hsqldb.generatedclasses.Public.PUBLIC, org.jooq.impl.SQLDataType.BIGINT.getArrayDataType());
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(IN_ARRAY);
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/routines/FArrays3.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/routines/FArrays3.java
index f626a01a97..d0a21e15c2 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/routines/FArrays3.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/routines/FArrays3.java
@@ -6,11 +6,11 @@ package org.jooq.test.hsqldb.generatedclasses.routines;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public class FArrays3 extends org.jooq.impl.AbstractRoutine<java.lang.String[]> {
 
-	private static final long serialVersionUID = 1282472828;
+	private static final long serialVersionUID = -130484950;
 
 
 	/**
@@ -27,7 +27,7 @@ public class FArrays3 extends org.jooq.impl.AbstractRoutine<java.lang.String[]>
 	 * Create a new routine call instance
 	 */
 	public FArrays3() {
-		super(org.jooq.SQLDialect.HSQLDB, "F_ARRAYS3", org.jooq.test.hsqldb.generatedclasses.Public.PUBLIC, org.jooq.impl.SQLDataType.VARCHAR.getArrayDataType());
+		super("F_ARRAYS3", org.jooq.test.hsqldb.generatedclasses.Public.PUBLIC, org.jooq.impl.SQLDataType.VARCHAR.getArrayDataType());
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(IN_ARRAY);
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/routines/FAuthorExists.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/routines/FAuthorExists.java
index 3100276940..0f6f449e90 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/routines/FAuthorExists.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/routines/FAuthorExists.java
@@ -6,11 +6,11 @@ package org.jooq.test.hsqldb.generatedclasses.routines;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public class FAuthorExists extends org.jooq.impl.AbstractRoutine<java.lang.Integer> {
 
-	private static final long serialVersionUID = 1133840981;
+	private static final long serialVersionUID = -1801030077;
 
 
 	/**
@@ -27,7 +27,7 @@ public class FAuthorExists extends org.jooq.impl.AbstractRoutine<java.lang.Integ
 	 * Create a new routine call instance
 	 */
 	public FAuthorExists() {
-		super(org.jooq.SQLDialect.HSQLDB, "F_AUTHOR_EXISTS", org.jooq.test.hsqldb.generatedclasses.Public.PUBLIC, org.jooq.impl.SQLDataType.INTEGER);
+		super("F_AUTHOR_EXISTS", org.jooq.test.hsqldb.generatedclasses.Public.PUBLIC, org.jooq.impl.SQLDataType.INTEGER);
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(AUTHOR_NAME);
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/routines/FGetOneCursor.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/routines/FGetOneCursor.java
index 56a71b509a..54ab872354 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/routines/FGetOneCursor.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/routines/FGetOneCursor.java
@@ -6,11 +6,11 @@ package org.jooq.test.hsqldb.generatedclasses.routines;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public class FGetOneCursor extends org.jooq.impl.AbstractRoutine<org.jooq.Result<org.jooq.Record>> {
 
-	private static final long serialVersionUID = 553268554;
+	private static final long serialVersionUID = -2147058758;
 
 
 	/**
@@ -27,7 +27,7 @@ public class FGetOneCursor extends org.jooq.impl.AbstractRoutine<org.jooq.Result
 	 * Create a new routine call instance
 	 */
 	public FGetOneCursor() {
-		super(org.jooq.SQLDialect.HSQLDB, "F_GET_ONE_CURSOR", org.jooq.test.hsqldb.generatedclasses.Public.PUBLIC, org.jooq.impl.SQLDataType.RESULT);
+		super("F_GET_ONE_CURSOR", org.jooq.test.hsqldb.generatedclasses.Public.PUBLIC, org.jooq.impl.SQLDataType.RESULT);
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(BOOK_IDS);
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/routines/FNumber.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/routines/FNumber.java
index 4090cc3113..81a71653bc 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/routines/FNumber.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/routines/FNumber.java
@@ -6,11 +6,11 @@ package org.jooq.test.hsqldb.generatedclasses.routines;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public class FNumber extends org.jooq.impl.AbstractRoutine<java.lang.Integer> {
 
-	private static final long serialVersionUID = 1295742593;
+	private static final long serialVersionUID = -1320249103;
 
 
 	/**
@@ -27,7 +27,7 @@ public class FNumber extends org.jooq.impl.AbstractRoutine<java.lang.Integer> {
 	 * Create a new routine call instance
 	 */
 	public FNumber() {
-		super(org.jooq.SQLDialect.HSQLDB, "F_NUMBER", org.jooq.test.hsqldb.generatedclasses.Public.PUBLIC, org.jooq.impl.SQLDataType.INTEGER);
+		super("F_NUMBER", org.jooq.test.hsqldb.generatedclasses.Public.PUBLIC, org.jooq.impl.SQLDataType.INTEGER);
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(N);
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/routines/FOne.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/routines/FOne.java
index e8222518fb..e6315b62f6 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/routines/FOne.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/routines/FOne.java
@@ -6,11 +6,11 @@ package org.jooq.test.hsqldb.generatedclasses.routines;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public class FOne extends org.jooq.impl.AbstractRoutine<java.lang.Integer> {
 
-	private static final long serialVersionUID = 2100461196;
+	private static final long serialVersionUID = -1151322886;
 
 
 	/**
@@ -22,7 +22,7 @@ public class FOne extends org.jooq.impl.AbstractRoutine<java.lang.Integer> {
 	 * Create a new routine call instance
 	 */
 	public FOne() {
-		super(org.jooq.SQLDialect.HSQLDB, "F_ONE", org.jooq.test.hsqldb.generatedclasses.Public.PUBLIC, org.jooq.impl.SQLDataType.INTEGER);
+		super("F_ONE", org.jooq.test.hsqldb.generatedclasses.Public.PUBLIC, org.jooq.impl.SQLDataType.INTEGER);
 
 		setReturnParameter(RETURN_VALUE);
 	}
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/routines/P391.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/routines/P391.java
index e7c4bd166a..883c034059 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/routines/P391.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/routines/P391.java
@@ -6,11 +6,11 @@ package org.jooq.test.hsqldb.generatedclasses.routines;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public class P391 extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = 2025102944;
+	private static final long serialVersionUID = -1621924082;
 
 
 	/**
@@ -47,7 +47,7 @@ public class P391 extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 	 * Create a new routine call instance
 	 */
 	public P391() {
-		super(org.jooq.SQLDialect.HSQLDB, "P391", org.jooq.test.hsqldb.generatedclasses.Public.PUBLIC);
+		super("P391", org.jooq.test.hsqldb.generatedclasses.Public.PUBLIC);
 
 		addInParameter(I1);
 		addInOutParameter(IO1);
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/routines/PArrays1.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/routines/PArrays1.java
index 3a8ba569d6..3603e92959 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/routines/PArrays1.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/routines/PArrays1.java
@@ -6,11 +6,11 @@ package org.jooq.test.hsqldb.generatedclasses.routines;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public class PArrays1 extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = -151748813;
+	private static final long serialVersionUID = 812440417;
 
 
 	/**
@@ -27,7 +27,7 @@ public class PArrays1 extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 	 * Create a new routine call instance
 	 */
 	public PArrays1() {
-		super(org.jooq.SQLDialect.HSQLDB, "P_ARRAYS1", org.jooq.test.hsqldb.generatedclasses.Public.PUBLIC);
+		super("P_ARRAYS1", org.jooq.test.hsqldb.generatedclasses.Public.PUBLIC);
 
 		addInParameter(IN_ARRAY);
 		addOutParameter(OUT_ARRAY);
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/routines/PArrays2.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/routines/PArrays2.java
index 75eab42db9..881ed8cc7f 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/routines/PArrays2.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/routines/PArrays2.java
@@ -6,11 +6,11 @@ package org.jooq.test.hsqldb.generatedclasses.routines;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public class PArrays2 extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = 770644618;
+	private static final long serialVersionUID = 1427103544;
 
 
 	/**
@@ -27,7 +27,7 @@ public class PArrays2 extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 	 * Create a new routine call instance
 	 */
 	public PArrays2() {
-		super(org.jooq.SQLDialect.HSQLDB, "P_ARRAYS2", org.jooq.test.hsqldb.generatedclasses.Public.PUBLIC);
+		super("P_ARRAYS2", org.jooq.test.hsqldb.generatedclasses.Public.PUBLIC);
 
 		addInParameter(IN_ARRAY);
 		addOutParameter(OUT_ARRAY);
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/routines/PArrays3.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/routines/PArrays3.java
index 1b521be5e8..bec9f91642 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/routines/PArrays3.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/routines/PArrays3.java
@@ -6,11 +6,11 @@ package org.jooq.test.hsqldb.generatedclasses.routines;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public class PArrays3 extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = 1575369075;
+	private static final long serialVersionUID = 741171169;
 
 
 	/**
@@ -27,7 +27,7 @@ public class PArrays3 extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 	 * Create a new routine call instance
 	 */
 	public PArrays3() {
-		super(org.jooq.SQLDialect.HSQLDB, "P_ARRAYS3", org.jooq.test.hsqldb.generatedclasses.Public.PUBLIC);
+		super("P_ARRAYS3", org.jooq.test.hsqldb.generatedclasses.Public.PUBLIC);
 
 		addInParameter(IN_ARRAY);
 		addOutParameter(OUT_ARRAY);
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/routines/PAuthorExists.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/routines/PAuthorExists.java
index 1a1fa2ef00..99424e40fe 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/routines/PAuthorExists.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/routines/PAuthorExists.java
@@ -6,11 +6,11 @@ package org.jooq.test.hsqldb.generatedclasses.routines;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public class PAuthorExists extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = 1604158729;
+	private static final long serialVersionUID = 1485620601;
 
 
 	/**
@@ -27,7 +27,7 @@ public class PAuthorExists extends org.jooq.impl.AbstractRoutine<java.lang.Void>
 	 * Create a new routine call instance
 	 */
 	public PAuthorExists() {
-		super(org.jooq.SQLDialect.HSQLDB, "P_AUTHOR_EXISTS", org.jooq.test.hsqldb.generatedclasses.Public.PUBLIC);
+		super("P_AUTHOR_EXISTS", org.jooq.test.hsqldb.generatedclasses.Public.PUBLIC);
 
 		addInParameter(AUTHOR_NAME);
 		addOutParameter(RESULT);
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/routines/PCreateAuthor.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/routines/PCreateAuthor.java
index 1def826b0f..824e164f27 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/routines/PCreateAuthor.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/routines/PCreateAuthor.java
@@ -6,17 +6,17 @@ package org.jooq.test.hsqldb.generatedclasses.routines;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public class PCreateAuthor extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = 424176857;
+	private static final long serialVersionUID = -1461662713;
 
 
 	/**
 	 * Create a new routine call instance
 	 */
 	public PCreateAuthor() {
-		super(org.jooq.SQLDialect.HSQLDB, "P_CREATE_AUTHOR", org.jooq.test.hsqldb.generatedclasses.Public.PUBLIC);
+		super("P_CREATE_AUTHOR", org.jooq.test.hsqldb.generatedclasses.Public.PUBLIC);
 	}
 }
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/routines/PCreateAuthorByName.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/routines/PCreateAuthorByName.java
index 20ceeef53e..b3fa6eed4c 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/routines/PCreateAuthorByName.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/routines/PCreateAuthorByName.java
@@ -6,11 +6,11 @@ package org.jooq.test.hsqldb.generatedclasses.routines;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public class PCreateAuthorByName extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = 49776145;
+	private static final long serialVersionUID = 1311801443;
 
 
 	/**
@@ -27,7 +27,7 @@ public class PCreateAuthorByName extends org.jooq.impl.AbstractRoutine<java.lang
 	 * Create a new routine call instance
 	 */
 	public PCreateAuthorByName() {
-		super(org.jooq.SQLDialect.HSQLDB, "P_CREATE_AUTHOR_BY_NAME", org.jooq.test.hsqldb.generatedclasses.Public.PUBLIC);
+		super("P_CREATE_AUTHOR_BY_NAME", org.jooq.test.hsqldb.generatedclasses.Public.PUBLIC);
 
 		addInParameter(FIRST_NAME);
 		addInParameter(LAST_NAME);
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/routines/PUnused.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/routines/PUnused.java
index b3be86902b..6c634f23ce 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/routines/PUnused.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/routines/PUnused.java
@@ -6,11 +6,11 @@ package org.jooq.test.hsqldb.generatedclasses.routines;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public class PUnused extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = 1732509288;
+	private static final long serialVersionUID = 1858848634;
 
 
 	/**
@@ -32,7 +32,7 @@ public class PUnused extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 	 * Create a new routine call instance
 	 */
 	public PUnused() {
-		super(org.jooq.SQLDialect.HSQLDB, "P_UNUSED", org.jooq.test.hsqldb.generatedclasses.Public.PUBLIC);
+		super("P_UNUSED", org.jooq.test.hsqldb.generatedclasses.Public.PUBLIC);
 
 		addInParameter(IN1);
 		addOutParameter(OUT1);
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/BigDecimal.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/BigDecimal.java
index 8c3de3cf11..3b3867d111 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/BigDecimal.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/BigDecimal.java
@@ -6,11 +6,11 @@ package org.jooq.test.hsqldb.generatedclasses.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public class BigDecimal extends org.jooq.impl.TableImpl<org.jooq.test.hsqldb.generatedclasses.tables.records.BigDecimalRecord> {
 
-	private static final long serialVersionUID = 654843847;
+	private static final long serialVersionUID = -847796280;
 
 	/**
 	 * The singleton instance of PUBLIC.BIG_DECIMAL
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/Class.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/Class.java
index da89a4488e..81d6c6bf38 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/Class.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/Class.java
@@ -6,11 +6,11 @@ package org.jooq.test.hsqldb.generatedclasses.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public class Class extends org.jooq.impl.TableImpl<org.jooq.test.hsqldb.generatedclasses.tables.records.ClassRecord> {
 
-	private static final long serialVersionUID = -1512897491;
+	private static final long serialVersionUID = -1260799028;
 
 	/**
 	 * The singleton instance of PUBLIC.CLASS
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/Integer.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/Integer.java
index 6220e142f3..5f3a76bfe6 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/Integer.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/Integer.java
@@ -6,11 +6,11 @@ package org.jooq.test.hsqldb.generatedclasses.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public class Integer extends org.jooq.impl.TableImpl<org.jooq.test.hsqldb.generatedclasses.tables.records.IntegerRecord> {
 
-	private static final long serialVersionUID = 1081475072;
+	private static final long serialVersionUID = -70746879;
 
 	/**
 	 * The singleton instance of PUBLIC.INTEGER
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/Long.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/Long.java
index 178fa97f46..a7f94377c5 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/Long.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/Long.java
@@ -6,11 +6,11 @@ package org.jooq.test.hsqldb.generatedclasses.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public class Long extends org.jooq.impl.TableImpl<org.jooq.test.hsqldb.generatedclasses.tables.records.LongRecord> {
 
-	private static final long serialVersionUID = 826190802;
+	private static final long serialVersionUID = 1394676721;
 
 	/**
 	 * The singleton instance of PUBLIC.LONG
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/Object.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/Object.java
index 21a30f4a82..ed2233fa22 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/Object.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/Object.java
@@ -6,11 +6,11 @@ package org.jooq.test.hsqldb.generatedclasses.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public class Object extends org.jooq.impl.TableImpl<org.jooq.test.hsqldb.generatedclasses.tables.records.ObjectRecord> {
 
-	private static final long serialVersionUID = -698132022;
+	private static final long serialVersionUID = -1881298421;
 
 	/**
 	 * The singleton instance of PUBLIC.OBJECT
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/String.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/String.java
index 78ebb30cc4..206d5e1ff4 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/String.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/String.java
@@ -6,11 +6,11 @@ package org.jooq.test.hsqldb.generatedclasses.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public class String extends org.jooq.impl.TableImpl<org.jooq.test.hsqldb.generatedclasses.tables.records.StringRecord> {
 
-	private static final long serialVersionUID = 181816585;
+	private static final long serialVersionUID = 623841290;
 
 	/**
 	 * The singleton instance of PUBLIC.STRING
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/System.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/System.java
index 6735f7da59..ca975c1454 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/System.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/System.java
@@ -6,11 +6,11 @@ package org.jooq.test.hsqldb.generatedclasses.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public class System extends org.jooq.impl.TableImpl<org.jooq.test.hsqldb.generatedclasses.tables.records.SystemRecord> {
 
-	private static final long serialVersionUID = 175314457;
+	private static final long serialVersionUID = 2144080632;
 
 	/**
 	 * The singleton instance of PUBLIC.SYSTEM
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/TArrays.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/TArrays.java
index f8b98598c2..de68de5c74 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/TArrays.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/TArrays.java
@@ -6,11 +6,11 @@ package org.jooq.test.hsqldb.generatedclasses.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public class TArrays extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.hsqldb.generatedclasses.tables.records.TArraysRecord> {
 
-	private static final long serialVersionUID = -1224284958;
+	private static final long serialVersionUID = -1836778077;
 
 	/**
 	 * The singleton instance of PUBLIC.T_ARRAYS
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/TAuthor.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/TAuthor.java
index 57b1a7998e..d10c4dac61 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/TAuthor.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/TAuthor.java
@@ -6,11 +6,11 @@ package org.jooq.test.hsqldb.generatedclasses.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public class TAuthor extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.hsqldb.generatedclasses.tables.records.TAuthorRecord> {
 
-	private static final long serialVersionUID = 636561427;
+	private static final long serialVersionUID = 1489826290;
 
 	/**
 	 * The singleton instance of PUBLIC.T_AUTHOR
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/TBook.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/TBook.java
index 68a86d8b48..2a3ef71b53 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/TBook.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/TBook.java
@@ -6,11 +6,11 @@ package org.jooq.test.hsqldb.generatedclasses.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public class TBook extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.hsqldb.generatedclasses.tables.records.TBookRecord> {
 
-	private static final long serialVersionUID = 1621689562;
+	private static final long serialVersionUID = -770450759;
 
 	/**
 	 * The singleton instance of PUBLIC.T_BOOK
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/TBookStore.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/TBookStore.java
index c9efbde26d..0afc413d79 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/TBookStore.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/TBookStore.java
@@ -6,11 +6,11 @@ package org.jooq.test.hsqldb.generatedclasses.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public class TBookStore extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.hsqldb.generatedclasses.tables.records.TBookStoreRecord> {
 
-	private static final long serialVersionUID = -795001904;
+	private static final long serialVersionUID = 41095505;
 
 	/**
 	 * The singleton instance of PUBLIC.T_BOOK_STORE
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/TBookToBookStore.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/TBookToBookStore.java
index 13c8ce313d..dc46232737 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/TBookToBookStore.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/TBookToBookStore.java
@@ -6,11 +6,11 @@ package org.jooq.test.hsqldb.generatedclasses.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public class TBookToBookStore extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.hsqldb.generatedclasses.tables.records.TBookToBookStoreRecord> {
 
-	private static final long serialVersionUID = 783837585;
+	private static final long serialVersionUID = 1733368018;
 
 	/**
 	 * The singleton instance of PUBLIC.T_BOOK_TO_BOOK_STORE
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/TBooleans.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/TBooleans.java
index 046602ef99..45a30b980b 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/TBooleans.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/TBooleans.java
@@ -6,11 +6,11 @@ package org.jooq.test.hsqldb.generatedclasses.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public class TBooleans extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.hsqldb.generatedclasses.tables.records.TBooleansRecord> {
 
-	private static final long serialVersionUID = -883685726;
+	private static final long serialVersionUID = 339777251;
 
 	/**
 	 * The singleton instance of PUBLIC.T_BOOLEANS
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/TDates.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/TDates.java
index d8e4fdd43a..adf1d4c716 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/TDates.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/TDates.java
@@ -6,11 +6,11 @@ package org.jooq.test.hsqldb.generatedclasses.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public class TDates extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.hsqldb.generatedclasses.tables.records.TDatesRecord> {
 
-	private static final long serialVersionUID = -38129260;
+	private static final long serialVersionUID = 1988851443;
 
 	/**
 	 * The singleton instance of PUBLIC.T_DATES
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/TIdentity.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/TIdentity.java
index 5f5a5cae58..320dcc95bf 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/TIdentity.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/TIdentity.java
@@ -6,11 +6,11 @@ package org.jooq.test.hsqldb.generatedclasses.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public class TIdentity extends org.jooq.impl.TableImpl<org.jooq.test.hsqldb.generatedclasses.tables.records.TIdentityRecord> {
 
-	private static final long serialVersionUID = 1693861804;
+	private static final long serialVersionUID = -1579905939;
 
 	/**
 	 * The singleton instance of PUBLIC.T_IDENTITY
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/TIdentityPk.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/TIdentityPk.java
index a1e78ecb70..d3b387248c 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/TIdentityPk.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/TIdentityPk.java
@@ -6,11 +6,11 @@ package org.jooq.test.hsqldb.generatedclasses.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public class TIdentityPk extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.hsqldb.generatedclasses.tables.records.TIdentityPkRecord> {
 
-	private static final long serialVersionUID = -2060963479;
+	private static final long serialVersionUID = 1103333384;
 
 	/**
 	 * The singleton instance of PUBLIC.T_IDENTITY_PK
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/TTriggers.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/TTriggers.java
index 1228a1ff23..99e7a04f07 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/TTriggers.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/TTriggers.java
@@ -6,11 +6,11 @@ package org.jooq.test.hsqldb.generatedclasses.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public class TTriggers extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.hsqldb.generatedclasses.tables.records.TTriggersRecord> {
 
-	private static final long serialVersionUID = 800525251;
+	private static final long serialVersionUID = -1239148476;
 
 	/**
 	 * The singleton instance of PUBLIC.T_TRIGGERS
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/T_639NumbersTable.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/T_639NumbersTable.java
index e6ad2c2b45..25d5d7f027 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/T_639NumbersTable.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/T_639NumbersTable.java
@@ -6,11 +6,11 @@ package org.jooq.test.hsqldb.generatedclasses.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public class T_639NumbersTable extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.hsqldb.generatedclasses.tables.records.T_639NumbersTableRecord> {
 
-	private static final long serialVersionUID = -1896405917;
+	private static final long serialVersionUID = -1195148380;
 
 	/**
 	 * The singleton instance of PUBLIC.T_639_NUMBERS_TABLE
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/T_658Ref.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/T_658Ref.java
index 6ce016d3c5..f72ea59efb 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/T_658Ref.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/T_658Ref.java
@@ -6,11 +6,11 @@ package org.jooq.test.hsqldb.generatedclasses.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public class T_658Ref extends org.jooq.impl.TableImpl<org.jooq.test.hsqldb.generatedclasses.tables.records.T_658RefRecord> {
 
-	private static final long serialVersionUID = 489206943;
+	private static final long serialVersionUID = -2113618370;
 
 	/**
 	 * The singleton instance of PUBLIC.T_658_REF
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/T_725LobTest.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/T_725LobTest.java
index 2aafa71abc..3087702627 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/T_725LobTest.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/T_725LobTest.java
@@ -6,11 +6,11 @@ package org.jooq.test.hsqldb.generatedclasses.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public class T_725LobTest extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.hsqldb.generatedclasses.tables.records.T_725LobTestRecord> {
 
-	private static final long serialVersionUID = -1433236168;
+	private static final long serialVersionUID = -940636777;
 
 	/**
 	 * The singleton instance of PUBLIC.T_725_LOB_TEST
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/T_785.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/T_785.java
index a9cb7eafe7..e18de5d191 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/T_785.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/T_785.java
@@ -6,11 +6,11 @@ package org.jooq.test.hsqldb.generatedclasses.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public class T_785 extends org.jooq.impl.TableImpl<org.jooq.test.hsqldb.generatedclasses.tables.records.T_785Record> {
 
-	private static final long serialVersionUID = -2089035663;
+	private static final long serialVersionUID = -81425934;
 
 	/**
 	 * The singleton instance of PUBLIC.T_785
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/T_937.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/T_937.java
index c8c8f7e7c2..c1a6274a1d 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/T_937.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/T_937.java
@@ -6,11 +6,11 @@ package org.jooq.test.hsqldb.generatedclasses.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public class T_937 extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.hsqldb.generatedclasses.tables.records.T_937Record> {
 
-	private static final long serialVersionUID = -793533990;
+	private static final long serialVersionUID = -1694569927;
 
 	/**
 	 * The singleton instance of PUBLIC.T_937
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/VAuthor.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/VAuthor.java
index a0bcb4d442..cec2a34f40 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/VAuthor.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/VAuthor.java
@@ -6,11 +6,11 @@ package org.jooq.test.hsqldb.generatedclasses.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public class VAuthor extends org.jooq.impl.TableImpl<org.jooq.test.hsqldb.generatedclasses.tables.records.VAuthorRecord> {
 
-	private static final long serialVersionUID = -1949393977;
+	private static final long serialVersionUID = -1301786970;
 
 	/**
 	 * The singleton instance of PUBLIC.V_AUTHOR
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/VBook.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/VBook.java
index e374ef0b58..e6bec7a5ea 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/VBook.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/VBook.java
@@ -6,11 +6,11 @@ package org.jooq.test.hsqldb.generatedclasses.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public class VBook extends org.jooq.impl.TableImpl<org.jooq.test.hsqldb.generatedclasses.tables.records.VBookRecord> {
 
-	private static final long serialVersionUID = -2033989221;
+	private static final long serialVersionUID = 1996859130;
 
 	/**
 	 * The singleton instance of PUBLIC.V_BOOK
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/VLibrary.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/VLibrary.java
index 3ce9d8e68a..352f3272b4 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/VLibrary.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/VLibrary.java
@@ -6,11 +6,11 @@ package org.jooq.test.hsqldb.generatedclasses.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public class VLibrary extends org.jooq.impl.TableImpl<org.jooq.test.hsqldb.generatedclasses.tables.records.VLibraryRecord> {
 
-	private static final long serialVersionUID = -1354984231;
+	private static final long serialVersionUID = -1929636936;
 
 	/**
 	 * The singleton instance of PUBLIC.V_LIBRARY
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/XTestCase_64_69.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/XTestCase_64_69.java
index 2e335584f8..abf04090bb 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/XTestCase_64_69.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/XTestCase_64_69.java
@@ -6,11 +6,11 @@ package org.jooq.test.hsqldb.generatedclasses.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public class XTestCase_64_69 extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.hsqldb.generatedclasses.tables.records.XTestCase_64_69Record> {
 
-	private static final long serialVersionUID = 1826877199;
+	private static final long serialVersionUID = 1780533584;
 
 	/**
 	 * The singleton instance of PUBLIC.X_TEST_CASE_64_69
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/XTestCase_71.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/XTestCase_71.java
index dad6fd5d60..fd0c859fba 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/XTestCase_71.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/XTestCase_71.java
@@ -6,11 +6,11 @@ package org.jooq.test.hsqldb.generatedclasses.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public class XTestCase_71 extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.hsqldb.generatedclasses.tables.records.XTestCase_71Record> {
 
-	private static final long serialVersionUID = 495327291;
+	private static final long serialVersionUID = -1927033796;
 
 	/**
 	 * The singleton instance of PUBLIC.X_TEST_CASE_71
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/XTestCase_85.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/XTestCase_85.java
index 7fcbb7665f..8f720c0309 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/XTestCase_85.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/XTestCase_85.java
@@ -6,11 +6,11 @@ package org.jooq.test.hsqldb.generatedclasses.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public class XTestCase_85 extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.hsqldb.generatedclasses.tables.records.XTestCase_85Record> {
 
-	private static final long serialVersionUID = -1634688210;
+	private static final long serialVersionUID = -1025474227;
 
 	/**
 	 * The singleton instance of PUBLIC.X_TEST_CASE_85
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/XUnused.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/XUnused.java
index 43c59b5fc1..71e709ba44 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/XUnused.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/XUnused.java
@@ -6,11 +6,11 @@ package org.jooq.test.hsqldb.generatedclasses.tables;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public class XUnused extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.hsqldb.generatedclasses.tables.records.XUnusedRecord> {
 
-	private static final long serialVersionUID = 720710583;
+	private static final long serialVersionUID = 686818296;
 
 	/**
 	 * The singleton instance of PUBLIC.X_UNUSED
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/BigDecimalRecord.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/BigDecimalRecord.java
index a3021353fc..8efb6f72c4 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/BigDecimalRecord.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/BigDecimalRecord.java
@@ -6,11 +6,11 @@ package org.jooq.test.hsqldb.generatedclasses.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public class BigDecimalRecord extends org.jooq.impl.TableRecordImpl<org.jooq.test.hsqldb.generatedclasses.tables.records.BigDecimalRecord> {
 
-	private static final long serialVersionUID = 1451309006;
+	private static final long serialVersionUID = 724160591;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/ClassRecord.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/ClassRecord.java
index 039f438c3d..a8e58f768f 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/ClassRecord.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/ClassRecord.java
@@ -6,11 +6,11 @@ package org.jooq.test.hsqldb.generatedclasses.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public class ClassRecord extends org.jooq.impl.TableRecordImpl<org.jooq.test.hsqldb.generatedclasses.tables.records.ClassRecord> {
 
-	private static final long serialVersionUID = -1830261089;
+	private static final long serialVersionUID = -456332098;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/IntegerRecord.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/IntegerRecord.java
index caa1723d71..49d62f4050 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/IntegerRecord.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/IntegerRecord.java
@@ -6,11 +6,11 @@ package org.jooq.test.hsqldb.generatedclasses.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public class IntegerRecord extends org.jooq.impl.TableRecordImpl<org.jooq.test.hsqldb.generatedclasses.tables.records.IntegerRecord> {
 
-	private static final long serialVersionUID = 2135317675;
+	private static final long serialVersionUID = 812692298;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/LongRecord.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/LongRecord.java
index 3d63c1b416..c3a476e6d5 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/LongRecord.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/LongRecord.java
@@ -6,11 +6,11 @@ package org.jooq.test.hsqldb.generatedclasses.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public class LongRecord extends org.jooq.impl.TableRecordImpl<org.jooq.test.hsqldb.generatedclasses.tables.records.LongRecord> {
 
-	private static final long serialVersionUID = -1299870399;
+	private static final long serialVersionUID = 1981783072;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/ObjectRecord.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/ObjectRecord.java
index 983ee91153..2c789150b5 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/ObjectRecord.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/ObjectRecord.java
@@ -6,11 +6,11 @@ package org.jooq.test.hsqldb.generatedclasses.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public class ObjectRecord extends org.jooq.impl.TableRecordImpl<org.jooq.test.hsqldb.generatedclasses.tables.records.ObjectRecord> {
 
-	private static final long serialVersionUID = 1397328769;
+	private static final long serialVersionUID = 145103968;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/StringRecord.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/StringRecord.java
index 36c3819863..bb6d5db9f4 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/StringRecord.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/StringRecord.java
@@ -6,11 +6,11 @@ package org.jooq.test.hsqldb.generatedclasses.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public class StringRecord extends org.jooq.impl.TableRecordImpl<org.jooq.test.hsqldb.generatedclasses.tables.records.StringRecord> {
 
-	private static final long serialVersionUID = 2137525953;
+	private static final long serialVersionUID = -969481824;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/SystemRecord.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/SystemRecord.java
index 0b66f311e2..f9e319427b 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/SystemRecord.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/SystemRecord.java
@@ -6,11 +6,11 @@ package org.jooq.test.hsqldb.generatedclasses.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public class SystemRecord extends org.jooq.impl.TableRecordImpl<org.jooq.test.hsqldb.generatedclasses.tables.records.SystemRecord> {
 
-	private static final long serialVersionUID = -1055921905;
+	private static final long serialVersionUID = -13030802;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/TArraysRecord.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/TArraysRecord.java
index 6bea53a543..93173fb25d 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/TArraysRecord.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/TArraysRecord.java
@@ -6,11 +6,11 @@ package org.jooq.test.hsqldb.generatedclasses.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public class TArraysRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.test.hsqldb.generatedclasses.tables.records.TArraysRecord> {
 
-	private static final long serialVersionUID = -156467620;
+	private static final long serialVersionUID = -572488419;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/TAuthorRecord.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/TAuthorRecord.java
index 80dd92c780..72c01ebc2c 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/TAuthorRecord.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/TAuthorRecord.java
@@ -6,11 +6,11 @@ package org.jooq.test.hsqldb.generatedclasses.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public class TAuthorRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.test.hsqldb.generatedclasses.tables.records.TAuthorRecord> {
 
-	private static final long serialVersionUID = 277295431;
+	private static final long serialVersionUID = 1303080998;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/TBookRecord.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/TBookRecord.java
index b24f0b3600..b42cbed308 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/TBookRecord.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/TBookRecord.java
@@ -6,11 +6,11 @@ package org.jooq.test.hsqldb.generatedclasses.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public class TBookRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.test.hsqldb.generatedclasses.tables.records.TBookRecord> {
 
-	private static final long serialVersionUID = 187911614;
+	private static final long serialVersionUID = 1960472511;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/TBookStoreRecord.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/TBookStoreRecord.java
index 8b94235921..9f6f418c11 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/TBookStoreRecord.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/TBookStoreRecord.java
@@ -6,11 +6,11 @@ package org.jooq.test.hsqldb.generatedclasses.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public class TBookStoreRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.test.hsqldb.generatedclasses.tables.records.TBookStoreRecord> {
 
-	private static final long serialVersionUID = -1892568058;
+	private static final long serialVersionUID = -1349472953;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/TBookToBookStoreRecord.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/TBookToBookStoreRecord.java
index 5ceaff2e1a..3c6fa4e2cd 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/TBookToBookStoreRecord.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/TBookToBookStoreRecord.java
@@ -6,11 +6,11 @@ package org.jooq.test.hsqldb.generatedclasses.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public class TBookToBookStoreRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.test.hsqldb.generatedclasses.tables.records.TBookToBookStoreRecord> {
 
-	private static final long serialVersionUID = 1400544104;
+	private static final long serialVersionUID = 989983849;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/TBooleansRecord.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/TBooleansRecord.java
index 87f099bb57..dc83f82f84 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/TBooleansRecord.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/TBooleansRecord.java
@@ -6,11 +6,11 @@ package org.jooq.test.hsqldb.generatedclasses.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public class TBooleansRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.test.hsqldb.generatedclasses.tables.records.TBooleansRecord> {
 
-	private static final long serialVersionUID = 771390912;
+	private static final long serialVersionUID = 348259137;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/TDatesRecord.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/TDatesRecord.java
index 47a7f0c088..197b3b5135 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/TDatesRecord.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/TDatesRecord.java
@@ -6,11 +6,11 @@ package org.jooq.test.hsqldb.generatedclasses.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public class TDatesRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.test.hsqldb.generatedclasses.tables.records.TDatesRecord> {
 
-	private static final long serialVersionUID = -1248398810;
+	private static final long serialVersionUID = 2104447783;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/TIdentityPkRecord.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/TIdentityPkRecord.java
index 50dba39889..58af0e4ceb 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/TIdentityPkRecord.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/TIdentityPkRecord.java
@@ -6,11 +6,11 @@ package org.jooq.test.hsqldb.generatedclasses.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public class TIdentityPkRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.test.hsqldb.generatedclasses.tables.records.TIdentityPkRecord> {
 
-	private static final long serialVersionUID = -1192773185;
+	private static final long serialVersionUID = 1762519966;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/TIdentityRecord.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/TIdentityRecord.java
index 33e2e3a1a0..bf360110ea 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/TIdentityRecord.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/TIdentityRecord.java
@@ -6,11 +6,11 @@ package org.jooq.test.hsqldb.generatedclasses.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public class TIdentityRecord extends org.jooq.impl.TableRecordImpl<org.jooq.test.hsqldb.generatedclasses.tables.records.TIdentityRecord> {
 
-	private static final long serialVersionUID = -910006404;
+	private static final long serialVersionUID = 2037455741;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/TTriggersRecord.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/TTriggersRecord.java
index 791bf8f537..aee03890c6 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/TTriggersRecord.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/TTriggersRecord.java
@@ -6,11 +6,11 @@ package org.jooq.test.hsqldb.generatedclasses.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public class TTriggersRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.test.hsqldb.generatedclasses.tables.records.TTriggersRecord> {
 
-	private static final long serialVersionUID = -1684327206;
+	private static final long serialVersionUID = 487025243;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/T_639NumbersTableRecord.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/T_639NumbersTableRecord.java
index 6fc03f8a85..38850928e9 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/T_639NumbersTableRecord.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/T_639NumbersTableRecord.java
@@ -6,11 +6,11 @@ package org.jooq.test.hsqldb.generatedclasses.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public class T_639NumbersTableRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.test.hsqldb.generatedclasses.tables.records.T_639NumbersTableRecord> {
 
-	private static final long serialVersionUID = -1086903949;
+	private static final long serialVersionUID = 2061681170;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/T_658RefRecord.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/T_658RefRecord.java
index 8d67c4084e..0f5cf06ae5 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/T_658RefRecord.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/T_658RefRecord.java
@@ -6,11 +6,11 @@ package org.jooq.test.hsqldb.generatedclasses.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public class T_658RefRecord extends org.jooq.impl.TableRecordImpl<org.jooq.test.hsqldb.generatedclasses.tables.records.T_658RefRecord> {
 
-	private static final long serialVersionUID = -1289364194;
+	private static final long serialVersionUID = -743588385;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/T_725LobTestRecord.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/T_725LobTestRecord.java
index 55d37f2aaa..b9dc3bed68 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/T_725LobTestRecord.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/T_725LobTestRecord.java
@@ -6,11 +6,11 @@ package org.jooq.test.hsqldb.generatedclasses.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public class T_725LobTestRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.test.hsqldb.generatedclasses.tables.records.T_725LobTestRecord> {
 
-	private static final long serialVersionUID = 5944951;
+	private static final long serialVersionUID = 1784952662;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/T_785Record.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/T_785Record.java
index cb8e286482..72e457bbc7 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/T_785Record.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/T_785Record.java
@@ -6,11 +6,11 @@ package org.jooq.test.hsqldb.generatedclasses.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public class T_785Record extends org.jooq.impl.TableRecordImpl<org.jooq.test.hsqldb.generatedclasses.tables.records.T_785Record> {
 
-	private static final long serialVersionUID = -130135367;
+	private static final long serialVersionUID = -796917672;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/T_937Record.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/T_937Record.java
index dc689f19d7..3d6a68f6c5 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/T_937Record.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/T_937Record.java
@@ -6,11 +6,11 @@ package org.jooq.test.hsqldb.generatedclasses.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public class T_937Record extends org.jooq.impl.UpdatableRecordImpl<org.jooq.test.hsqldb.generatedclasses.tables.records.T_937Record> {
 
-	private static final long serialVersionUID = 494464917;
+	private static final long serialVersionUID = 42990388;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/VAuthorRecord.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/VAuthorRecord.java
index 4c66321330..0521f7a9a6 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/VAuthorRecord.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/VAuthorRecord.java
@@ -6,11 +6,11 @@ package org.jooq.test.hsqldb.generatedclasses.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public class VAuthorRecord extends org.jooq.impl.TableRecordImpl<org.jooq.test.hsqldb.generatedclasses.tables.records.VAuthorRecord> {
 
-	private static final long serialVersionUID = 1789200976;
+	private static final long serialVersionUID = 1896642705;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/VBookRecord.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/VBookRecord.java
index 2624a656f9..98bd4d7175 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/VBookRecord.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/VBookRecord.java
@@ -6,11 +6,11 @@ package org.jooq.test.hsqldb.generatedclasses.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public class VBookRecord extends org.jooq.impl.TableRecordImpl<org.jooq.test.hsqldb.generatedclasses.tables.records.VBookRecord> {
 
-	private static final long serialVersionUID = 280660556;
+	private static final long serialVersionUID = -1836362227;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/VLibraryRecord.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/VLibraryRecord.java
index 40e2e953ad..d547b3f44b 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/VLibraryRecord.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/VLibraryRecord.java
@@ -6,11 +6,11 @@ package org.jooq.test.hsqldb.generatedclasses.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public class VLibraryRecord extends org.jooq.impl.TableRecordImpl<org.jooq.test.hsqldb.generatedclasses.tables.records.VLibraryRecord> {
 
-	private static final long serialVersionUID = -1354463592;
+	private static final long serialVersionUID = 2063758809;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/XTestCase_64_69Record.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/XTestCase_64_69Record.java
index ed63036279..54c354234a 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/XTestCase_64_69Record.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/XTestCase_64_69Record.java
@@ -6,11 +6,11 @@ package org.jooq.test.hsqldb.generatedclasses.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public class XTestCase_64_69Record extends org.jooq.impl.UpdatableRecordImpl<org.jooq.test.hsqldb.generatedclasses.tables.records.XTestCase_64_69Record> {
 
-	private static final long serialVersionUID = 61605488;
+	private static final long serialVersionUID = 1832556559;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/XTestCase_71Record.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/XTestCase_71Record.java
index 7f4ec89c86..87a943be55 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/XTestCase_71Record.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/XTestCase_71Record.java
@@ -6,11 +6,11 @@ package org.jooq.test.hsqldb.generatedclasses.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public class XTestCase_71Record extends org.jooq.impl.UpdatableRecordImpl<org.jooq.test.hsqldb.generatedclasses.tables.records.XTestCase_71Record> {
 
-	private static final long serialVersionUID = -966719315;
+	private static final long serialVersionUID = 10821358;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/XTestCase_85Record.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/XTestCase_85Record.java
index 81a9d23408..b16bba1d8f 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/XTestCase_85Record.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/XTestCase_85Record.java
@@ -6,11 +6,11 @@ package org.jooq.test.hsqldb.generatedclasses.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public class XTestCase_85Record extends org.jooq.impl.UpdatableRecordImpl<org.jooq.test.hsqldb.generatedclasses.tables.records.XTestCase_85Record> {
 
-	private static final long serialVersionUID = -773922949;
+	private static final long serialVersionUID = -1295575206;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/XUnusedRecord.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/XUnusedRecord.java
index 294d3844c4..cfcae9c7b7 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/XUnusedRecord.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/XUnusedRecord.java
@@ -6,11 +6,11 @@ package org.jooq.test.hsqldb.generatedclasses.tables.records;
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.5"},
+@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.0.6"},
                             comments = "This class is generated by jOOQ")
 public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.test.hsqldb.generatedclasses.tables.records.XUnusedRecord> {
 
-	private static final long serialVersionUID = 400471343;
+	private static final long serialVersionUID = -583063538;
 
 	/**
 	 * An uncommented item
diff --git a/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/routines/F317.java b/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/routines/F317.java
index 80215c2468..b666100286 100644
--- a/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/routines/F317.java
+++ b/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/routines/F317.java
@@ -10,7 +10,7 @@ package org.jooq.test.mysql.generatedclasses.routines;
  */
 public class F317 extends org.jooq.impl.AbstractRoutine<java.lang.Integer> {
 
-	private static final long serialVersionUID = 296917459;
+	private static final long serialVersionUID = 627542082;
 
 
 	/**
@@ -42,7 +42,7 @@ public class F317 extends org.jooq.impl.AbstractRoutine<java.lang.Integer> {
 	 * Create a new routine call instance
 	 */
 	public F317() {
-		super(org.jooq.SQLDialect.MYSQL, "f317", org.jooq.test.mysql.generatedclasses.Test.TEST, org.jooq.impl.SQLDataType.INTEGER);
+		super("f317", org.jooq.test.mysql.generatedclasses.Test.TEST, org.jooq.impl.SQLDataType.INTEGER);
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(P1);
diff --git a/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/routines/FAuthorExists.java b/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/routines/FAuthorExists.java
index 3f77520813..2fa304b6b7 100644
--- a/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/routines/FAuthorExists.java
+++ b/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/routines/FAuthorExists.java
@@ -10,7 +10,7 @@ package org.jooq.test.mysql.generatedclasses.routines;
  */
 public class FAuthorExists extends org.jooq.impl.AbstractRoutine<java.lang.Integer> {
 
-	private static final long serialVersionUID = 1481173816;
+	private static final long serialVersionUID = 484078391;
 
 
 	/**
@@ -27,7 +27,7 @@ public class FAuthorExists extends org.jooq.impl.AbstractRoutine<java.lang.Integ
 	 * Create a new routine call instance
 	 */
 	public FAuthorExists() {
-		super(org.jooq.SQLDialect.MYSQL, "f_author_exists", org.jooq.test.mysql.generatedclasses.Test.TEST, org.jooq.impl.SQLDataType.INTEGER);
+		super("f_author_exists", org.jooq.test.mysql.generatedclasses.Test.TEST, org.jooq.impl.SQLDataType.INTEGER);
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(AUTHOR_NAME);
diff --git a/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/routines/FNumber.java b/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/routines/FNumber.java
index b74cc626d8..06a0e9ac22 100644
--- a/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/routines/FNumber.java
+++ b/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/routines/FNumber.java
@@ -10,7 +10,7 @@ package org.jooq.test.mysql.generatedclasses.routines;
  */
 public class FNumber extends org.jooq.impl.AbstractRoutine<java.lang.Integer> {
 
-	private static final long serialVersionUID = 1601753450;
+	private static final long serialVersionUID = -1080084069;
 
 
 	/**
@@ -27,7 +27,7 @@ public class FNumber extends org.jooq.impl.AbstractRoutine<java.lang.Integer> {
 	 * Create a new routine call instance
 	 */
 	public FNumber() {
-		super(org.jooq.SQLDialect.MYSQL, "f_number", org.jooq.test.mysql.generatedclasses.Test.TEST, org.jooq.impl.SQLDataType.INTEGER);
+		super("f_number", org.jooq.test.mysql.generatedclasses.Test.TEST, org.jooq.impl.SQLDataType.INTEGER);
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(N);
diff --git a/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/routines/FOne.java b/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/routines/FOne.java
index a3f5861f10..28208c8d5d 100644
--- a/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/routines/FOne.java
+++ b/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/routines/FOne.java
@@ -10,7 +10,7 @@ package org.jooq.test.mysql.generatedclasses.routines;
  */
 public class FOne extends org.jooq.impl.AbstractRoutine<java.lang.Integer> {
 
-	private static final long serialVersionUID = 1083263164;
+	private static final long serialVersionUID = 641804479;
 
 
 	/**
@@ -22,7 +22,7 @@ public class FOne extends org.jooq.impl.AbstractRoutine<java.lang.Integer> {
 	 * Create a new routine call instance
 	 */
 	public FOne() {
-		super(org.jooq.SQLDialect.MYSQL, "f_one", org.jooq.test.mysql.generatedclasses.Test.TEST, org.jooq.impl.SQLDataType.INTEGER);
+		super("f_one", org.jooq.test.mysql.generatedclasses.Test.TEST, org.jooq.impl.SQLDataType.INTEGER);
 
 		setReturnParameter(RETURN_VALUE);
 	}
diff --git a/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/routines/P391.java b/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/routines/P391.java
index 6a71b8452d..9ca92a6e77 100644
--- a/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/routines/P391.java
+++ b/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/routines/P391.java
@@ -10,7 +10,7 @@ package org.jooq.test.mysql.generatedclasses.routines;
  */
 public class P391 extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = 1103404718;
+	private static final long serialVersionUID = 1719688547;
 
 
 	/**
@@ -47,7 +47,7 @@ public class P391 extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 	 * Create a new routine call instance
 	 */
 	public P391() {
-		super(org.jooq.SQLDialect.MYSQL, "p391", org.jooq.test.mysql.generatedclasses.Test.TEST);
+		super("p391", org.jooq.test.mysql.generatedclasses.Test.TEST);
 
 		addInParameter(I1);
 		addInOutParameter(IO1);
diff --git a/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/routines/PAuthorExists.java b/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/routines/PAuthorExists.java
index 2987afeb6b..7e437e9fc8 100644
--- a/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/routines/PAuthorExists.java
+++ b/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/routines/PAuthorExists.java
@@ -10,7 +10,7 @@ package org.jooq.test.mysql.generatedclasses.routines;
  */
 public class PAuthorExists extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = -730445672;
+	private static final long serialVersionUID = -1805452743;
 
 
 	/**
@@ -27,7 +27,7 @@ public class PAuthorExists extends org.jooq.impl.AbstractRoutine<java.lang.Void>
 	 * Create a new routine call instance
 	 */
 	public PAuthorExists() {
-		super(org.jooq.SQLDialect.MYSQL, "p_author_exists", org.jooq.test.mysql.generatedclasses.Test.TEST);
+		super("p_author_exists", org.jooq.test.mysql.generatedclasses.Test.TEST);
 
 		addInParameter(AUTHOR_NAME);
 		addOutParameter(RESULT);
diff --git a/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/routines/PCreateAuthor.java b/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/routines/PCreateAuthor.java
index 8bf6e9a12f..c48637816b 100644
--- a/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/routines/PCreateAuthor.java
+++ b/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/routines/PCreateAuthor.java
@@ -10,13 +10,13 @@ package org.jooq.test.mysql.generatedclasses.routines;
  */
 public class PCreateAuthor extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = -1370835751;
+	private static final long serialVersionUID = 890451030;
 
 
 	/**
 	 * Create a new routine call instance
 	 */
 	public PCreateAuthor() {
-		super(org.jooq.SQLDialect.MYSQL, "p_create_author", org.jooq.test.mysql.generatedclasses.Test.TEST);
+		super("p_create_author", org.jooq.test.mysql.generatedclasses.Test.TEST);
 	}
 }
diff --git a/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/routines/PCreateAuthorByName.java b/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/routines/PCreateAuthorByName.java
index a07e795efc..30bda5a7ef 100644
--- a/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/routines/PCreateAuthorByName.java
+++ b/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/routines/PCreateAuthorByName.java
@@ -10,7 +10,7 @@ package org.jooq.test.mysql.generatedclasses.routines;
  */
 public class PCreateAuthorByName extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = 943424121;
+	private static final long serialVersionUID = 1702167816;
 
 
 	/**
@@ -27,7 +27,7 @@ public class PCreateAuthorByName extends org.jooq.impl.AbstractRoutine<java.lang
 	 * Create a new routine call instance
 	 */
 	public PCreateAuthorByName() {
-		super(org.jooq.SQLDialect.MYSQL, "p_create_author_by_name", org.jooq.test.mysql.generatedclasses.Test.TEST);
+		super("p_create_author_by_name", org.jooq.test.mysql.generatedclasses.Test.TEST);
 
 		addInParameter(FIRST_NAME);
 		addInParameter(LAST_NAME);
diff --git a/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/routines/PUnused.java b/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/routines/PUnused.java
index 14d55e38f9..27c9f9412c 100644
--- a/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/routines/PUnused.java
+++ b/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/routines/PUnused.java
@@ -8,7 +8,7 @@ package org.jooq.test.mysql.generatedclasses.routines;
  */
 public class PUnused extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = 97058320;
+	private static final long serialVersionUID = 769434861;
 
 
 	/**
@@ -30,7 +30,7 @@ public class PUnused extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 	 * Create a new routine call instance
 	 */
 	public PUnused() {
-		super(org.jooq.SQLDialect.MYSQL, "p_unused", org.jooq.test.mysql.generatedclasses.Test.TEST);
+		super("p_unused", org.jooq.test.mysql.generatedclasses.Test.TEST);
 
 		addInParameter(IN1);
 		addOutParameter(OUT1);
diff --git a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/routines/F317.java b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/routines/F317.java
index 5032cfe33f..4e15f56b66 100644
--- a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/routines/F317.java
+++ b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/routines/F317.java
@@ -10,7 +10,7 @@ package org.jooq.test.mysql2.generatedclasses.routines;
  */
 public class F317 extends org.jooq.impl.AbstractRoutine<java.lang.Integer> {
 
-	private static final long serialVersionUID = 526426281;
+	private static final long serialVersionUID = -693136258;
 
 
 	/**
@@ -42,7 +42,7 @@ public class F317 extends org.jooq.impl.AbstractRoutine<java.lang.Integer> {
 	 * Create a new routine call instance
 	 */
 	public F317() {
-		super(org.jooq.SQLDialect.MYSQL, "f317", org.jooq.test.mysql2.generatedclasses.Test2.TEST2, org.jooq.impl.SQLDataType.INTEGER);
+		super("f317", org.jooq.test.mysql2.generatedclasses.Test2.TEST2, org.jooq.impl.SQLDataType.INTEGER);
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(P1);
diff --git a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/routines/FAuthorExists.java b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/routines/FAuthorExists.java
index 9b60575780..0c9a6dc25c 100644
--- a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/routines/FAuthorExists.java
+++ b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/routines/FAuthorExists.java
@@ -10,7 +10,7 @@ package org.jooq.test.mysql2.generatedclasses.routines;
  */
 public class FAuthorExists extends org.jooq.impl.AbstractRoutine<java.lang.Integer> {
 
-	private static final long serialVersionUID = -2032793608;
+	private static final long serialVersionUID = -1622785987;
 
 
 	/**
@@ -27,7 +27,7 @@ public class FAuthorExists extends org.jooq.impl.AbstractRoutine<java.lang.Integ
 	 * Create a new routine call instance
 	 */
 	public FAuthorExists() {
-		super(org.jooq.SQLDialect.MYSQL, "f_author_exists", org.jooq.test.mysql2.generatedclasses.Test2.TEST2, org.jooq.impl.SQLDataType.INTEGER);
+		super("f_author_exists", org.jooq.test.mysql2.generatedclasses.Test2.TEST2, org.jooq.impl.SQLDataType.INTEGER);
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(AUTHOR_NAME);
diff --git a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/routines/FNumber.java b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/routines/FNumber.java
index e39aa8796e..035bec1fee 100644
--- a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/routines/FNumber.java
+++ b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/routines/FNumber.java
@@ -10,7 +10,7 @@ package org.jooq.test.mysql2.generatedclasses.routines;
  */
 public class FNumber extends org.jooq.impl.AbstractRoutine<java.lang.Integer> {
 
-	private static final long serialVersionUID = 810500864;
+	private static final long serialVersionUID = 1710816467;
 
 
 	/**
@@ -27,7 +27,7 @@ public class FNumber extends org.jooq.impl.AbstractRoutine<java.lang.Integer> {
 	 * Create a new routine call instance
 	 */
 	public FNumber() {
-		super(org.jooq.SQLDialect.MYSQL, "f_number", org.jooq.test.mysql2.generatedclasses.Test2.TEST2, org.jooq.impl.SQLDataType.INTEGER);
+		super("f_number", org.jooq.test.mysql2.generatedclasses.Test2.TEST2, org.jooq.impl.SQLDataType.INTEGER);
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(N);
diff --git a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/routines/FOne.java b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/routines/FOne.java
index aaa4b7d4ec..4aa005b9b1 100644
--- a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/routines/FOne.java
+++ b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/routines/FOne.java
@@ -10,7 +10,7 @@ package org.jooq.test.mysql2.generatedclasses.routines;
  */
 public class FOne extends org.jooq.impl.AbstractRoutine<java.lang.Integer> {
 
-	private static final long serialVersionUID = 1101373292;
+	private static final long serialVersionUID = -1963354835;
 
 
 	/**
@@ -22,7 +22,7 @@ public class FOne extends org.jooq.impl.AbstractRoutine<java.lang.Integer> {
 	 * Create a new routine call instance
 	 */
 	public FOne() {
-		super(org.jooq.SQLDialect.MYSQL, "f_one", org.jooq.test.mysql2.generatedclasses.Test2.TEST2, org.jooq.impl.SQLDataType.INTEGER);
+		super("f_one", org.jooq.test.mysql2.generatedclasses.Test2.TEST2, org.jooq.impl.SQLDataType.INTEGER);
 
 		setReturnParameter(RETURN_VALUE);
 	}
diff --git a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/routines/P391.java b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/routines/P391.java
index ea140b98f7..a4fea442c1 100644
--- a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/routines/P391.java
+++ b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/routines/P391.java
@@ -10,7 +10,7 @@ package org.jooq.test.mysql2.generatedclasses.routines;
  */
 public class P391 extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = 1581975400;
+	private static final long serialVersionUID = 1464524599;
 
 
 	/**
@@ -47,7 +47,7 @@ public class P391 extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 	 * Create a new routine call instance
 	 */
 	public P391() {
-		super(org.jooq.SQLDialect.MYSQL, "p391", org.jooq.test.mysql2.generatedclasses.Test2.TEST2);
+		super("p391", org.jooq.test.mysql2.generatedclasses.Test2.TEST2);
 
 		addInParameter(I1);
 		addInOutParameter(IO1);
diff --git a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/routines/PAuthorExists.java b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/routines/PAuthorExists.java
index 17b1b1bb53..13728bae75 100644
--- a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/routines/PAuthorExists.java
+++ b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/routines/PAuthorExists.java
@@ -10,7 +10,7 @@ package org.jooq.test.mysql2.generatedclasses.routines;
  */
 public class PAuthorExists extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = -217856480;
+	private static final long serialVersionUID = -1270401917;
 
 
 	/**
@@ -27,7 +27,7 @@ public class PAuthorExists extends org.jooq.impl.AbstractRoutine<java.lang.Void>
 	 * Create a new routine call instance
 	 */
 	public PAuthorExists() {
-		super(org.jooq.SQLDialect.MYSQL, "p_author_exists", org.jooq.test.mysql2.generatedclasses.Test2.TEST2);
+		super("p_author_exists", org.jooq.test.mysql2.generatedclasses.Test2.TEST2);
 
 		addInParameter(AUTHOR_NAME);
 		addOutParameter(RESULT);
diff --git a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/routines/PCreateAuthor.java b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/routines/PCreateAuthor.java
index a75be9b4b7..cc9b1bb990 100644
--- a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/routines/PCreateAuthor.java
+++ b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/routines/PCreateAuthor.java
@@ -10,13 +10,13 @@ package org.jooq.test.mysql2.generatedclasses.routines;
  */
 public class PCreateAuthor extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = -1364493557;
+	private static final long serialVersionUID = 1909035850;
 
 
 	/**
 	 * Create a new routine call instance
 	 */
 	public PCreateAuthor() {
-		super(org.jooq.SQLDialect.MYSQL, "p_create_author", org.jooq.test.mysql2.generatedclasses.Test2.TEST2);
+		super("p_create_author", org.jooq.test.mysql2.generatedclasses.Test2.TEST2);
 	}
 }
diff --git a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/routines/PCreateAuthorByName.java b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/routines/PCreateAuthorByName.java
index b768549957..1176ed7945 100644
--- a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/routines/PCreateAuthorByName.java
+++ b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/routines/PCreateAuthorByName.java
@@ -10,7 +10,7 @@ package org.jooq.test.mysql2.generatedclasses.routines;
  */
 public class PCreateAuthorByName extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = -1357067893;
+	private static final long serialVersionUID = 1979115584;
 
 
 	/**
@@ -27,7 +27,7 @@ public class PCreateAuthorByName extends org.jooq.impl.AbstractRoutine<java.lang
 	 * Create a new routine call instance
 	 */
 	public PCreateAuthorByName() {
-		super(org.jooq.SQLDialect.MYSQL, "p_create_author_by_name", org.jooq.test.mysql2.generatedclasses.Test2.TEST2);
+		super("p_create_author_by_name", org.jooq.test.mysql2.generatedclasses.Test2.TEST2);
 
 		addInParameter(FIRST_NAME);
 		addInParameter(LAST_NAME);
diff --git a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/routines/PUnused.java b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/routines/PUnused.java
index f7b4ddfab9..a15204bfc1 100644
--- a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/routines/PUnused.java
+++ b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/routines/PUnused.java
@@ -8,7 +8,7 @@ package org.jooq.test.mysql2.generatedclasses.routines;
  */
 public class PUnused extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = 374652088;
+	private static final long serialVersionUID = 1003218271;
 
 
 	/**
@@ -30,7 +30,7 @@ public class PUnused extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 	 * Create a new routine call instance
 	 */
 	public PUnused() {
-		super(org.jooq.SQLDialect.MYSQL, "p_unused", org.jooq.test.mysql2.generatedclasses.Test2.TEST2);
+		super("p_unused", org.jooq.test.mysql2.generatedclasses.Test2.TEST2);
 
 		addInParameter(IN1);
 		addOutParameter(OUT1);
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/packages/library/PkgF378.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/packages/library/PkgF378.java
index e673eb72c2..78b1e87559 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/packages/library/PkgF378.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/packages/library/PkgF378.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle.generatedclasses.test.packages.library;
  */
 public class PkgF378 extends org.jooq.impl.AbstractRoutine<java.math.BigDecimal> {
 
-	private static final long serialVersionUID = -1998498536;
+	private static final long serialVersionUID = -1115353395;
 
 
 	/**
@@ -35,7 +35,7 @@ public class PkgF378 extends org.jooq.impl.AbstractRoutine<java.math.BigDecimal>
 	 * Create a new routine call instance
 	 */
 	public PkgF378() {
-		super(org.jooq.SQLDialect.ORACLE, "PKG_F378", org.jooq.test.oracle.generatedclasses.test.Test.TEST, org.jooq.test.oracle.generatedclasses.test.packages.Library.LIBRARY, org.jooq.impl.SQLDataType.NUMERIC);
+		super("PKG_F378", org.jooq.test.oracle.generatedclasses.test.Test.TEST, org.jooq.test.oracle.generatedclasses.test.packages.Library.LIBRARY, org.jooq.impl.SQLDataType.NUMERIC);
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(I);
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/packages/library/PkgFAuthorExists1.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/packages/library/PkgFAuthorExists1.java
index ac1632f47a..0e1e73b764 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/packages/library/PkgFAuthorExists1.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/packages/library/PkgFAuthorExists1.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle.generatedclasses.test.packages.library;
  */
 public class PkgFAuthorExists1 extends org.jooq.impl.AbstractRoutine<java.math.BigDecimal> {
 
-	private static final long serialVersionUID = 744668871;
+	private static final long serialVersionUID = 1442872754;
 
 
 	/**
@@ -25,7 +25,7 @@ public class PkgFAuthorExists1 extends org.jooq.impl.AbstractRoutine<java.math.B
 	 * Create a new routine call instance
 	 */
 	public PkgFAuthorExists1() {
-		super(org.jooq.SQLDialect.ORACLE, "PKG_F_AUTHOR_EXISTS", org.jooq.test.oracle.generatedclasses.test.Test.TEST, org.jooq.test.oracle.generatedclasses.test.packages.Library.LIBRARY, org.jooq.impl.SQLDataType.NUMERIC);
+		super("PKG_F_AUTHOR_EXISTS", org.jooq.test.oracle.generatedclasses.test.Test.TEST, org.jooq.test.oracle.generatedclasses.test.packages.Library.LIBRARY, org.jooq.impl.SQLDataType.NUMERIC);
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(AUTHOR_NAME);
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/packages/library/PkgFAuthorExists2.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/packages/library/PkgFAuthorExists2.java
index 7be5926325..877c1d4e46 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/packages/library/PkgFAuthorExists2.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/packages/library/PkgFAuthorExists2.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle.generatedclasses.test.packages.library;
  */
 public class PkgFAuthorExists2 extends org.jooq.impl.AbstractRoutine<java.math.BigDecimal> {
 
-	private static final long serialVersionUID = 1730293060;
+	private static final long serialVersionUID = 1642385081;
 
 
 	/**
@@ -30,7 +30,7 @@ public class PkgFAuthorExists2 extends org.jooq.impl.AbstractRoutine<java.math.B
 	 * Create a new routine call instance
 	 */
 	public PkgFAuthorExists2() {
-		super(org.jooq.SQLDialect.ORACLE, "PKG_F_AUTHOR_EXISTS", org.jooq.test.oracle.generatedclasses.test.Test.TEST, org.jooq.test.oracle.generatedclasses.test.packages.Library.LIBRARY, org.jooq.impl.SQLDataType.NUMERIC);
+		super("PKG_F_AUTHOR_EXISTS", org.jooq.test.oracle.generatedclasses.test.Test.TEST, org.jooq.test.oracle.generatedclasses.test.packages.Library.LIBRARY, org.jooq.impl.SQLDataType.NUMERIC);
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(AUTHOR_NAME);
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/packages/library/PkgFManyParameters.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/packages/library/PkgFManyParameters.java
index 8e132f0437..68ebaed589 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/packages/library/PkgFManyParameters.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/packages/library/PkgFManyParameters.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle.generatedclasses.test.packages.library;
  */
 public class PkgFManyParameters extends org.jooq.impl.AbstractRoutine<java.math.BigDecimal> {
 
-	private static final long serialVersionUID = -1755420349;
+	private static final long serialVersionUID = 1175956536;
 
 
 	/**
@@ -2020,7 +2020,7 @@ public class PkgFManyParameters extends org.jooq.impl.AbstractRoutine<java.math.
 	 * Create a new routine call instance
 	 */
 	public PkgFManyParameters() {
-		super(org.jooq.SQLDialect.ORACLE, "PKG_F_MANY_PARAMETERS", org.jooq.test.oracle.generatedclasses.test.Test.TEST, org.jooq.test.oracle.generatedclasses.test.packages.Library.LIBRARY, org.jooq.impl.SQLDataType.NUMERIC);
+		super("PKG_F_MANY_PARAMETERS", org.jooq.test.oracle.generatedclasses.test.Test.TEST, org.jooq.test.oracle.generatedclasses.test.packages.Library.LIBRARY, org.jooq.impl.SQLDataType.NUMERIC);
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(F000);
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/packages/library/PkgFUnused.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/packages/library/PkgFUnused.java
index 8cc5c9a297..e061db0360 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/packages/library/PkgFUnused.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/packages/library/PkgFUnused.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle.generatedclasses.test.packages.library;
  */
 public class PkgFUnused extends org.jooq.impl.AbstractRoutine<java.math.BigDecimal> {
 
-	private static final long serialVersionUID = 1941980235;
+	private static final long serialVersionUID = 113386422;
 
 
 	/**
@@ -20,7 +20,7 @@ public class PkgFUnused extends org.jooq.impl.AbstractRoutine<java.math.BigDecim
 	 * Create a new routine call instance
 	 */
 	public PkgFUnused() {
-		super(org.jooq.SQLDialect.ORACLE, "PKG_F_UNUSED", org.jooq.test.oracle.generatedclasses.test.Test.TEST, org.jooq.test.oracle.generatedclasses.test.packages.Library.LIBRARY, org.jooq.impl.SQLDataType.NUMERIC);
+		super("PKG_F_UNUSED", org.jooq.test.oracle.generatedclasses.test.Test.TEST, org.jooq.test.oracle.generatedclasses.test.packages.Library.LIBRARY, org.jooq.impl.SQLDataType.NUMERIC);
 
 		setReturnParameter(RETURN_VALUE);
 	}
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/packages/library/PkgPAuthorExists1.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/packages/library/PkgPAuthorExists1.java
index ec3bd77e2d..1b37441ba7 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/packages/library/PkgPAuthorExists1.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/packages/library/PkgPAuthorExists1.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle.generatedclasses.test.packages.library;
  */
 public class PkgPAuthorExists1 extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = 225062022;
+	private static final long serialVersionUID = -76253071;
 
 
 	/**
@@ -25,7 +25,7 @@ public class PkgPAuthorExists1 extends org.jooq.impl.AbstractRoutine<java.lang.V
 	 * Create a new routine call instance
 	 */
 	public PkgPAuthorExists1() {
-		super(org.jooq.SQLDialect.ORACLE, "PKG_P_AUTHOR_EXISTS", org.jooq.test.oracle.generatedclasses.test.Test.TEST, org.jooq.test.oracle.generatedclasses.test.packages.Library.LIBRARY);
+		super("PKG_P_AUTHOR_EXISTS", org.jooq.test.oracle.generatedclasses.test.Test.TEST, org.jooq.test.oracle.generatedclasses.test.packages.Library.LIBRARY);
 
 		addInParameter(AUTHOR_NAME);
 		addOutParameter(RESULT);
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/packages/library/PkgPAuthorExists2.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/packages/library/PkgPAuthorExists2.java
index dbc42ac55a..f5ca4ea9c9 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/packages/library/PkgPAuthorExists2.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/packages/library/PkgPAuthorExists2.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle.generatedclasses.test.packages.library;
  */
 public class PkgPAuthorExists2 extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = 1218138932;
+	private static final long serialVersionUID = -1288729367;
 
 
 	/**
@@ -30,7 +30,7 @@ public class PkgPAuthorExists2 extends org.jooq.impl.AbstractRoutine<java.lang.V
 	 * Create a new routine call instance
 	 */
 	public PkgPAuthorExists2() {
-		super(org.jooq.SQLDialect.ORACLE, "PKG_P_AUTHOR_EXISTS", org.jooq.test.oracle.generatedclasses.test.Test.TEST, org.jooq.test.oracle.generatedclasses.test.packages.Library.LIBRARY);
+		super("PKG_P_AUTHOR_EXISTS", org.jooq.test.oracle.generatedclasses.test.Test.TEST, org.jooq.test.oracle.generatedclasses.test.packages.Library.LIBRARY);
 
 		addInParameter(AUTHOR_NAME);
 		addOutParameter(RESULT);
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/packages/library/PkgPManyParameters.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/packages/library/PkgPManyParameters.java
index 0fce1c935e..1b54851af0 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/packages/library/PkgPManyParameters.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/packages/library/PkgPManyParameters.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle.generatedclasses.test.packages.library;
  */
 public class PkgPManyParameters extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = -1414502880;
+	private static final long serialVersionUID = -1903671093;
 
 
 	/**
@@ -2015,7 +2015,7 @@ public class PkgPManyParameters extends org.jooq.impl.AbstractRoutine<java.lang.
 	 * Create a new routine call instance
 	 */
 	public PkgPManyParameters() {
-		super(org.jooq.SQLDialect.ORACLE, "PKG_P_MANY_PARAMETERS", org.jooq.test.oracle.generatedclasses.test.Test.TEST, org.jooq.test.oracle.generatedclasses.test.packages.Library.LIBRARY);
+		super("PKG_P_MANY_PARAMETERS", org.jooq.test.oracle.generatedclasses.test.Test.TEST, org.jooq.test.oracle.generatedclasses.test.packages.Library.LIBRARY);
 
 		addInParameter(F000);
 		addInParameter(F001);
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/packages/library_767_package_test/Library_767PackageTest.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/packages/library_767_package_test/Library_767PackageTest.java
index e4b34f0483..68192085a2 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/packages/library_767_package_test/Library_767PackageTest.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/packages/library_767_package_test/Library_767PackageTest.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle.generatedclasses.test.packages.library_767_package_
  */
 public class Library_767PackageTest extends org.jooq.impl.AbstractRoutine<java.math.BigDecimal> {
 
-	private static final long serialVersionUID = -1696157756;
+	private static final long serialVersionUID = 1715232815;
 
 
 	/**
@@ -20,7 +20,7 @@ public class Library_767PackageTest extends org.jooq.impl.AbstractRoutine<java.m
 	 * Create a new routine call instance
 	 */
 	public Library_767PackageTest() {
-		super(org.jooq.SQLDialect.ORACLE, "LIBRARY_767_PACKAGE_TEST", org.jooq.test.oracle.generatedclasses.test.Test.TEST, org.jooq.test.oracle.generatedclasses.test.packages.Library_767PackageTest.LIBRARY_767_PACKAGE_TEST, org.jooq.impl.SQLDataType.NUMERIC);
+		super("LIBRARY_767_PACKAGE_TEST", org.jooq.test.oracle.generatedclasses.test.Test.TEST, org.jooq.test.oracle.generatedclasses.test.packages.Library_767PackageTest.LIBRARY_767_PACKAGE_TEST, org.jooq.impl.SQLDataType.NUMERIC);
 
 		setReturnParameter(RETURN_VALUE);
 	}
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/F317.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/F317.java
index 478155649f..c840800e2c 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/F317.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/F317.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle.generatedclasses.test.routines;
  */
 public class F317 extends org.jooq.impl.AbstractRoutine<java.math.BigDecimal> {
 
-	private static final long serialVersionUID = 300001916;
+	private static final long serialVersionUID = 439832625;
 
 
 	/**
@@ -40,7 +40,7 @@ public class F317 extends org.jooq.impl.AbstractRoutine<java.math.BigDecimal> {
 	 * Create a new routine call instance
 	 */
 	public F317() {
-		super(org.jooq.SQLDialect.ORACLE, "F317", org.jooq.test.oracle.generatedclasses.test.Test.TEST, org.jooq.impl.SQLDataType.NUMERIC);
+		super("F317", org.jooq.test.oracle.generatedclasses.test.Test.TEST, org.jooq.impl.SQLDataType.NUMERIC);
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(P1);
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/F377.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/F377.java
index 5d4312df14..12ac38f806 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/F377.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/F377.java
@@ -8,13 +8,13 @@ package org.jooq.test.oracle.generatedclasses.test.routines;
  */
 public class F377 extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = -798076273;
+	private static final long serialVersionUID = -1748141628;
 
 
 	/**
 	 * Create a new routine call instance
 	 */
 	public F377() {
-		super(org.jooq.SQLDialect.ORACLE, "F377", org.jooq.test.oracle.generatedclasses.test.Test.TEST);
+		super("F377", org.jooq.test.oracle.generatedclasses.test.Test.TEST);
 	}
 }
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/F378.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/F378.java
index 320182af70..a14dffc8be 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/F378.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/F378.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle.generatedclasses.test.routines;
  */
 public class F378 extends org.jooq.impl.AbstractRoutine<java.math.BigDecimal> {
 
-	private static final long serialVersionUID = 965049463;
+	private static final long serialVersionUID = -1020685150;
 
 
 	/**
@@ -35,7 +35,7 @@ public class F378 extends org.jooq.impl.AbstractRoutine<java.math.BigDecimal> {
 	 * Create a new routine call instance
 	 */
 	public F378() {
-		super(org.jooq.SQLDialect.ORACLE, "F378", org.jooq.test.oracle.generatedclasses.test.Test.TEST, org.jooq.impl.SQLDataType.NUMERIC);
+		super("F378", org.jooq.test.oracle.generatedclasses.test.Test.TEST, org.jooq.impl.SQLDataType.NUMERIC);
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(I);
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/F691cursorIn.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/F691cursorIn.java
index 7540951062..6646f20f6f 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/F691cursorIn.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/F691cursorIn.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle.generatedclasses.test.routines;
  */
 public class F691cursorIn extends org.jooq.impl.AbstractRoutine<java.math.BigDecimal> {
 
-	private static final long serialVersionUID = -152696235;
+	private static final long serialVersionUID = -2122056832;
 
 
 	/**
@@ -25,7 +25,7 @@ public class F691cursorIn extends org.jooq.impl.AbstractRoutine<java.math.BigDec
 	 * Create a new routine call instance
 	 */
 	public F691cursorIn() {
-		super(org.jooq.SQLDialect.ORACLE, "F691CURSOR_IN", org.jooq.test.oracle.generatedclasses.test.Test.TEST, org.jooq.impl.SQLDataType.NUMERIC);
+		super("F691CURSOR_IN", org.jooq.test.oracle.generatedclasses.test.Test.TEST, org.jooq.impl.SQLDataType.NUMERIC);
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(C);
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/F691cursorOut.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/F691cursorOut.java
index 92f7e603e8..9f21d257e1 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/F691cursorOut.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/F691cursorOut.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle.generatedclasses.test.routines;
  */
 public class F691cursorOut extends org.jooq.impl.AbstractRoutine<org.jooq.Result<org.jooq.Record>> {
 
-	private static final long serialVersionUID = 1067620380;
+	private static final long serialVersionUID = -589977465;
 
 
 	/**
@@ -20,7 +20,7 @@ public class F691cursorOut extends org.jooq.impl.AbstractRoutine<org.jooq.Result
 	 * Create a new routine call instance
 	 */
 	public F691cursorOut() {
-		super(org.jooq.SQLDialect.ORACLE, "F691CURSOR_OUT", org.jooq.test.oracle.generatedclasses.test.Test.TEST, org.jooq.impl.SQLDataType.RESULT);
+		super("F691CURSOR_OUT", org.jooq.test.oracle.generatedclasses.test.Test.TEST, org.jooq.impl.SQLDataType.RESULT);
 
 		setReturnParameter(RETURN_VALUE);
 	}
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/FArrays1.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/FArrays1.java
index f8fb6044ee..6eb5379478 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/FArrays1.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/FArrays1.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle.generatedclasses.test.routines;
  */
 public class FArrays1 extends org.jooq.impl.AbstractRoutine<org.jooq.test.oracle.generatedclasses.test.udt.records.UNumberArrayRecord> {
 
-	private static final long serialVersionUID = 1431553390;
+	private static final long serialVersionUID = -811085095;
 
 
 	/**
@@ -25,7 +25,7 @@ public class FArrays1 extends org.jooq.impl.AbstractRoutine<org.jooq.test.oracle
 	 * Create a new routine call instance
 	 */
 	public FArrays1() {
-		super(org.jooq.SQLDialect.ORACLE, "F_ARRAYS1", org.jooq.test.oracle.generatedclasses.test.Test.TEST, org.jooq.impl.SQLDataType.INTEGER.asArrayDataType(org.jooq.test.oracle.generatedclasses.test.udt.records.UNumberArrayRecord.class));
+		super("F_ARRAYS1", org.jooq.test.oracle.generatedclasses.test.Test.TEST, org.jooq.impl.SQLDataType.INTEGER.asArrayDataType(org.jooq.test.oracle.generatedclasses.test.udt.records.UNumberArrayRecord.class));
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(IN_ARRAY);
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/FArrays2.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/FArrays2.java
index 5ca0d287a1..8fc03d0137 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/FArrays2.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/FArrays2.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle.generatedclasses.test.routines;
  */
 public class FArrays2 extends org.jooq.impl.AbstractRoutine<org.jooq.test.oracle.generatedclasses.test.udt.records.UNumberLongArrayRecord> {
 
-	private static final long serialVersionUID = -192482912;
+	private static final long serialVersionUID = 1072405333;
 
 
 	/**
@@ -25,7 +25,7 @@ public class FArrays2 extends org.jooq.impl.AbstractRoutine<org.jooq.test.oracle
 	 * Create a new routine call instance
 	 */
 	public FArrays2() {
-		super(org.jooq.SQLDialect.ORACLE, "F_ARRAYS2", org.jooq.test.oracle.generatedclasses.test.Test.TEST, org.jooq.impl.SQLDataType.BIGINT.asArrayDataType(org.jooq.test.oracle.generatedclasses.test.udt.records.UNumberLongArrayRecord.class));
+		super("F_ARRAYS2", org.jooq.test.oracle.generatedclasses.test.Test.TEST, org.jooq.impl.SQLDataType.BIGINT.asArrayDataType(org.jooq.test.oracle.generatedclasses.test.udt.records.UNumberLongArrayRecord.class));
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(IN_ARRAY);
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/FArrays3.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/FArrays3.java
index ad1f64e8e2..c75c040c98 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/FArrays3.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/FArrays3.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle.generatedclasses.test.routines;
  */
 public class FArrays3 extends org.jooq.impl.AbstractRoutine<org.jooq.test.oracle.generatedclasses.test.udt.records.UStringArrayRecord> {
 
-	private static final long serialVersionUID = 973947759;
+	private static final long serialVersionUID = -950354982;
 
 
 	/**
@@ -25,7 +25,7 @@ public class FArrays3 extends org.jooq.impl.AbstractRoutine<org.jooq.test.oracle
 	 * Create a new routine call instance
 	 */
 	public FArrays3() {
-		super(org.jooq.SQLDialect.ORACLE, "F_ARRAYS3", org.jooq.test.oracle.generatedclasses.test.Test.TEST, org.jooq.impl.SQLDataType.VARCHAR.asArrayDataType(org.jooq.test.oracle.generatedclasses.test.udt.records.UStringArrayRecord.class));
+		super("F_ARRAYS3", org.jooq.test.oracle.generatedclasses.test.Test.TEST, org.jooq.impl.SQLDataType.VARCHAR.asArrayDataType(org.jooq.test.oracle.generatedclasses.test.udt.records.UStringArrayRecord.class));
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(IN_ARRAY);
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/FArrays4.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/FArrays4.java
index 343a7fd1e2..fb3dac9320 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/FArrays4.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/FArrays4.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle.generatedclasses.test.routines;
  */
 public class FArrays4 extends org.jooq.impl.AbstractRoutine<org.jooq.test.oracle.generatedclasses.test.udt.records.UBookArrayRecord> {
 
-	private static final long serialVersionUID = -63146940;
+	private static final long serialVersionUID = -1267873287;
 
 
 	/**
@@ -25,7 +25,7 @@ public class FArrays4 extends org.jooq.impl.AbstractRoutine<org.jooq.test.oracle
 	 * Create a new routine call instance
 	 */
 	public FArrays4() {
-		super(org.jooq.SQLDialect.ORACLE, "F_ARRAYS4", org.jooq.test.oracle.generatedclasses.test.Test.TEST, org.jooq.test.oracle.generatedclasses.test.udt.UBookType.U_BOOK_TYPE.getDataType().asArrayDataType(org.jooq.test.oracle.generatedclasses.test.udt.records.UBookArrayRecord.class));
+		super("F_ARRAYS4", org.jooq.test.oracle.generatedclasses.test.Test.TEST, org.jooq.test.oracle.generatedclasses.test.udt.UBookType.U_BOOK_TYPE.getDataType().asArrayDataType(org.jooq.test.oracle.generatedclasses.test.udt.records.UBookArrayRecord.class));
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(IN_ARRAY);
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/FAuthorExists.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/FAuthorExists.java
index 704d61ab2a..4db1c0c5bd 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/FAuthorExists.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/FAuthorExists.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle.generatedclasses.test.routines;
  */
 public class FAuthorExists extends org.jooq.impl.AbstractRoutine<java.math.BigDecimal> {
 
-	private static final long serialVersionUID = -1794471557;
+	private static final long serialVersionUID = 1125303782;
 
 
 	/**
@@ -25,7 +25,7 @@ public class FAuthorExists extends org.jooq.impl.AbstractRoutine<java.math.BigDe
 	 * Create a new routine call instance
 	 */
 	public FAuthorExists() {
-		super(org.jooq.SQLDialect.ORACLE, "F_AUTHOR_EXISTS", org.jooq.test.oracle.generatedclasses.test.Test.TEST, org.jooq.impl.SQLDataType.NUMERIC);
+		super("F_AUTHOR_EXISTS", org.jooq.test.oracle.generatedclasses.test.Test.TEST, org.jooq.impl.SQLDataType.NUMERIC);
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(AUTHOR_NAME);
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/FGetOneCursor.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/FGetOneCursor.java
index a5aa389dd1..5249f8b422 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/FGetOneCursor.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/FGetOneCursor.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle.generatedclasses.test.routines;
  */
 public class FGetOneCursor extends org.jooq.impl.AbstractRoutine<org.jooq.Result<org.jooq.Record>> {
 
-	private static final long serialVersionUID = 718692606;
+	private static final long serialVersionUID = -1270921357;
 
 
 	/**
@@ -25,7 +25,7 @@ public class FGetOneCursor extends org.jooq.impl.AbstractRoutine<org.jooq.Result
 	 * Create a new routine call instance
 	 */
 	public FGetOneCursor() {
-		super(org.jooq.SQLDialect.ORACLE, "F_GET_ONE_CURSOR", org.jooq.test.oracle.generatedclasses.test.Test.TEST, org.jooq.impl.SQLDataType.RESULT);
+		super("F_GET_ONE_CURSOR", org.jooq.test.oracle.generatedclasses.test.Test.TEST, org.jooq.impl.SQLDataType.RESULT);
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(BOOK_IDS);
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/FManyParameters.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/FManyParameters.java
index 7cc8cc7577..18792acbd2 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/FManyParameters.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/FManyParameters.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle.generatedclasses.test.routines;
  */
 public class FManyParameters extends org.jooq.impl.AbstractRoutine<java.math.BigDecimal> {
 
-	private static final long serialVersionUID = 1911084692;
+	private static final long serialVersionUID = 595220351;
 
 
 	/**
@@ -2020,7 +2020,7 @@ public class FManyParameters extends org.jooq.impl.AbstractRoutine<java.math.Big
 	 * Create a new routine call instance
 	 */
 	public FManyParameters() {
-		super(org.jooq.SQLDialect.ORACLE, "F_MANY_PARAMETERS", org.jooq.test.oracle.generatedclasses.test.Test.TEST, org.jooq.impl.SQLDataType.NUMERIC);
+		super("F_MANY_PARAMETERS", org.jooq.test.oracle.generatedclasses.test.Test.TEST, org.jooq.impl.SQLDataType.NUMERIC);
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(F000);
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/FNumber.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/FNumber.java
index a5e43ea3c2..164359d418 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/FNumber.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/FNumber.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle.generatedclasses.test.routines;
  */
 public class FNumber extends org.jooq.impl.AbstractRoutine<java.math.BigDecimal> {
 
-	private static final long serialVersionUID = -546885578;
+	private static final long serialVersionUID = -522850773;
 
 
 	/**
@@ -25,7 +25,7 @@ public class FNumber extends org.jooq.impl.AbstractRoutine<java.math.BigDecimal>
 	 * Create a new routine call instance
 	 */
 	public FNumber() {
-		super(org.jooq.SQLDialect.ORACLE, "F_NUMBER", org.jooq.test.oracle.generatedclasses.test.Test.TEST, org.jooq.impl.SQLDataType.NUMERIC);
+		super("F_NUMBER", org.jooq.test.oracle.generatedclasses.test.Test.TEST, org.jooq.impl.SQLDataType.NUMERIC);
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(N);
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/FOne.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/FOne.java
index 9357241691..e4b7be756c 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/FOne.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/FOne.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle.generatedclasses.test.routines;
  */
 public class FOne extends org.jooq.impl.AbstractRoutine<java.math.BigDecimal> {
 
-	private static final long serialVersionUID = 1357010842;
+	private static final long serialVersionUID = 2083730949;
 
 
 	/**
@@ -20,7 +20,7 @@ public class FOne extends org.jooq.impl.AbstractRoutine<java.math.BigDecimal> {
 	 * Create a new routine call instance
 	 */
 	public FOne() {
-		super(org.jooq.SQLDialect.ORACLE, "F_ONE", org.jooq.test.oracle.generatedclasses.test.Test.TEST, org.jooq.impl.SQLDataType.NUMERIC);
+		super("F_ONE", org.jooq.test.oracle.generatedclasses.test.Test.TEST, org.jooq.impl.SQLDataType.NUMERIC);
 
 		setReturnParameter(RETURN_VALUE);
 	}
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/FPipelinedArray1.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/FPipelinedArray1.java
index 67177b3f55..0017903200 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/FPipelinedArray1.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/FPipelinedArray1.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle.generatedclasses.test.routines;
  */
 public class FPipelinedArray1 extends org.jooq.impl.AbstractRoutine<org.jooq.test.oracle.generatedclasses.test.udt.records.UNumberArrayRecord> {
 
-	private static final long serialVersionUID = -1155295483;
+	private static final long serialVersionUID = 1719195440;
 
 
 	/**
@@ -20,7 +20,7 @@ public class FPipelinedArray1 extends org.jooq.impl.AbstractRoutine<org.jooq.tes
 	 * Create a new routine call instance
 	 */
 	public FPipelinedArray1() {
-		super(org.jooq.SQLDialect.ORACLE, "F_PIPELINED_ARRAY1", org.jooq.test.oracle.generatedclasses.test.Test.TEST, org.jooq.impl.SQLDataType.INTEGER.asArrayDataType(org.jooq.test.oracle.generatedclasses.test.udt.records.UNumberArrayRecord.class));
+		super("F_PIPELINED_ARRAY1", org.jooq.test.oracle.generatedclasses.test.Test.TEST, org.jooq.impl.SQLDataType.INTEGER.asArrayDataType(org.jooq.test.oracle.generatedclasses.test.udt.records.UNumberArrayRecord.class));
 
 		setReturnParameter(RETURN_VALUE);
 	}
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/FPipelinedArray4.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/FPipelinedArray4.java
index 9eb8ccc5b1..1ba5bb04ae 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/FPipelinedArray4.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/FPipelinedArray4.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle.generatedclasses.test.routines;
  */
 public class FPipelinedArray4 extends org.jooq.impl.AbstractRoutine<org.jooq.test.oracle.generatedclasses.test.udt.records.UBookArrayRecord> {
 
-	private static final long serialVersionUID = 1494585788;
+	private static final long serialVersionUID = -1321769807;
 
 
 	/**
@@ -20,7 +20,7 @@ public class FPipelinedArray4 extends org.jooq.impl.AbstractRoutine<org.jooq.tes
 	 * Create a new routine call instance
 	 */
 	public FPipelinedArray4() {
-		super(org.jooq.SQLDialect.ORACLE, "F_PIPELINED_ARRAY4", org.jooq.test.oracle.generatedclasses.test.Test.TEST, org.jooq.test.oracle.generatedclasses.test.udt.UBookType.U_BOOK_TYPE.getDataType().asArrayDataType(org.jooq.test.oracle.generatedclasses.test.udt.records.UBookArrayRecord.class));
+		super("F_PIPELINED_ARRAY4", org.jooq.test.oracle.generatedclasses.test.Test.TEST, org.jooq.test.oracle.generatedclasses.test.udt.UBookType.U_BOOK_TYPE.getDataType().asArrayDataType(org.jooq.test.oracle.generatedclasses.test.udt.records.UBookArrayRecord.class));
 
 		setReturnParameter(RETURN_VALUE);
 	}
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/FPipelinedTable1.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/FPipelinedTable1.java
index ea2dfe95a0..c074489667 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/FPipelinedTable1.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/FPipelinedTable1.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle.generatedclasses.test.routines;
  */
 public class FPipelinedTable1 extends org.jooq.impl.AbstractRoutine<org.jooq.test.oracle.generatedclasses.test.udt.records.UNumberTableRecord> {
 
-	private static final long serialVersionUID = 1054884058;
+	private static final long serialVersionUID = 1725977221;
 
 
 	/**
@@ -20,7 +20,7 @@ public class FPipelinedTable1 extends org.jooq.impl.AbstractRoutine<org.jooq.tes
 	 * Create a new routine call instance
 	 */
 	public FPipelinedTable1() {
-		super(org.jooq.SQLDialect.ORACLE, "F_PIPELINED_TABLE1", org.jooq.test.oracle.generatedclasses.test.Test.TEST, org.jooq.impl.SQLDataType.INTEGER.asArrayDataType(org.jooq.test.oracle.generatedclasses.test.udt.records.UNumberTableRecord.class));
+		super("F_PIPELINED_TABLE1", org.jooq.test.oracle.generatedclasses.test.Test.TEST, org.jooq.impl.SQLDataType.INTEGER.asArrayDataType(org.jooq.test.oracle.generatedclasses.test.udt.records.UNumberTableRecord.class));
 
 		setReturnParameter(RETURN_VALUE);
 	}
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/FPipelinedTable4.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/FPipelinedTable4.java
index f7c8ec3eb0..97e24ef928 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/FPipelinedTable4.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/FPipelinedTable4.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle.generatedclasses.test.routines;
  */
 public class FPipelinedTable4 extends org.jooq.impl.AbstractRoutine<org.jooq.test.oracle.generatedclasses.test.udt.records.UBookTableRecord> {
 
-	private static final long serialVersionUID = 462320411;
+	private static final long serialVersionUID = 617379728;
 
 
 	/**
@@ -20,7 +20,7 @@ public class FPipelinedTable4 extends org.jooq.impl.AbstractRoutine<org.jooq.tes
 	 * Create a new routine call instance
 	 */
 	public FPipelinedTable4() {
-		super(org.jooq.SQLDialect.ORACLE, "F_PIPELINED_TABLE4", org.jooq.test.oracle.generatedclasses.test.Test.TEST, org.jooq.test.oracle.generatedclasses.test.udt.UBookType.U_BOOK_TYPE.getDataType().asArrayDataType(org.jooq.test.oracle.generatedclasses.test.udt.records.UBookTableRecord.class));
+		super("F_PIPELINED_TABLE4", org.jooq.test.oracle.generatedclasses.test.Test.TEST, org.jooq.test.oracle.generatedclasses.test.udt.UBookType.U_BOOK_TYPE.getDataType().asArrayDataType(org.jooq.test.oracle.generatedclasses.test.udt.records.UBookTableRecord.class));
 
 		setReturnParameter(RETURN_VALUE);
 	}
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/FTables1.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/FTables1.java
index c7624f9021..6a9d1bc482 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/FTables1.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/FTables1.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle.generatedclasses.test.routines;
  */
 public class FTables1 extends org.jooq.impl.AbstractRoutine<org.jooq.test.oracle.generatedclasses.test.udt.records.UNumberTableRecord> {
 
-	private static final long serialVersionUID = -716340340;
+	private static final long serialVersionUID = -417304969;
 
 
 	/**
@@ -25,7 +25,7 @@ public class FTables1 extends org.jooq.impl.AbstractRoutine<org.jooq.test.oracle
 	 * Create a new routine call instance
 	 */
 	public FTables1() {
-		super(org.jooq.SQLDialect.ORACLE, "F_TABLES1", org.jooq.test.oracle.generatedclasses.test.Test.TEST, org.jooq.impl.SQLDataType.INTEGER.asArrayDataType(org.jooq.test.oracle.generatedclasses.test.udt.records.UNumberTableRecord.class));
+		super("F_TABLES1", org.jooq.test.oracle.generatedclasses.test.Test.TEST, org.jooq.impl.SQLDataType.INTEGER.asArrayDataType(org.jooq.test.oracle.generatedclasses.test.udt.records.UNumberTableRecord.class));
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(IN_TABLE);
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/FTables2.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/FTables2.java
index 73828738dc..9f81b59c74 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/FTables2.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/FTables2.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle.generatedclasses.test.routines;
  */
 public class FTables2 extends org.jooq.impl.AbstractRoutine<org.jooq.test.oracle.generatedclasses.test.udt.records.UNumberLongTableRecord> {
 
-	private static final long serialVersionUID = -1972362346;
+	private static final long serialVersionUID = 1309453259;
 
 
 	/**
@@ -25,7 +25,7 @@ public class FTables2 extends org.jooq.impl.AbstractRoutine<org.jooq.test.oracle
 	 * Create a new routine call instance
 	 */
 	public FTables2() {
-		super(org.jooq.SQLDialect.ORACLE, "F_TABLES2", org.jooq.test.oracle.generatedclasses.test.Test.TEST, org.jooq.impl.SQLDataType.BIGINT.asArrayDataType(org.jooq.test.oracle.generatedclasses.test.udt.records.UNumberLongTableRecord.class));
+		super("F_TABLES2", org.jooq.test.oracle.generatedclasses.test.Test.TEST, org.jooq.impl.SQLDataType.BIGINT.asArrayDataType(org.jooq.test.oracle.generatedclasses.test.udt.records.UNumberLongTableRecord.class));
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(IN_TABLE);
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/FTables3.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/FTables3.java
index 8232304dd7..352bafe1f6 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/FTables3.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/FTables3.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle.generatedclasses.test.routines;
  */
 public class FTables3 extends org.jooq.impl.AbstractRoutine<org.jooq.test.oracle.generatedclasses.test.udt.records.UStringTableRecord> {
 
-	private static final long serialVersionUID = -1173945971;
+	private static final long serialVersionUID = -556574856;
 
 
 	/**
@@ -25,7 +25,7 @@ public class FTables3 extends org.jooq.impl.AbstractRoutine<org.jooq.test.oracle
 	 * Create a new routine call instance
 	 */
 	public FTables3() {
-		super(org.jooq.SQLDialect.ORACLE, "F_TABLES3", org.jooq.test.oracle.generatedclasses.test.Test.TEST, org.jooq.impl.SQLDataType.VARCHAR.asArrayDataType(org.jooq.test.oracle.generatedclasses.test.udt.records.UStringTableRecord.class));
+		super("F_TABLES3", org.jooq.test.oracle.generatedclasses.test.Test.TEST, org.jooq.impl.SQLDataType.VARCHAR.asArrayDataType(org.jooq.test.oracle.generatedclasses.test.udt.records.UStringTableRecord.class));
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(IN_TABLE);
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/FTables4.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/FTables4.java
index 9fd7ddcdfc..4d8a60a0fd 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/FTables4.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/FTables4.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle.generatedclasses.test.routines;
  */
 public class FTables4 extends org.jooq.impl.AbstractRoutine<org.jooq.test.oracle.generatedclasses.test.udt.records.UBookTableRecord> {
 
-	private static final long serialVersionUID = -145329414;
+	private static final long serialVersionUID = 363235119;
 
 
 	/**
@@ -25,7 +25,7 @@ public class FTables4 extends org.jooq.impl.AbstractRoutine<org.jooq.test.oracle
 	 * Create a new routine call instance
 	 */
 	public FTables4() {
-		super(org.jooq.SQLDialect.ORACLE, "F_TABLES4", org.jooq.test.oracle.generatedclasses.test.Test.TEST, org.jooq.test.oracle.generatedclasses.test.udt.UBookType.U_BOOK_TYPE.getDataType().asArrayDataType(org.jooq.test.oracle.generatedclasses.test.udt.records.UBookTableRecord.class));
+		super("F_TABLES4", org.jooq.test.oracle.generatedclasses.test.Test.TEST, org.jooq.test.oracle.generatedclasses.test.udt.UBookType.U_BOOK_TYPE.getDataType().asArrayDataType(org.jooq.test.oracle.generatedclasses.test.udt.records.UBookTableRecord.class));
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(IN_TABLE);
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/P377.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/P377.java
index 7215a044db..a52e4d349d 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/P377.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/P377.java
@@ -8,13 +8,13 @@ package org.jooq.test.oracle.generatedclasses.test.routines;
  */
 public class P377 extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = 821077081;
+	private static final long serialVersionUID = -1875334258;
 
 
 	/**
 	 * Create a new routine call instance
 	 */
 	public P377() {
-		super(org.jooq.SQLDialect.ORACLE, "P377", org.jooq.test.oracle.generatedclasses.test.Test.TEST);
+		super("P377", org.jooq.test.oracle.generatedclasses.test.Test.TEST);
 	}
 }
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/P391.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/P391.java
index 9336d19403..9b8ba24581 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/P391.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/P391.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle.generatedclasses.test.routines;
  */
 public class P391 extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = -715788868;
+	private static final long serialVersionUID = 1394377767;
 
 
 	/**
@@ -45,7 +45,7 @@ public class P391 extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 	 * Create a new routine call instance
 	 */
 	public P391() {
-		super(org.jooq.SQLDialect.ORACLE, "P391", org.jooq.test.oracle.generatedclasses.test.Test.TEST);
+		super("P391", org.jooq.test.oracle.generatedclasses.test.Test.TEST);
 
 		addInParameter(I1);
 		addInOutParameter(IO1);
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/PArrays1.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/PArrays1.java
index f5281f31b3..b2baf00b21 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/PArrays1.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/PArrays1.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle.generatedclasses.test.routines;
  */
 public class PArrays1 extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = -2044840469;
+	private static final long serialVersionUID = -911160874;
 
 
 	/**
@@ -25,7 +25,7 @@ public class PArrays1 extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 	 * Create a new routine call instance
 	 */
 	public PArrays1() {
-		super(org.jooq.SQLDialect.ORACLE, "P_ARRAYS1", org.jooq.test.oracle.generatedclasses.test.Test.TEST);
+		super("P_ARRAYS1", org.jooq.test.oracle.generatedclasses.test.Test.TEST);
 
 		addInParameter(IN_ARRAY);
 		addOutParameter(OUT_ARRAY);
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/PArrays2.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/PArrays2.java
index 7ad3a59698..63fcb8ea00 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/PArrays2.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/PArrays2.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle.generatedclasses.test.routines;
  */
 public class PArrays2 extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = -1611448376;
+	private static final long serialVersionUID = 668255667;
 
 
 	/**
@@ -25,7 +25,7 @@ public class PArrays2 extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 	 * Create a new routine call instance
 	 */
 	public PArrays2() {
-		super(org.jooq.SQLDialect.ORACLE, "P_ARRAYS2", org.jooq.test.oracle.generatedclasses.test.Test.TEST);
+		super("P_ARRAYS2", org.jooq.test.oracle.generatedclasses.test.Test.TEST);
 
 		addInParameter(IN_ARRAY);
 		addOutParameter(OUT_ARRAY);
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/PArrays3.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/PArrays3.java
index 437f8c3fa1..a3f921535e 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/PArrays3.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/PArrays3.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle.generatedclasses.test.routines;
  */
 public class PArrays3 extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = 264512695;
+	private static final long serialVersionUID = 1259221410;
 
 
 	/**
@@ -25,7 +25,7 @@ public class PArrays3 extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 	 * Create a new routine call instance
 	 */
 	public PArrays3() {
-		super(org.jooq.SQLDialect.ORACLE, "P_ARRAYS3", org.jooq.test.oracle.generatedclasses.test.Test.TEST);
+		super("P_ARRAYS3", org.jooq.test.oracle.generatedclasses.test.Test.TEST);
 
 		addInParameter(IN_ARRAY);
 		addOutParameter(OUT_ARRAY);
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/PArrays4.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/PArrays4.java
index 91dc3ff8d7..b02180974f 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/PArrays4.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/PArrays4.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle.generatedclasses.test.routines;
  */
 public class PArrays4 extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = 2065571902;
+	private static final long serialVersionUID = 1085222569;
 
 
 	/**
@@ -25,7 +25,7 @@ public class PArrays4 extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 	 * Create a new routine call instance
 	 */
 	public PArrays4() {
-		super(org.jooq.SQLDialect.ORACLE, "P_ARRAYS4", org.jooq.test.oracle.generatedclasses.test.Test.TEST);
+		super("P_ARRAYS4", org.jooq.test.oracle.generatedclasses.test.Test.TEST);
 
 		addInParameter(IN_ARRAY);
 		addOutParameter(OUT_ARRAY);
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/PAuthorExists.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/PAuthorExists.java
index 6be4239c99..904cd8ef0c 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/PAuthorExists.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/PAuthorExists.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle.generatedclasses.test.routines;
  */
 public class PAuthorExists extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = -1831640142;
+	private static final long serialVersionUID = -1200178915;
 
 
 	/**
@@ -25,7 +25,7 @@ public class PAuthorExists extends org.jooq.impl.AbstractRoutine<java.lang.Void>
 	 * Create a new routine call instance
 	 */
 	public PAuthorExists() {
-		super(org.jooq.SQLDialect.ORACLE, "P_AUTHOR_EXISTS", org.jooq.test.oracle.generatedclasses.test.Test.TEST);
+		super("P_AUTHOR_EXISTS", org.jooq.test.oracle.generatedclasses.test.Test.TEST);
 
 		addInParameter(AUTHOR_NAME);
 		addOutParameter(RESULT);
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/PCreateAuthor.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/PCreateAuthor.java
index d060ecfc87..d1c21a9b54 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/PCreateAuthor.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/PCreateAuthor.java
@@ -8,13 +8,13 @@ package org.jooq.test.oracle.generatedclasses.test.routines;
  */
 public class PCreateAuthor extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = -1831390395;
+	private static final long serialVersionUID = -840087056;
 
 
 	/**
 	 * Create a new routine call instance
 	 */
 	public PCreateAuthor() {
-		super(org.jooq.SQLDialect.ORACLE, "P_CREATE_AUTHOR", org.jooq.test.oracle.generatedclasses.test.Test.TEST);
+		super("P_CREATE_AUTHOR", org.jooq.test.oracle.generatedclasses.test.Test.TEST);
 	}
 }
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/PCreateAuthorByName.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/PCreateAuthorByName.java
index 60c539ae95..7b821e70b4 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/PCreateAuthorByName.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/PCreateAuthorByName.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle.generatedclasses.test.routines;
  */
 public class PCreateAuthorByName extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = -937888071;
+	private static final long serialVersionUID = 174216430;
 
 
 	/**
@@ -25,7 +25,7 @@ public class PCreateAuthorByName extends org.jooq.impl.AbstractRoutine<java.lang
 	 * Create a new routine call instance
 	 */
 	public PCreateAuthorByName() {
-		super(org.jooq.SQLDialect.ORACLE, "P_CREATE_AUTHOR_BY_NAME", org.jooq.test.oracle.generatedclasses.test.Test.TEST);
+		super("P_CREATE_AUTHOR_BY_NAME", org.jooq.test.oracle.generatedclasses.test.Test.TEST);
 
 		addInParameter(FIRST_NAME);
 		addInParameter(LAST_NAME);
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/PEnhanceAddress1.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/PEnhanceAddress1.java
index 2ec1dec029..36bc980a03 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/PEnhanceAddress1.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/PEnhanceAddress1.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle.generatedclasses.test.routines;
  */
 public class PEnhanceAddress1 extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = 691846373;
+	private static final long serialVersionUID = 1511294298;
 
 
 	/**
@@ -25,7 +25,7 @@ public class PEnhanceAddress1 extends org.jooq.impl.AbstractRoutine<java.lang.Vo
 	 * Create a new routine call instance
 	 */
 	public PEnhanceAddress1() {
-		super(org.jooq.SQLDialect.ORACLE, "P_ENHANCE_ADDRESS1", org.jooq.test.oracle.generatedclasses.test.Test.TEST);
+		super("P_ENHANCE_ADDRESS1", org.jooq.test.oracle.generatedclasses.test.Test.TEST);
 
 		addInParameter(ADDRESS);
 		addOutParameter(NO);
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/PEnhanceAddress2.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/PEnhanceAddress2.java
index d0617fb5f0..1b633efea4 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/PEnhanceAddress2.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/PEnhanceAddress2.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle.generatedclasses.test.routines;
  */
 public class PEnhanceAddress2 extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = -1278392495;
+	private static final long serialVersionUID = -173600634;
 
 
 	/**
@@ -20,7 +20,7 @@ public class PEnhanceAddress2 extends org.jooq.impl.AbstractRoutine<java.lang.Vo
 	 * Create a new routine call instance
 	 */
 	public PEnhanceAddress2() {
-		super(org.jooq.SQLDialect.ORACLE, "P_ENHANCE_ADDRESS2", org.jooq.test.oracle.generatedclasses.test.Test.TEST);
+		super("P_ENHANCE_ADDRESS2", org.jooq.test.oracle.generatedclasses.test.Test.TEST);
 
 		addOutParameter(ADDRESS);
 	}
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/PEnhanceAddress3.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/PEnhanceAddress3.java
index c78a9ce4d2..3fd2132a5f 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/PEnhanceAddress3.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/PEnhanceAddress3.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle.generatedclasses.test.routines;
  */
 public class PEnhanceAddress3 extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = 1425545467;
+	private static final long serialVersionUID = 1611614310;
 
 
 	/**
@@ -20,7 +20,7 @@ public class PEnhanceAddress3 extends org.jooq.impl.AbstractRoutine<java.lang.Vo
 	 * Create a new routine call instance
 	 */
 	public PEnhanceAddress3() {
-		super(org.jooq.SQLDialect.ORACLE, "P_ENHANCE_ADDRESS3", org.jooq.test.oracle.generatedclasses.test.Test.TEST);
+		super("P_ENHANCE_ADDRESS3", org.jooq.test.oracle.generatedclasses.test.Test.TEST);
 
 		addInOutParameter(ADDRESS);
 	}
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/PGetOneCursor.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/PGetOneCursor.java
index 97a9639dc4..db6fe82e6b 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/PGetOneCursor.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/PGetOneCursor.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle.generatedclasses.test.routines;
  */
 public class PGetOneCursor extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = 922157832;
+	private static final long serialVersionUID = -709779459;
 
 
 	/**
@@ -30,7 +30,7 @@ public class PGetOneCursor extends org.jooq.impl.AbstractRoutine<java.lang.Void>
 	 * Create a new routine call instance
 	 */
 	public PGetOneCursor() {
-		super(org.jooq.SQLDialect.ORACLE, "P_GET_ONE_CURSOR", org.jooq.test.oracle.generatedclasses.test.Test.TEST);
+		super("P_GET_ONE_CURSOR", org.jooq.test.oracle.generatedclasses.test.Test.TEST);
 
 		addOutParameter(TOTAL);
 		addOutParameter(BOOKS);
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/PGetTwoCursors.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/PGetTwoCursors.java
index 07ed00e188..74dc717a9e 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/PGetTwoCursors.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/PGetTwoCursors.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle.generatedclasses.test.routines;
  */
 public class PGetTwoCursors extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = 1975262316;
+	private static final long serialVersionUID = -958304863;
 
 
 	/**
@@ -25,7 +25,7 @@ public class PGetTwoCursors extends org.jooq.impl.AbstractRoutine<java.lang.Void
 	 * Create a new routine call instance
 	 */
 	public PGetTwoCursors() {
-		super(org.jooq.SQLDialect.ORACLE, "P_GET_TWO_CURSORS", org.jooq.test.oracle.generatedclasses.test.Test.TEST);
+		super("P_GET_TWO_CURSORS", org.jooq.test.oracle.generatedclasses.test.Test.TEST);
 
 		addOutParameter(BOOKS);
 		addOutParameter(AUTHORS);
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/PManyParameters.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/PManyParameters.java
index 3c9e612fbb..9697df82ad 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/PManyParameters.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/PManyParameters.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle.generatedclasses.test.routines;
  */
 public class PManyParameters extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = 165107887;
+	private static final long serialVersionUID = 172532772;
 
 
 	/**
@@ -2015,7 +2015,7 @@ public class PManyParameters extends org.jooq.impl.AbstractRoutine<java.lang.Voi
 	 * Create a new routine call instance
 	 */
 	public PManyParameters() {
-		super(org.jooq.SQLDialect.ORACLE, "P_MANY_PARAMETERS", org.jooq.test.oracle.generatedclasses.test.Test.TEST);
+		super("P_MANY_PARAMETERS", org.jooq.test.oracle.generatedclasses.test.Test.TEST);
 
 		addInParameter(F000);
 		addInParameter(F001);
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/PTables1.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/PTables1.java
index daa455d48a..a04d8ebbe0 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/PTables1.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/PTables1.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle.generatedclasses.test.routines;
  */
 public class PTables1 extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = 1043541001;
+	private static final long serialVersionUID = -424490764;
 
 
 	/**
@@ -25,7 +25,7 @@ public class PTables1 extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 	 * Create a new routine call instance
 	 */
 	public PTables1() {
-		super(org.jooq.SQLDialect.ORACLE, "P_TABLES1", org.jooq.test.oracle.generatedclasses.test.Test.TEST);
+		super("P_TABLES1", org.jooq.test.oracle.generatedclasses.test.Test.TEST);
 
 		addInParameter(IN_TABLE);
 		addOutParameter(OUT_TABLE);
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/PTables2.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/PTables2.java
index ffae472a78..b6a787b1ec 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/PTables2.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/PTables2.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle.generatedclasses.test.routines;
  */
 public class PTables2 extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = 274419602;
+	private static final long serialVersionUID = -1126016899;
 
 
 	/**
@@ -25,7 +25,7 @@ public class PTables2 extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 	 * Create a new routine call instance
 	 */
 	public PTables2() {
-		super(org.jooq.SQLDialect.ORACLE, "P_TABLES2", org.jooq.test.oracle.generatedclasses.test.Test.TEST);
+		super("P_TABLES2", org.jooq.test.oracle.generatedclasses.test.Test.TEST);
 
 		addInParameter(IN_TABLE);
 		addOutParameter(OUT_TABLE);
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/PTables3.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/PTables3.java
index 5ffbf61d0f..60db5f96ad 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/PTables3.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/PTables3.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle.generatedclasses.test.routines;
  */
 public class PTables3 extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = -942073131;
+	private static final long serialVersionUID = 1745891520;
 
 
 	/**
@@ -25,7 +25,7 @@ public class PTables3 extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 	 * Create a new routine call instance
 	 */
 	public PTables3() {
-		super(org.jooq.SQLDialect.ORACLE, "P_TABLES3", org.jooq.test.oracle.generatedclasses.test.Test.TEST);
+		super("P_TABLES3", org.jooq.test.oracle.generatedclasses.test.Test.TEST);
 
 		addInParameter(IN_TABLE);
 		addOutParameter(OUT_TABLE);
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/PTables4.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/PTables4.java
index e176363bb7..b004d3c2a3 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/PTables4.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/PTables4.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle.generatedclasses.test.routines;
  */
 public class PTables4 extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = 2010861960;
+	private static final long serialVersionUID = -172891405;
 
 
 	/**
@@ -25,7 +25,7 @@ public class PTables4 extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 	 * Create a new routine call instance
 	 */
 	public PTables4() {
-		super(org.jooq.SQLDialect.ORACLE, "P_TABLES4", org.jooq.test.oracle.generatedclasses.test.Test.TEST);
+		super("P_TABLES4", org.jooq.test.oracle.generatedclasses.test.Test.TEST);
 
 		addInParameter(IN_TABLE);
 		addOutParameter(OUT_TABLE);
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/PUnused.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/PUnused.java
index bf812faeca..0660c365b2 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/PUnused.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/routines/PUnused.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle.generatedclasses.test.routines;
  */
 public class PUnused extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = 1132270403;
+	private static final long serialVersionUID = -1131112328;
 
 
 	/**
@@ -30,7 +30,7 @@ public class PUnused extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 	 * Create a new routine call instance
 	 */
 	public PUnused() {
-		super(org.jooq.SQLDialect.ORACLE, "P_UNUSED", org.jooq.test.oracle.generatedclasses.test.Test.TEST);
+		super("P_UNUSED", org.jooq.test.oracle.generatedclasses.test.Test.TEST);
 
 		addInParameter(IN1);
 		addOutParameter(OUT1);
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/udt/u_author_type/CountBooks.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/udt/u_author_type/CountBooks.java
index d0c86324e4..6445cc92ec 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/udt/u_author_type/CountBooks.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/udt/u_author_type/CountBooks.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle.generatedclasses.test.udt.u_author_type;
  */
 public class CountBooks extends org.jooq.impl.AbstractRoutine<java.math.BigDecimal> {
 
-	private static final long serialVersionUID = -1673886985;
+	private static final long serialVersionUID = -1510403668;
 
 
 	/**
@@ -25,7 +25,7 @@ public class CountBooks extends org.jooq.impl.AbstractRoutine<java.math.BigDecim
 	 * Create a new routine call instance
 	 */
 	public CountBooks() {
-		super(org.jooq.SQLDialect.ORACLE, "COUNT_BOOKS", org.jooq.test.oracle.generatedclasses.test.Test.TEST, org.jooq.test.oracle.generatedclasses.test.udt.UAuthorType.U_AUTHOR_TYPE, org.jooq.impl.SQLDataType.NUMERIC);
+		super("COUNT_BOOKS", org.jooq.test.oracle.generatedclasses.test.Test.TEST, org.jooq.test.oracle.generatedclasses.test.udt.UAuthorType.U_AUTHOR_TYPE, org.jooq.impl.SQLDataType.NUMERIC);
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(SELF);
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/udt/u_author_type/GetBooks.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/udt/u_author_type/GetBooks.java
index d277f7b7ca..76f1099f1b 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/udt/u_author_type/GetBooks.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/udt/u_author_type/GetBooks.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle.generatedclasses.test.udt.u_author_type;
  */
 public class GetBooks extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = 1545914589;
+	private static final long serialVersionUID = -1634527224;
 
 
 	/**
@@ -35,7 +35,7 @@ public class GetBooks extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 	 * Create a new routine call instance
 	 */
 	public GetBooks() {
-		super(org.jooq.SQLDialect.ORACLE, "GET_BOOKS", org.jooq.test.oracle.generatedclasses.test.Test.TEST, org.jooq.test.oracle.generatedclasses.test.udt.UAuthorType.U_AUTHOR_TYPE);
+		super("GET_BOOKS", org.jooq.test.oracle.generatedclasses.test.Test.TEST, org.jooq.test.oracle.generatedclasses.test.udt.UAuthorType.U_AUTHOR_TYPE);
 
 		addInOutParameter(SELF);
 		addOutParameter(BOOK1);
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/udt/u_author_type/Load.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/udt/u_author_type/Load.java
index a1a65b0928..33602417d2 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/udt/u_author_type/Load.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/udt/u_author_type/Load.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle.generatedclasses.test.udt.u_author_type;
  */
 public class Load extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = -964142328;
+	private static final long serialVersionUID = 126306547;
 
 
 	/**
@@ -20,7 +20,7 @@ public class Load extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 	 * Create a new routine call instance
 	 */
 	public Load() {
-		super(org.jooq.SQLDialect.ORACLE, "LOAD", org.jooq.test.oracle.generatedclasses.test.Test.TEST, org.jooq.test.oracle.generatedclasses.test.udt.UAuthorType.U_AUTHOR_TYPE);
+		super("LOAD", org.jooq.test.oracle.generatedclasses.test.Test.TEST, org.jooq.test.oracle.generatedclasses.test.udt.UAuthorType.U_AUTHOR_TYPE);
 
 		addInOutParameter(SELF);
 	}
diff --git a/jOOQ-test/src/org/jooq/test/oracle2/generatedclasses/packages/date_as_timestamp_pkg_976/DateAsTimestampF_976.java b/jOOQ-test/src/org/jooq/test/oracle2/generatedclasses/packages/date_as_timestamp_pkg_976/DateAsTimestampF_976.java
index 768c08ca04..9524d1fe45 100644
--- a/jOOQ-test/src/org/jooq/test/oracle2/generatedclasses/packages/date_as_timestamp_pkg_976/DateAsTimestampF_976.java
+++ b/jOOQ-test/src/org/jooq/test/oracle2/generatedclasses/packages/date_as_timestamp_pkg_976/DateAsTimestampF_976.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle2.generatedclasses.packages.date_as_timestamp_pkg_97
  */
 public class DateAsTimestampF_976 extends org.jooq.impl.AbstractRoutine<java.sql.Timestamp> {
 
-	private static final long serialVersionUID = -995219162;
+	private static final long serialVersionUID = 1227752667;
 
 
 	/**
@@ -25,7 +25,7 @@ public class DateAsTimestampF_976 extends org.jooq.impl.AbstractRoutine<java.sql
 	 * Create a new routine call instance
 	 */
 	public DateAsTimestampF_976() {
-		super(org.jooq.SQLDialect.ORACLE, "F_976", org.jooq.test.oracle2.generatedclasses.DateAsTimestampTest.DATE_AS_TIMESTAMP_TEST, org.jooq.test.oracle2.generatedclasses.packages.DateAsTimestampPkg_976.DATE_AS_TIMESTAMP_PKG_976, org.jooq.impl.SQLDataType.TIMESTAMP);
+		super("F_976", org.jooq.test.oracle2.generatedclasses.DateAsTimestampTest.DATE_AS_TIMESTAMP_TEST, org.jooq.test.oracle2.generatedclasses.packages.DateAsTimestampPkg_976.DATE_AS_TIMESTAMP_PKG_976, org.jooq.impl.SQLDataType.TIMESTAMP);
 
 		setReturnParameter(DATE_AS_TIMESTAMP_RETURN_VALUE);
 		addInParameter(DATE_AS_TIMESTAMP_I);
diff --git a/jOOQ-test/src/org/jooq/test/oracle2/generatedclasses/packages/date_as_timestamp_pkg_976/DateAsTimestampP_976.java b/jOOQ-test/src/org/jooq/test/oracle2/generatedclasses/packages/date_as_timestamp_pkg_976/DateAsTimestampP_976.java
index a755d25fc3..24ed9f12c8 100644
--- a/jOOQ-test/src/org/jooq/test/oracle2/generatedclasses/packages/date_as_timestamp_pkg_976/DateAsTimestampP_976.java
+++ b/jOOQ-test/src/org/jooq/test/oracle2/generatedclasses/packages/date_as_timestamp_pkg_976/DateAsTimestampP_976.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle2.generatedclasses.packages.date_as_timestamp_pkg_97
  */
 public class DateAsTimestampP_976 extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = -1952289850;
+	private static final long serialVersionUID = 350043131;
 
 
 	/**
@@ -25,7 +25,7 @@ public class DateAsTimestampP_976 extends org.jooq.impl.AbstractRoutine<java.lan
 	 * Create a new routine call instance
 	 */
 	public DateAsTimestampP_976() {
-		super(org.jooq.SQLDialect.ORACLE, "P_976", org.jooq.test.oracle2.generatedclasses.DateAsTimestampTest.DATE_AS_TIMESTAMP_TEST, org.jooq.test.oracle2.generatedclasses.packages.DateAsTimestampPkg_976.DATE_AS_TIMESTAMP_PKG_976);
+		super("P_976", org.jooq.test.oracle2.generatedclasses.DateAsTimestampTest.DATE_AS_TIMESTAMP_TEST, org.jooq.test.oracle2.generatedclasses.packages.DateAsTimestampPkg_976.DATE_AS_TIMESTAMP_PKG_976);
 
 		addInParameter(DATE_AS_TIMESTAMP_I);
 		addOutParameter(DATE_AS_TIMESTAMP_O);
diff --git a/jOOQ-test/src/org/jooq/test/oracle2/generatedclasses/routines/DateAsTimestampF_976.java b/jOOQ-test/src/org/jooq/test/oracle2/generatedclasses/routines/DateAsTimestampF_976.java
index 2c19576e1f..8f1a5c9a15 100644
--- a/jOOQ-test/src/org/jooq/test/oracle2/generatedclasses/routines/DateAsTimestampF_976.java
+++ b/jOOQ-test/src/org/jooq/test/oracle2/generatedclasses/routines/DateAsTimestampF_976.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle2.generatedclasses.routines;
  */
 public class DateAsTimestampF_976 extends org.jooq.impl.AbstractRoutine<java.sql.Timestamp> {
 
-	private static final long serialVersionUID = 644974942;
+	private static final long serialVersionUID = -1597365677;
 
 
 	/**
@@ -25,7 +25,7 @@ public class DateAsTimestampF_976 extends org.jooq.impl.AbstractRoutine<java.sql
 	 * Create a new routine call instance
 	 */
 	public DateAsTimestampF_976() {
-		super(org.jooq.SQLDialect.ORACLE, "F_976", org.jooq.test.oracle2.generatedclasses.DateAsTimestampTest.DATE_AS_TIMESTAMP_TEST, org.jooq.impl.SQLDataType.TIMESTAMP);
+		super("F_976", org.jooq.test.oracle2.generatedclasses.DateAsTimestampTest.DATE_AS_TIMESTAMP_TEST, org.jooq.impl.SQLDataType.TIMESTAMP);
 
 		setReturnParameter(DATE_AS_TIMESTAMP_RETURN_VALUE);
 		addInParameter(DATE_AS_TIMESTAMP_I);
diff --git a/jOOQ-test/src/org/jooq/test/oracle2/generatedclasses/routines/DateAsTimestampP_976.java b/jOOQ-test/src/org/jooq/test/oracle2/generatedclasses/routines/DateAsTimestampP_976.java
index 151cf95b15..1bfb1a7b6c 100644
--- a/jOOQ-test/src/org/jooq/test/oracle2/generatedclasses/routines/DateAsTimestampP_976.java
+++ b/jOOQ-test/src/org/jooq/test/oracle2/generatedclasses/routines/DateAsTimestampP_976.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle2.generatedclasses.routines;
  */
 public class DateAsTimestampP_976 extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = 264791038;
+	private static final long serialVersionUID = -206106253;
 
 
 	/**
@@ -25,7 +25,7 @@ public class DateAsTimestampP_976 extends org.jooq.impl.AbstractRoutine<java.lan
 	 * Create a new routine call instance
 	 */
 	public DateAsTimestampP_976() {
-		super(org.jooq.SQLDialect.ORACLE, "P_976", org.jooq.test.oracle2.generatedclasses.DateAsTimestampTest.DATE_AS_TIMESTAMP_TEST);
+		super("P_976", org.jooq.test.oracle2.generatedclasses.DateAsTimestampTest.DATE_AS_TIMESTAMP_TEST);
 
 		addInParameter(DATE_AS_TIMESTAMP_I);
 		addOutParameter(DATE_AS_TIMESTAMP_O);
diff --git a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/packages/library/PKG_F378.java b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/packages/library/PKG_F378.java
index 1d5536e377..7efc459cb0 100644
--- a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/packages/library/PKG_F378.java
+++ b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/packages/library/PKG_F378.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle3.generatedclasses.packages.library;
  */
 public class PKG_F378 extends org.jooq.impl.AbstractRoutine<java.math.BigDecimal> {
 
-	private static final long serialVersionUID = -1762640587;
+	private static final long serialVersionUID = -1427105686;
 
 
 	/**
@@ -35,7 +35,7 @@ public class PKG_F378 extends org.jooq.impl.AbstractRoutine<java.math.BigDecimal
 	 * Create a new routine call instance
 	 */
 	public PKG_F378() {
-		super(org.jooq.SQLDialect.ORACLE, "PKG_F378", org.jooq.test.oracle3.generatedclasses.TEST.TEST, org.jooq.test.oracle3.generatedclasses.packages.LIBRARY.LIBRARY, org.jooq.impl.SQLDataType.NUMERIC);
+		super("PKG_F378", org.jooq.test.oracle3.generatedclasses.TEST.TEST, org.jooq.test.oracle3.generatedclasses.packages.LIBRARY.LIBRARY, org.jooq.impl.SQLDataType.NUMERIC);
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(I);
diff --git a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/packages/library/PKG_F_AUTHOR_EXISTS.java b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/packages/library/PKG_F_AUTHOR_EXISTS.java
index 927f960654..553ea58248 100644
--- a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/packages/library/PKG_F_AUTHOR_EXISTS.java
+++ b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/packages/library/PKG_F_AUTHOR_EXISTS.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle3.generatedclasses.packages.library;
  */
 public class PKG_F_AUTHOR_EXISTS extends org.jooq.impl.AbstractRoutine<java.math.BigDecimal> {
 
-	private static final long serialVersionUID = 1257241213;
+	private static final long serialVersionUID = 394639922;
 
 
 	/**
@@ -30,7 +30,7 @@ public class PKG_F_AUTHOR_EXISTS extends org.jooq.impl.AbstractRoutine<java.math
 	 * Create a new routine call instance
 	 */
 	public PKG_F_AUTHOR_EXISTS() {
-		super(org.jooq.SQLDialect.ORACLE, "PKG_F_AUTHOR_EXISTS", org.jooq.test.oracle3.generatedclasses.TEST.TEST, org.jooq.test.oracle3.generatedclasses.packages.LIBRARY.LIBRARY, org.jooq.impl.SQLDataType.NUMERIC);
+		super("PKG_F_AUTHOR_EXISTS", org.jooq.test.oracle3.generatedclasses.TEST.TEST, org.jooq.test.oracle3.generatedclasses.packages.LIBRARY.LIBRARY, org.jooq.impl.SQLDataType.NUMERIC);
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(AUTHOR_NAME);
diff --git a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/packages/library/PKG_F_MANY_PARAMETERS.java b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/packages/library/PKG_F_MANY_PARAMETERS.java
index c4fef588ed..e8c7cf4b23 100644
--- a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/packages/library/PKG_F_MANY_PARAMETERS.java
+++ b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/packages/library/PKG_F_MANY_PARAMETERS.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle3.generatedclasses.packages.library;
  */
 public class PKG_F_MANY_PARAMETERS extends org.jooq.impl.AbstractRoutine<java.math.BigDecimal> {
 
-	private static final long serialVersionUID = 1723997658;
+	private static final long serialVersionUID = -842776753;
 
 
 	/**
@@ -2020,7 +2020,7 @@ public class PKG_F_MANY_PARAMETERS extends org.jooq.impl.AbstractRoutine<java.ma
 	 * Create a new routine call instance
 	 */
 	public PKG_F_MANY_PARAMETERS() {
-		super(org.jooq.SQLDialect.ORACLE, "PKG_F_MANY_PARAMETERS", org.jooq.test.oracle3.generatedclasses.TEST.TEST, org.jooq.test.oracle3.generatedclasses.packages.LIBRARY.LIBRARY, org.jooq.impl.SQLDataType.NUMERIC);
+		super("PKG_F_MANY_PARAMETERS", org.jooq.test.oracle3.generatedclasses.TEST.TEST, org.jooq.test.oracle3.generatedclasses.packages.LIBRARY.LIBRARY, org.jooq.impl.SQLDataType.NUMERIC);
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(F000);
diff --git a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/packages/library/PKG_F_UNUSED.java b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/packages/library/PKG_F_UNUSED.java
index 30468dbccf..045b6ccb70 100644
--- a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/packages/library/PKG_F_UNUSED.java
+++ b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/packages/library/PKG_F_UNUSED.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle3.generatedclasses.packages.library;
  */
 public class PKG_F_UNUSED extends org.jooq.impl.AbstractRoutine<java.math.BigDecimal> {
 
-	private static final long serialVersionUID = 577686164;
+	private static final long serialVersionUID = 1567194495;
 
 
 	/**
@@ -20,7 +20,7 @@ public class PKG_F_UNUSED extends org.jooq.impl.AbstractRoutine<java.math.BigDec
 	 * Create a new routine call instance
 	 */
 	public PKG_F_UNUSED() {
-		super(org.jooq.SQLDialect.ORACLE, "PKG_F_UNUSED", org.jooq.test.oracle3.generatedclasses.TEST.TEST, org.jooq.test.oracle3.generatedclasses.packages.LIBRARY.LIBRARY, org.jooq.impl.SQLDataType.NUMERIC);
+		super("PKG_F_UNUSED", org.jooq.test.oracle3.generatedclasses.TEST.TEST, org.jooq.test.oracle3.generatedclasses.packages.LIBRARY.LIBRARY, org.jooq.impl.SQLDataType.NUMERIC);
 
 		setReturnParameter(RETURN_VALUE);
 	}
diff --git a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/packages/library/PKG_P_AUTHOR_EXISTS.java b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/packages/library/PKG_P_AUTHOR_EXISTS.java
index 968bbeb1bc..655ffee9a0 100644
--- a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/packages/library/PKG_P_AUTHOR_EXISTS.java
+++ b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/packages/library/PKG_P_AUTHOR_EXISTS.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle3.generatedclasses.packages.library;
  */
 public class PKG_P_AUTHOR_EXISTS extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = -471224108;
+	private static final long serialVersionUID = 607265343;
 
 
 	/**
@@ -30,7 +30,7 @@ public class PKG_P_AUTHOR_EXISTS extends org.jooq.impl.AbstractRoutine<java.lang
 	 * Create a new routine call instance
 	 */
 	public PKG_P_AUTHOR_EXISTS() {
-		super(org.jooq.SQLDialect.ORACLE, "PKG_P_AUTHOR_EXISTS", org.jooq.test.oracle3.generatedclasses.TEST.TEST, org.jooq.test.oracle3.generatedclasses.packages.LIBRARY.LIBRARY);
+		super("PKG_P_AUTHOR_EXISTS", org.jooq.test.oracle3.generatedclasses.TEST.TEST, org.jooq.test.oracle3.generatedclasses.packages.LIBRARY.LIBRARY);
 
 		addInParameter(AUTHOR_NAME);
 		addOutParameter(RESULT);
diff --git a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/packages/library/PKG_P_MANY_PARAMETERS.java b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/packages/library/PKG_P_MANY_PARAMETERS.java
index b9b3fb7070..85317caf52 100644
--- a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/packages/library/PKG_P_MANY_PARAMETERS.java
+++ b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/packages/library/PKG_P_MANY_PARAMETERS.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle3.generatedclasses.packages.library;
  */
 public class PKG_P_MANY_PARAMETERS extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = 540248181;
+	private static final long serialVersionUID = -1308514656;
 
 
 	/**
@@ -2015,7 +2015,7 @@ public class PKG_P_MANY_PARAMETERS extends org.jooq.impl.AbstractRoutine<java.la
 	 * Create a new routine call instance
 	 */
 	public PKG_P_MANY_PARAMETERS() {
-		super(org.jooq.SQLDialect.ORACLE, "PKG_P_MANY_PARAMETERS", org.jooq.test.oracle3.generatedclasses.TEST.TEST, org.jooq.test.oracle3.generatedclasses.packages.LIBRARY.LIBRARY);
+		super("PKG_P_MANY_PARAMETERS", org.jooq.test.oracle3.generatedclasses.TEST.TEST, org.jooq.test.oracle3.generatedclasses.packages.LIBRARY.LIBRARY);
 
 		addInParameter(F000);
 		addInParameter(F001);
diff --git a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/packages/library_767_package_test/LIBRARY_767_PACKAGE_TEST.java b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/packages/library_767_package_test/LIBRARY_767_PACKAGE_TEST.java
index 7d29de68a2..152a5db35f 100644
--- a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/packages/library_767_package_test/LIBRARY_767_PACKAGE_TEST.java
+++ b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/packages/library_767_package_test/LIBRARY_767_PACKAGE_TEST.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle3.generatedclasses.packages.library_767_package_test
  */
 public class LIBRARY_767_PACKAGE_TEST extends org.jooq.impl.AbstractRoutine<java.math.BigDecimal> {
 
-	private static final long serialVersionUID = 1709338285;
+	private static final long serialVersionUID = -1426439464;
 
 
 	/**
@@ -20,7 +20,7 @@ public class LIBRARY_767_PACKAGE_TEST extends org.jooq.impl.AbstractRoutine<java
 	 * Create a new routine call instance
 	 */
 	public LIBRARY_767_PACKAGE_TEST() {
-		super(org.jooq.SQLDialect.ORACLE, "LIBRARY_767_PACKAGE_TEST", org.jooq.test.oracle3.generatedclasses.TEST.TEST, org.jooq.test.oracle3.generatedclasses.packages.LIBRARY_767_PACKAGE_TEST.LIBRARY_767_PACKAGE_TEST, org.jooq.impl.SQLDataType.NUMERIC);
+		super("LIBRARY_767_PACKAGE_TEST", org.jooq.test.oracle3.generatedclasses.TEST.TEST, org.jooq.test.oracle3.generatedclasses.packages.LIBRARY_767_PACKAGE_TEST.LIBRARY_767_PACKAGE_TEST, org.jooq.impl.SQLDataType.NUMERIC);
 
 		setReturnParameter(RETURN_VALUE);
 	}
diff --git a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/F317.java b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/F317.java
index 60dd0a1df7..d8861bb2db 100644
--- a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/F317.java
+++ b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/F317.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle3.generatedclasses.routines;
  */
 public class F317 extends org.jooq.impl.AbstractRoutine<java.math.BigDecimal> {
 
-	private static final long serialVersionUID = -1834158788;
+	private static final long serialVersionUID = -1892100879;
 
 
 	/**
@@ -40,7 +40,7 @@ public class F317 extends org.jooq.impl.AbstractRoutine<java.math.BigDecimal> {
 	 * Create a new routine call instance
 	 */
 	public F317() {
-		super(org.jooq.SQLDialect.ORACLE, "F317", org.jooq.test.oracle3.generatedclasses.TEST.TEST, org.jooq.impl.SQLDataType.NUMERIC);
+		super("F317", org.jooq.test.oracle3.generatedclasses.TEST.TEST, org.jooq.impl.SQLDataType.NUMERIC);
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(P1);
diff --git a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/F377.java b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/F377.java
index 8cc7e2d35d..46c393998a 100644
--- a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/F377.java
+++ b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/F377.java
@@ -8,13 +8,13 @@ package org.jooq.test.oracle3.generatedclasses.routines;
  */
 public class F377 extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = -598983793;
+	private static final long serialVersionUID = -1715602236;
 
 
 	/**
 	 * Create a new routine call instance
 	 */
 	public F377() {
-		super(org.jooq.SQLDialect.ORACLE, "F377", org.jooq.test.oracle3.generatedclasses.TEST.TEST);
+		super("F377", org.jooq.test.oracle3.generatedclasses.TEST.TEST);
 	}
 }
diff --git a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/F378.java b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/F378.java
index 56d96ff99d..b11286767e 100644
--- a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/F378.java
+++ b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/F378.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle3.generatedclasses.routines;
  */
 public class F378 extends org.jooq.impl.AbstractRoutine<java.math.BigDecimal> {
 
-	private static final long serialVersionUID = -619083721;
+	private static final long serialVersionUID = -1346525598;
 
 
 	/**
@@ -35,7 +35,7 @@ public class F378 extends org.jooq.impl.AbstractRoutine<java.math.BigDecimal> {
 	 * Create a new routine call instance
 	 */
 	public F378() {
-		super(org.jooq.SQLDialect.ORACLE, "F378", org.jooq.test.oracle3.generatedclasses.TEST.TEST, org.jooq.impl.SQLDataType.NUMERIC);
+		super("F378", org.jooq.test.oracle3.generatedclasses.TEST.TEST, org.jooq.impl.SQLDataType.NUMERIC);
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(I);
diff --git a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/F691CURSOR_IN.java b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/F691CURSOR_IN.java
index 489d456718..97ccbaf09a 100644
--- a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/F691CURSOR_IN.java
+++ b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/F691CURSOR_IN.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle3.generatedclasses.routines;
  */
 public class F691CURSOR_IN extends org.jooq.impl.AbstractRoutine<java.math.BigDecimal> {
 
-	private static final long serialVersionUID = 572247539;
+	private static final long serialVersionUID = 1875336478;
 
 
 	/**
@@ -25,7 +25,7 @@ public class F691CURSOR_IN extends org.jooq.impl.AbstractRoutine<java.math.BigDe
 	 * Create a new routine call instance
 	 */
 	public F691CURSOR_IN() {
-		super(org.jooq.SQLDialect.ORACLE, "F691CURSOR_IN", org.jooq.test.oracle3.generatedclasses.TEST.TEST, org.jooq.impl.SQLDataType.NUMERIC);
+		super("F691CURSOR_IN", org.jooq.test.oracle3.generatedclasses.TEST.TEST, org.jooq.impl.SQLDataType.NUMERIC);
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(C);
diff --git a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/F691CURSOR_OUT.java b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/F691CURSOR_OUT.java
index 76c7298e63..d8ffd7a025 100644
--- a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/F691CURSOR_OUT.java
+++ b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/F691CURSOR_OUT.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle3.generatedclasses.routines;
  */
 public class F691CURSOR_OUT extends org.jooq.impl.AbstractRoutine<org.jooq.Result<org.jooq.Record>> {
 
-	private static final long serialVersionUID = -2074989120;
+	private static final long serialVersionUID = -1570627029;
 
 
 	/**
@@ -20,7 +20,7 @@ public class F691CURSOR_OUT extends org.jooq.impl.AbstractRoutine<org.jooq.Resul
 	 * Create a new routine call instance
 	 */
 	public F691CURSOR_OUT() {
-		super(org.jooq.SQLDialect.ORACLE, "F691CURSOR_OUT", org.jooq.test.oracle3.generatedclasses.TEST.TEST, org.jooq.impl.SQLDataType.RESULT);
+		super("F691CURSOR_OUT", org.jooq.test.oracle3.generatedclasses.TEST.TEST, org.jooq.impl.SQLDataType.RESULT);
 
 		setReturnParameter(RETURN_VALUE);
 	}
diff --git a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/F_ARRAYS1.java b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/F_ARRAYS1.java
index 43560d7470..4375f06994 100644
--- a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/F_ARRAYS1.java
+++ b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/F_ARRAYS1.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle3.generatedclasses.routines;
  */
 public class F_ARRAYS1 extends org.jooq.impl.AbstractRoutine<org.jooq.test.oracle3.generatedclasses.udt.records.U_NUMBER_ARRAY> {
 
-	private static final long serialVersionUID = 357438726;
+	private static final long serialVersionUID = -963472719;
 
 
 	/**
@@ -25,7 +25,7 @@ public class F_ARRAYS1 extends org.jooq.impl.AbstractRoutine<org.jooq.test.oracl
 	 * Create a new routine call instance
 	 */
 	public F_ARRAYS1() {
-		super(org.jooq.SQLDialect.ORACLE, "F_ARRAYS1", org.jooq.test.oracle3.generatedclasses.TEST.TEST, org.jooq.impl.SQLDataType.INTEGER.asArrayDataType(org.jooq.test.oracle3.generatedclasses.udt.records.U_NUMBER_ARRAY.class));
+		super("F_ARRAYS1", org.jooq.test.oracle3.generatedclasses.TEST.TEST, org.jooq.impl.SQLDataType.INTEGER.asArrayDataType(org.jooq.test.oracle3.generatedclasses.udt.records.U_NUMBER_ARRAY.class));
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(IN_ARRAY);
diff --git a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/F_ARRAYS2.java b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/F_ARRAYS2.java
index 0b23265c47..52a28d1c0d 100644
--- a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/F_ARRAYS2.java
+++ b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/F_ARRAYS2.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle3.generatedclasses.routines;
  */
 public class F_ARRAYS2 extends org.jooq.impl.AbstractRoutine<org.jooq.test.oracle3.generatedclasses.udt.records.U_NUMBER_LONG_ARRAY> {
 
-	private static final long serialVersionUID = 721689262;
+	private static final long serialVersionUID = -877477479;
 
 
 	/**
@@ -25,7 +25,7 @@ public class F_ARRAYS2 extends org.jooq.impl.AbstractRoutine<org.jooq.test.oracl
 	 * Create a new routine call instance
 	 */
 	public F_ARRAYS2() {
-		super(org.jooq.SQLDialect.ORACLE, "F_ARRAYS2", org.jooq.test.oracle3.generatedclasses.TEST.TEST, org.jooq.impl.SQLDataType.BIGINT.asArrayDataType(org.jooq.test.oracle3.generatedclasses.udt.records.U_NUMBER_LONG_ARRAY.class));
+		super("F_ARRAYS2", org.jooq.test.oracle3.generatedclasses.TEST.TEST, org.jooq.impl.SQLDataType.BIGINT.asArrayDataType(org.jooq.test.oracle3.generatedclasses.udt.records.U_NUMBER_LONG_ARRAY.class));
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(IN_ARRAY);
diff --git a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/F_ARRAYS3.java b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/F_ARRAYS3.java
index b0ba68e182..82ef9c8392 100644
--- a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/F_ARRAYS3.java
+++ b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/F_ARRAYS3.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle3.generatedclasses.routines;
  */
 public class F_ARRAYS3 extends org.jooq.impl.AbstractRoutine<org.jooq.test.oracle3.generatedclasses.udt.records.U_STRING_ARRAY> {
 
-	private static final long serialVersionUID = -635083737;
+	private static final long serialVersionUID = 303385810;
 
 
 	/**
@@ -25,7 +25,7 @@ public class F_ARRAYS3 extends org.jooq.impl.AbstractRoutine<org.jooq.test.oracl
 	 * Create a new routine call instance
 	 */
 	public F_ARRAYS3() {
-		super(org.jooq.SQLDialect.ORACLE, "F_ARRAYS3", org.jooq.test.oracle3.generatedclasses.TEST.TEST, org.jooq.impl.SQLDataType.VARCHAR.asArrayDataType(org.jooq.test.oracle3.generatedclasses.udt.records.U_STRING_ARRAY.class));
+		super("F_ARRAYS3", org.jooq.test.oracle3.generatedclasses.TEST.TEST, org.jooq.impl.SQLDataType.VARCHAR.asArrayDataType(org.jooq.test.oracle3.generatedclasses.udt.records.U_STRING_ARRAY.class));
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(IN_ARRAY);
diff --git a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/F_ARRAYS4.java b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/F_ARRAYS4.java
index 9ee724cd5e..d46071ef54 100644
--- a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/F_ARRAYS4.java
+++ b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/F_ARRAYS4.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle3.generatedclasses.routines;
  */
 public class F_ARRAYS4 extends org.jooq.impl.AbstractRoutine<org.jooq.test.oracle3.generatedclasses.udt.records.U_BOOK_ARRAY> {
 
-	private static final long serialVersionUID = -50663123;
+	private static final long serialVersionUID = 1521952482;
 
 
 	/**
@@ -25,7 +25,7 @@ public class F_ARRAYS4 extends org.jooq.impl.AbstractRoutine<org.jooq.test.oracl
 	 * Create a new routine call instance
 	 */
 	public F_ARRAYS4() {
-		super(org.jooq.SQLDialect.ORACLE, "F_ARRAYS4", org.jooq.test.oracle3.generatedclasses.TEST.TEST, org.jooq.test.oracle3.generatedclasses.udt.U_BOOK_TYPE.U_BOOK_TYPE.getDataType().asArrayDataType(org.jooq.test.oracle3.generatedclasses.udt.records.U_BOOK_ARRAY.class));
+		super("F_ARRAYS4", org.jooq.test.oracle3.generatedclasses.TEST.TEST, org.jooq.test.oracle3.generatedclasses.udt.U_BOOK_TYPE.U_BOOK_TYPE.getDataType().asArrayDataType(org.jooq.test.oracle3.generatedclasses.udt.records.U_BOOK_ARRAY.class));
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(IN_ARRAY);
diff --git a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/F_AUTHOR_EXISTS.java b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/F_AUTHOR_EXISTS.java
index a32fa0161d..e91102f756 100644
--- a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/F_AUTHOR_EXISTS.java
+++ b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/F_AUTHOR_EXISTS.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle3.generatedclasses.routines;
  */
 public class F_AUTHOR_EXISTS extends org.jooq.impl.AbstractRoutine<java.math.BigDecimal> {
 
-	private static final long serialVersionUID = -1908204359;
+	private static final long serialVersionUID = 1468954212;
 
 
 	/**
@@ -25,7 +25,7 @@ public class F_AUTHOR_EXISTS extends org.jooq.impl.AbstractRoutine<java.math.Big
 	 * Create a new routine call instance
 	 */
 	public F_AUTHOR_EXISTS() {
-		super(org.jooq.SQLDialect.ORACLE, "F_AUTHOR_EXISTS", org.jooq.test.oracle3.generatedclasses.TEST.TEST, org.jooq.impl.SQLDataType.NUMERIC);
+		super("F_AUTHOR_EXISTS", org.jooq.test.oracle3.generatedclasses.TEST.TEST, org.jooq.impl.SQLDataType.NUMERIC);
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(AUTHOR_NAME);
diff --git a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/F_GET_ONE_CURSOR.java b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/F_GET_ONE_CURSOR.java
index 50409baf33..ecfa0954c4 100644
--- a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/F_GET_ONE_CURSOR.java
+++ b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/F_GET_ONE_CURSOR.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle3.generatedclasses.routines;
  */
 public class F_GET_ONE_CURSOR extends org.jooq.impl.AbstractRoutine<org.jooq.Result<org.jooq.Record>> {
 
-	private static final long serialVersionUID = -1044322326;
+	private static final long serialVersionUID = -218562017;
 
 
 	/**
@@ -25,7 +25,7 @@ public class F_GET_ONE_CURSOR extends org.jooq.impl.AbstractRoutine<org.jooq.Res
 	 * Create a new routine call instance
 	 */
 	public F_GET_ONE_CURSOR() {
-		super(org.jooq.SQLDialect.ORACLE, "F_GET_ONE_CURSOR", org.jooq.test.oracle3.generatedclasses.TEST.TEST, org.jooq.impl.SQLDataType.RESULT);
+		super("F_GET_ONE_CURSOR", org.jooq.test.oracle3.generatedclasses.TEST.TEST, org.jooq.impl.SQLDataType.RESULT);
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(BOOK_IDS);
diff --git a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/F_MANY_PARAMETERS.java b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/F_MANY_PARAMETERS.java
index 20feb51fbe..327b2ab2db 100644
--- a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/F_MANY_PARAMETERS.java
+++ b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/F_MANY_PARAMETERS.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle3.generatedclasses.routines;
  */
 public class F_MANY_PARAMETERS extends org.jooq.impl.AbstractRoutine<java.math.BigDecimal> {
 
-	private static final long serialVersionUID = 1237579750;
+	private static final long serialVersionUID = 938486993;
 
 
 	/**
@@ -2020,7 +2020,7 @@ public class F_MANY_PARAMETERS extends org.jooq.impl.AbstractRoutine<java.math.B
 	 * Create a new routine call instance
 	 */
 	public F_MANY_PARAMETERS() {
-		super(org.jooq.SQLDialect.ORACLE, "F_MANY_PARAMETERS", org.jooq.test.oracle3.generatedclasses.TEST.TEST, org.jooq.impl.SQLDataType.NUMERIC);
+		super("F_MANY_PARAMETERS", org.jooq.test.oracle3.generatedclasses.TEST.TEST, org.jooq.impl.SQLDataType.NUMERIC);
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(F000);
diff --git a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/F_NUMBER.java b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/F_NUMBER.java
index c38e987a89..8dcc2751dd 100644
--- a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/F_NUMBER.java
+++ b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/F_NUMBER.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle3.generatedclasses.routines;
  */
 public class F_NUMBER extends org.jooq.impl.AbstractRoutine<java.math.BigDecimal> {
 
-	private static final long serialVersionUID = -365215054;
+	private static final long serialVersionUID = -301896537;
 
 
 	/**
@@ -25,7 +25,7 @@ public class F_NUMBER extends org.jooq.impl.AbstractRoutine<java.math.BigDecimal
 	 * Create a new routine call instance
 	 */
 	public F_NUMBER() {
-		super(org.jooq.SQLDialect.ORACLE, "F_NUMBER", org.jooq.test.oracle3.generatedclasses.TEST.TEST, org.jooq.impl.SQLDataType.NUMERIC);
+		super("F_NUMBER", org.jooq.test.oracle3.generatedclasses.TEST.TEST, org.jooq.impl.SQLDataType.NUMERIC);
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(N);
diff --git a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/F_ONE.java b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/F_ONE.java
index 7a578faf61..1dd0bdab3d 100644
--- a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/F_ONE.java
+++ b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/F_ONE.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle3.generatedclasses.routines;
  */
 public class F_ONE extends org.jooq.impl.AbstractRoutine<java.math.BigDecimal> {
 
-	private static final long serialVersionUID = -1123894646;
+	private static final long serialVersionUID = -1250851339;
 
 
 	/**
@@ -20,7 +20,7 @@ public class F_ONE extends org.jooq.impl.AbstractRoutine<java.math.BigDecimal> {
 	 * Create a new routine call instance
 	 */
 	public F_ONE() {
-		super(org.jooq.SQLDialect.ORACLE, "F_ONE", org.jooq.test.oracle3.generatedclasses.TEST.TEST, org.jooq.impl.SQLDataType.NUMERIC);
+		super("F_ONE", org.jooq.test.oracle3.generatedclasses.TEST.TEST, org.jooq.impl.SQLDataType.NUMERIC);
 
 		setReturnParameter(RETURN_VALUE);
 	}
diff --git a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/F_PIPELINED_ARRAY1.java b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/F_PIPELINED_ARRAY1.java
index 21380d84d1..4fc6f7b4dc 100644
--- a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/F_PIPELINED_ARRAY1.java
+++ b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/F_PIPELINED_ARRAY1.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle3.generatedclasses.routines;
  */
 public class F_PIPELINED_ARRAY1 extends org.jooq.impl.AbstractRoutine<org.jooq.test.oracle3.generatedclasses.udt.records.U_NUMBER_ARRAY> {
 
-	private static final long serialVersionUID = -923154925;
+	private static final long serialVersionUID = 39974206;
 
 
 	/**
@@ -20,7 +20,7 @@ public class F_PIPELINED_ARRAY1 extends org.jooq.impl.AbstractRoutine<org.jooq.t
 	 * Create a new routine call instance
 	 */
 	public F_PIPELINED_ARRAY1() {
-		super(org.jooq.SQLDialect.ORACLE, "F_PIPELINED_ARRAY1", org.jooq.test.oracle3.generatedclasses.TEST.TEST, org.jooq.impl.SQLDataType.INTEGER.asArrayDataType(org.jooq.test.oracle3.generatedclasses.udt.records.U_NUMBER_ARRAY.class));
+		super("F_PIPELINED_ARRAY1", org.jooq.test.oracle3.generatedclasses.TEST.TEST, org.jooq.impl.SQLDataType.INTEGER.asArrayDataType(org.jooq.test.oracle3.generatedclasses.udt.records.U_NUMBER_ARRAY.class));
 
 		setReturnParameter(RETURN_VALUE);
 	}
diff --git a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/F_PIPELINED_ARRAY4.java b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/F_PIPELINED_ARRAY4.java
index d825dc8d0f..18ecf51ed0 100644
--- a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/F_PIPELINED_ARRAY4.java
+++ b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/F_PIPELINED_ARRAY4.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle3.generatedclasses.routines;
  */
 public class F_PIPELINED_ARRAY4 extends org.jooq.impl.AbstractRoutine<org.jooq.test.oracle3.generatedclasses.udt.records.U_BOOK_ARRAY> {
 
-	private static final long serialVersionUID = -976195408;
+	private static final long serialVersionUID = 1544459621;
 
 
 	/**
@@ -20,7 +20,7 @@ public class F_PIPELINED_ARRAY4 extends org.jooq.impl.AbstractRoutine<org.jooq.t
 	 * Create a new routine call instance
 	 */
 	public F_PIPELINED_ARRAY4() {
-		super(org.jooq.SQLDialect.ORACLE, "F_PIPELINED_ARRAY4", org.jooq.test.oracle3.generatedclasses.TEST.TEST, org.jooq.test.oracle3.generatedclasses.udt.U_BOOK_TYPE.U_BOOK_TYPE.getDataType().asArrayDataType(org.jooq.test.oracle3.generatedclasses.udt.records.U_BOOK_ARRAY.class));
+		super("F_PIPELINED_ARRAY4", org.jooq.test.oracle3.generatedclasses.TEST.TEST, org.jooq.test.oracle3.generatedclasses.udt.U_BOOK_TYPE.U_BOOK_TYPE.getDataType().asArrayDataType(org.jooq.test.oracle3.generatedclasses.udt.records.U_BOOK_ARRAY.class));
 
 		setReturnParameter(RETURN_VALUE);
 	}
diff --git a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/F_PIPELINED_TABLE1.java b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/F_PIPELINED_TABLE1.java
index 51fe58c08c..b1dc0a0aad 100644
--- a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/F_PIPELINED_TABLE1.java
+++ b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/F_PIPELINED_TABLE1.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle3.generatedclasses.routines;
  */
 public class F_PIPELINED_TABLE1 extends org.jooq.impl.AbstractRoutine<org.jooq.test.oracle3.generatedclasses.udt.records.U_NUMBER_TABLE> {
 
-	private static final long serialVersionUID = -1955724184;
+	private static final long serialVersionUID = -3676909;
 
 
 	/**
@@ -20,7 +20,7 @@ public class F_PIPELINED_TABLE1 extends org.jooq.impl.AbstractRoutine<org.jooq.t
 	 * Create a new routine call instance
 	 */
 	public F_PIPELINED_TABLE1() {
-		super(org.jooq.SQLDialect.ORACLE, "F_PIPELINED_TABLE1", org.jooq.test.oracle3.generatedclasses.TEST.TEST, org.jooq.impl.SQLDataType.INTEGER.asArrayDataType(org.jooq.test.oracle3.generatedclasses.udt.records.U_NUMBER_TABLE.class));
+		super("F_PIPELINED_TABLE1", org.jooq.test.oracle3.generatedclasses.TEST.TEST, org.jooq.impl.SQLDataType.INTEGER.asArrayDataType(org.jooq.test.oracle3.generatedclasses.udt.records.U_NUMBER_TABLE.class));
 
 		setReturnParameter(RETURN_VALUE);
 	}
diff --git a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/F_PIPELINED_TABLE4.java b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/F_PIPELINED_TABLE4.java
index bd93a32485..2c77d3c5d5 100644
--- a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/F_PIPELINED_TABLE4.java
+++ b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/F_PIPELINED_TABLE4.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle3.generatedclasses.routines;
  */
 public class F_PIPELINED_TABLE4 extends org.jooq.impl.AbstractRoutine<org.jooq.test.oracle3.generatedclasses.udt.records.U_BOOK_TABLE> {
 
-	private static final long serialVersionUID = -2032364465;
+	private static final long serialVersionUID = 866978436;
 
 
 	/**
@@ -20,7 +20,7 @@ public class F_PIPELINED_TABLE4 extends org.jooq.impl.AbstractRoutine<org.jooq.t
 	 * Create a new routine call instance
 	 */
 	public F_PIPELINED_TABLE4() {
-		super(org.jooq.SQLDialect.ORACLE, "F_PIPELINED_TABLE4", org.jooq.test.oracle3.generatedclasses.TEST.TEST, org.jooq.test.oracle3.generatedclasses.udt.U_BOOK_TYPE.U_BOOK_TYPE.getDataType().asArrayDataType(org.jooq.test.oracle3.generatedclasses.udt.records.U_BOOK_TABLE.class));
+		super("F_PIPELINED_TABLE4", org.jooq.test.oracle3.generatedclasses.TEST.TEST, org.jooq.test.oracle3.generatedclasses.udt.U_BOOK_TYPE.U_BOOK_TYPE.getDataType().asArrayDataType(org.jooq.test.oracle3.generatedclasses.udt.records.U_BOOK_TABLE.class));
 
 		setReturnParameter(RETURN_VALUE);
 	}
diff --git a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/F_TABLES1.java b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/F_TABLES1.java
index b0de692ea7..565b846b9d 100644
--- a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/F_TABLES1.java
+++ b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/F_TABLES1.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle3.generatedclasses.routines;
  */
 public class F_TABLES1 extends org.jooq.impl.AbstractRoutine<org.jooq.test.oracle3.generatedclasses.udt.records.U_NUMBER_TABLE> {
 
-	private static final long serialVersionUID = 778805952;
+	private static final long serialVersionUID = -716986901;
 
 
 	/**
@@ -25,7 +25,7 @@ public class F_TABLES1 extends org.jooq.impl.AbstractRoutine<org.jooq.test.oracl
 	 * Create a new routine call instance
 	 */
 	public F_TABLES1() {
-		super(org.jooq.SQLDialect.ORACLE, "F_TABLES1", org.jooq.test.oracle3.generatedclasses.TEST.TEST, org.jooq.impl.SQLDataType.INTEGER.asArrayDataType(org.jooq.test.oracle3.generatedclasses.udt.records.U_NUMBER_TABLE.class));
+		super("F_TABLES1", org.jooq.test.oracle3.generatedclasses.TEST.TEST, org.jooq.impl.SQLDataType.INTEGER.asArrayDataType(org.jooq.test.oracle3.generatedclasses.udt.records.U_NUMBER_TABLE.class));
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(IN_TABLE);
diff --git a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/F_TABLES2.java b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/F_TABLES2.java
index 33b62830ae..2dcac08a25 100644
--- a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/F_TABLES2.java
+++ b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/F_TABLES2.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle3.generatedclasses.routines;
  */
 public class F_TABLES2 extends org.jooq.impl.AbstractRoutine<org.jooq.test.oracle3.generatedclasses.udt.records.U_NUMBER_LONG_TABLE> {
 
-	private static final long serialVersionUID = 456807174;
+	private static final long serialVersionUID = 142497905;
 
 
 	/**
@@ -25,7 +25,7 @@ public class F_TABLES2 extends org.jooq.impl.AbstractRoutine<org.jooq.test.oracl
 	 * Create a new routine call instance
 	 */
 	public F_TABLES2() {
-		super(org.jooq.SQLDialect.ORACLE, "F_TABLES2", org.jooq.test.oracle3.generatedclasses.TEST.TEST, org.jooq.impl.SQLDataType.BIGINT.asArrayDataType(org.jooq.test.oracle3.generatedclasses.udt.records.U_NUMBER_LONG_TABLE.class));
+		super("F_TABLES2", org.jooq.test.oracle3.generatedclasses.TEST.TEST, org.jooq.impl.SQLDataType.BIGINT.asArrayDataType(org.jooq.test.oracle3.generatedclasses.udt.records.U_NUMBER_LONG_TABLE.class));
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(IN_TABLE);
diff --git a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/F_TABLES3.java b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/F_TABLES3.java
index 7ca86cfc46..63190d321b 100644
--- a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/F_TABLES3.java
+++ b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/F_TABLES3.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle3.generatedclasses.routines;
  */
 public class F_TABLES3 extends org.jooq.impl.AbstractRoutine<org.jooq.test.oracle3.generatedclasses.udt.records.U_STRING_TABLE> {
 
-	private static final long serialVersionUID = -213716511;
+	private static final long serialVersionUID = 549871628;
 
 
 	/**
@@ -25,7 +25,7 @@ public class F_TABLES3 extends org.jooq.impl.AbstractRoutine<org.jooq.test.oracl
 	 * Create a new routine call instance
 	 */
 	public F_TABLES3() {
-		super(org.jooq.SQLDialect.ORACLE, "F_TABLES3", org.jooq.test.oracle3.generatedclasses.TEST.TEST, org.jooq.impl.SQLDataType.VARCHAR.asArrayDataType(org.jooq.test.oracle3.generatedclasses.udt.records.U_STRING_TABLE.class));
+		super("F_TABLES3", org.jooq.test.oracle3.generatedclasses.TEST.TEST, org.jooq.impl.SQLDataType.VARCHAR.asArrayDataType(org.jooq.test.oracle3.generatedclasses.udt.records.U_STRING_TABLE.class));
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(IN_TABLE);
diff --git a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/F_TABLES4.java b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/F_TABLES4.java
index 656ae98971..a4234335c1 100644
--- a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/F_TABLES4.java
+++ b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/F_TABLES4.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle3.generatedclasses.routines;
  */
 public class F_TABLES4 extends org.jooq.impl.AbstractRoutine<org.jooq.test.oracle3.generatedclasses.udt.records.U_BOOK_TABLE> {
 
-	private static final long serialVersionUID = 646383439;
+	private static final long serialVersionUID = 795581316;
 
 
 	/**
@@ -25,7 +25,7 @@ public class F_TABLES4 extends org.jooq.impl.AbstractRoutine<org.jooq.test.oracl
 	 * Create a new routine call instance
 	 */
 	public F_TABLES4() {
-		super(org.jooq.SQLDialect.ORACLE, "F_TABLES4", org.jooq.test.oracle3.generatedclasses.TEST.TEST, org.jooq.test.oracle3.generatedclasses.udt.U_BOOK_TYPE.U_BOOK_TYPE.getDataType().asArrayDataType(org.jooq.test.oracle3.generatedclasses.udt.records.U_BOOK_TABLE.class));
+		super("F_TABLES4", org.jooq.test.oracle3.generatedclasses.TEST.TEST, org.jooq.test.oracle3.generatedclasses.udt.U_BOOK_TYPE.U_BOOK_TYPE.getDataType().asArrayDataType(org.jooq.test.oracle3.generatedclasses.udt.records.U_BOOK_TABLE.class));
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(IN_TABLE);
diff --git a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/P377.java b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/P377.java
index 1f4762bac9..1d95078669 100644
--- a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/P377.java
+++ b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/P377.java
@@ -8,13 +8,13 @@ package org.jooq.test.oracle3.generatedclasses.routines;
  */
 public class P377 extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = 1451426393;
+	private static final long serialVersionUID = -1018322034;
 
 
 	/**
 	 * Create a new routine call instance
 	 */
 	public P377() {
-		super(org.jooq.SQLDialect.ORACLE, "P377", org.jooq.test.oracle3.generatedclasses.TEST.TEST);
+		super("P377", org.jooq.test.oracle3.generatedclasses.TEST.TEST);
 	}
 }
diff --git a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/P391.java b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/P391.java
index 7196e84c36..0e7daf78eb 100644
--- a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/P391.java
+++ b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/P391.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle3.generatedclasses.routines;
  */
 public class P391 extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = -644250244;
+	private static final long serialVersionUID = 1113326055;
 
 
 	/**
@@ -45,7 +45,7 @@ public class P391 extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 	 * Create a new routine call instance
 	 */
 	public P391() {
-		super(org.jooq.SQLDialect.ORACLE, "P391", org.jooq.test.oracle3.generatedclasses.TEST.TEST);
+		super("P391", org.jooq.test.oracle3.generatedclasses.TEST.TEST);
 
 		addInParameter(I1);
 		addInOutParameter(IO1);
diff --git a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/P_ARRAYS1.java b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/P_ARRAYS1.java
index 0323a55261..7f49fbbb38 100644
--- a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/P_ARRAYS1.java
+++ b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/P_ARRAYS1.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle3.generatedclasses.routines;
  */
 public class P_ARRAYS1 extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = -65403557;
+	private static final long serialVersionUID = -1841753466;
 
 
 	/**
@@ -25,7 +25,7 @@ public class P_ARRAYS1 extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 	 * Create a new routine call instance
 	 */
 	public P_ARRAYS1() {
-		super(org.jooq.SQLDialect.ORACLE, "P_ARRAYS1", org.jooq.test.oracle3.generatedclasses.TEST.TEST);
+		super("P_ARRAYS1", org.jooq.test.oracle3.generatedclasses.TEST.TEST);
 
 		addInParameter(IN_ARRAY);
 		addOutParameter(OUT_ARRAY);
diff --git a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/P_ARRAYS2.java b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/P_ARRAYS2.java
index f3822c13b2..596beb1fd3 100644
--- a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/P_ARRAYS2.java
+++ b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/P_ARRAYS2.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle3.generatedclasses.routines;
  */
 public class P_ARRAYS2 extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = -855955104;
+	private static final long serialVersionUID = -176157493;
 
 
 	/**
@@ -25,7 +25,7 @@ public class P_ARRAYS2 extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 	 * Create a new routine call instance
 	 */
 	public P_ARRAYS2() {
-		super(org.jooq.SQLDialect.ORACLE, "P_ARRAYS2", org.jooq.test.oracle3.generatedclasses.TEST.TEST);
+		super("P_ARRAYS2", org.jooq.test.oracle3.generatedclasses.TEST.TEST);
 
 		addInParameter(IN_ARRAY);
 		addOutParameter(OUT_ARRAY);
diff --git a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/P_ARRAYS3.java b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/P_ARRAYS3.java
index 51c93c8fae..57df7c784e 100644
--- a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/P_ARRAYS3.java
+++ b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/P_ARRAYS3.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle3.generatedclasses.routines;
  */
 public class P_ARRAYS3 extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = -782747601;
+	private static final long serialVersionUID = -350266790;
 
 
 	/**
@@ -25,7 +25,7 @@ public class P_ARRAYS3 extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 	 * Create a new routine call instance
 	 */
 	public P_ARRAYS3() {
-		super(org.jooq.SQLDialect.ORACLE, "P_ARRAYS3", org.jooq.test.oracle3.generatedclasses.TEST.TEST);
+		super("P_ARRAYS3", org.jooq.test.oracle3.generatedclasses.TEST.TEST);
 
 		addInParameter(IN_ARRAY);
 		addOutParameter(OUT_ARRAY);
diff --git a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/P_ARRAYS4.java b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/P_ARRAYS4.java
index de8338cbcc..0102d8e4ce 100644
--- a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/P_ARRAYS4.java
+++ b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/P_ARRAYS4.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle3.generatedclasses.routines;
  */
 public class P_ARRAYS4 extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = -1464358864;
+	private static final long serialVersionUID = -443013413;
 
 
 	/**
@@ -25,7 +25,7 @@ public class P_ARRAYS4 extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 	 * Create a new routine call instance
 	 */
 	public P_ARRAYS4() {
-		super(org.jooq.SQLDialect.ORACLE, "P_ARRAYS4", org.jooq.test.oracle3.generatedclasses.TEST.TEST);
+		super("P_ARRAYS4", org.jooq.test.oracle3.generatedclasses.TEST.TEST);
 
 		addInParameter(IN_ARRAY);
 		addOutParameter(OUT_ARRAY);
diff --git a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/P_AUTHOR_EXISTS.java b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/P_AUTHOR_EXISTS.java
index bbb24b3fec..d6f8bf996b 100644
--- a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/P_AUTHOR_EXISTS.java
+++ b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/P_AUTHOR_EXISTS.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle3.generatedclasses.routines;
  */
 public class P_AUTHOR_EXISTS extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = 1374464893;
+	private static final long serialVersionUID = 1674934130;
 
 
 	/**
@@ -25,7 +25,7 @@ public class P_AUTHOR_EXISTS extends org.jooq.impl.AbstractRoutine<java.lang.Voi
 	 * Create a new routine call instance
 	 */
 	public P_AUTHOR_EXISTS() {
-		super(org.jooq.SQLDialect.ORACLE, "P_AUTHOR_EXISTS", org.jooq.test.oracle3.generatedclasses.TEST.TEST);
+		super("P_AUTHOR_EXISTS", org.jooq.test.oracle3.generatedclasses.TEST.TEST);
 
 		addInParameter(AUTHOR_NAME);
 		addOutParameter(RESULT);
diff --git a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/P_CREATE_AUTHOR.java b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/P_CREATE_AUTHOR.java
index 3ccafdebe4..27479f4bed 100644
--- a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/P_CREATE_AUTHOR.java
+++ b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/P_CREATE_AUTHOR.java
@@ -8,13 +8,13 @@ package org.jooq.test.oracle3.generatedclasses.routines;
  */
 public class P_CREATE_AUTHOR extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = -2026984221;
+	private static final long serialVersionUID = 1578074510;
 
 
 	/**
 	 * Create a new routine call instance
 	 */
 	public P_CREATE_AUTHOR() {
-		super(org.jooq.SQLDialect.ORACLE, "P_CREATE_AUTHOR", org.jooq.test.oracle3.generatedclasses.TEST.TEST);
+		super("P_CREATE_AUTHOR", org.jooq.test.oracle3.generatedclasses.TEST.TEST);
 	}
 }
diff --git a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/P_CREATE_AUTHOR_BY_NAME.java b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/P_CREATE_AUTHOR_BY_NAME.java
index 26367e08b3..5bd0ef9409 100644
--- a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/P_CREATE_AUTHOR_BY_NAME.java
+++ b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/P_CREATE_AUTHOR_BY_NAME.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle3.generatedclasses.routines;
  */
 public class P_CREATE_AUTHOR_BY_NAME extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = 451342133;
+	private static final long serialVersionUID = 429078570;
 
 
 	/**
@@ -25,7 +25,7 @@ public class P_CREATE_AUTHOR_BY_NAME extends org.jooq.impl.AbstractRoutine<java.
 	 * Create a new routine call instance
 	 */
 	public P_CREATE_AUTHOR_BY_NAME() {
-		super(org.jooq.SQLDialect.ORACLE, "P_CREATE_AUTHOR_BY_NAME", org.jooq.test.oracle3.generatedclasses.TEST.TEST);
+		super("P_CREATE_AUTHOR_BY_NAME", org.jooq.test.oracle3.generatedclasses.TEST.TEST);
 
 		addInParameter(FIRST_NAME);
 		addInParameter(LAST_NAME);
diff --git a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/P_ENHANCE_ADDRESS1.java b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/P_ENHANCE_ADDRESS1.java
index bf5d840101..0e09f145fc 100644
--- a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/P_ENHANCE_ADDRESS1.java
+++ b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/P_ENHANCE_ADDRESS1.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle3.generatedclasses.routines;
  */
 public class P_ENHANCE_ADDRESS1 extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = 1953828426;
+	private static final long serialVersionUID = -251027393;
 
 
 	/**
@@ -25,7 +25,7 @@ public class P_ENHANCE_ADDRESS1 extends org.jooq.impl.AbstractRoutine<java.lang.
 	 * Create a new routine call instance
 	 */
 	public P_ENHANCE_ADDRESS1() {
-		super(org.jooq.SQLDialect.ORACLE, "P_ENHANCE_ADDRESS1", org.jooq.test.oracle3.generatedclasses.TEST.TEST);
+		super("P_ENHANCE_ADDRESS1", org.jooq.test.oracle3.generatedclasses.TEST.TEST);
 
 		addInParameter(ADDRESS);
 		addOutParameter(NO);
diff --git a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/P_ENHANCE_ADDRESS2.java b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/P_ENHANCE_ADDRESS2.java
index d9c94aff42..27085c1298 100644
--- a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/P_ENHANCE_ADDRESS2.java
+++ b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/P_ENHANCE_ADDRESS2.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle3.generatedclasses.routines;
  */
 public class P_ENHANCE_ADDRESS2 extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = -344641770;
+	private static final long serialVersionUID = -992247349;
 
 
 	/**
@@ -20,7 +20,7 @@ public class P_ENHANCE_ADDRESS2 extends org.jooq.impl.AbstractRoutine<java.lang.
 	 * Create a new routine call instance
 	 */
 	public P_ENHANCE_ADDRESS2() {
-		super(org.jooq.SQLDialect.ORACLE, "P_ENHANCE_ADDRESS2", org.jooq.test.oracle3.generatedclasses.TEST.TEST);
+		super("P_ENHANCE_ADDRESS2", org.jooq.test.oracle3.generatedclasses.TEST.TEST);
 
 		addOutParameter(ADDRESS);
 	}
diff --git a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/P_ENHANCE_ADDRESS3.java b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/P_ENHANCE_ADDRESS3.java
index ba9f367d72..3610afe20f 100644
--- a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/P_ENHANCE_ADDRESS3.java
+++ b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/P_ENHANCE_ADDRESS3.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle3.generatedclasses.routines;
  */
 public class P_ENHANCE_ADDRESS3 extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = -246894584;
+	private static final long serialVersionUID = 1589518579;
 
 
 	/**
@@ -20,7 +20,7 @@ public class P_ENHANCE_ADDRESS3 extends org.jooq.impl.AbstractRoutine<java.lang.
 	 * Create a new routine call instance
 	 */
 	public P_ENHANCE_ADDRESS3() {
-		super(org.jooq.SQLDialect.ORACLE, "P_ENHANCE_ADDRESS3", org.jooq.test.oracle3.generatedclasses.TEST.TEST);
+		super("P_ENHANCE_ADDRESS3", org.jooq.test.oracle3.generatedclasses.TEST.TEST);
 
 		addInOutParameter(ADDRESS);
 	}
diff --git a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/P_GET_ONE_CURSOR.java b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/P_GET_ONE_CURSOR.java
index 5770cf890b..8cf477577a 100644
--- a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/P_GET_ONE_CURSOR.java
+++ b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/P_GET_ONE_CURSOR.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle3.generatedclasses.routines;
  */
 public class P_GET_ONE_CURSOR extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = -391632469;
+	private static final long serialVersionUID = -866935722;
 
 
 	/**
@@ -30,7 +30,7 @@ public class P_GET_ONE_CURSOR extends org.jooq.impl.AbstractRoutine<java.lang.Vo
 	 * Create a new routine call instance
 	 */
 	public P_GET_ONE_CURSOR() {
-		super(org.jooq.SQLDialect.ORACLE, "P_GET_ONE_CURSOR", org.jooq.test.oracle3.generatedclasses.TEST.TEST);
+		super("P_GET_ONE_CURSOR", org.jooq.test.oracle3.generatedclasses.TEST.TEST);
 
 		addOutParameter(TOTAL);
 		addOutParameter(BOOKS);
diff --git a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/P_GET_TWO_CURSORS.java b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/P_GET_TWO_CURSORS.java
index e62b332c2f..c4f655ff76 100644
--- a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/P_GET_TWO_CURSORS.java
+++ b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/P_GET_TWO_CURSORS.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle3.generatedclasses.routines;
  */
 public class P_GET_TWO_CURSORS extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = 790933274;
+	private static final long serialVersionUID = 461139023;
 
 
 	/**
@@ -25,7 +25,7 @@ public class P_GET_TWO_CURSORS extends org.jooq.impl.AbstractRoutine<java.lang.V
 	 * Create a new routine call instance
 	 */
 	public P_GET_TWO_CURSORS() {
-		super(org.jooq.SQLDialect.ORACLE, "P_GET_TWO_CURSORS", org.jooq.test.oracle3.generatedclasses.TEST.TEST);
+		super("P_GET_TWO_CURSORS", org.jooq.test.oracle3.generatedclasses.TEST.TEST);
 
 		addOutParameter(BOOKS);
 		addOutParameter(AUTHORS);
diff --git a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/P_MANY_PARAMETERS.java b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/P_MANY_PARAMETERS.java
index ed9df9437e..eae6ce691a 100644
--- a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/P_MANY_PARAMETERS.java
+++ b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/P_MANY_PARAMETERS.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle3.generatedclasses.routines;
  */
 public class P_MANY_PARAMETERS extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = -332438051;
+	private static final long serialVersionUID = -1162289838;
 
 
 	/**
@@ -2015,7 +2015,7 @@ public class P_MANY_PARAMETERS extends org.jooq.impl.AbstractRoutine<java.lang.V
 	 * Create a new routine call instance
 	 */
 	public P_MANY_PARAMETERS() {
-		super(org.jooq.SQLDialect.ORACLE, "P_MANY_PARAMETERS", org.jooq.test.oracle3.generatedclasses.TEST.TEST);
+		super("P_MANY_PARAMETERS", org.jooq.test.oracle3.generatedclasses.TEST.TEST);
 
 		addInParameter(F000);
 		addInParameter(F001);
diff --git a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/P_TABLES1.java b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/P_TABLES1.java
index ac42a0090d..5d0688365d 100644
--- a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/P_TABLES1.java
+++ b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/P_TABLES1.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle3.generatedclasses.routines;
  */
 public class P_TABLES1 extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = 1095443123;
+	private static final long serialVersionUID = 1407924702;
 
 
 	/**
@@ -25,7 +25,7 @@ public class P_TABLES1 extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 	 * Create a new routine call instance
 	 */
 	public P_TABLES1() {
-		super(org.jooq.SQLDialect.ORACLE, "P_TABLES1", org.jooq.test.oracle3.generatedclasses.TEST.TEST);
+		super("P_TABLES1", org.jooq.test.oracle3.generatedclasses.TEST.TEST);
 
 		addInParameter(IN_TABLE);
 		addOutParameter(OUT_TABLE);
diff --git a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/P_TABLES2.java b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/P_TABLES2.java
index e619d335f8..b6bcc0b647 100644
--- a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/P_TABLES2.java
+++ b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/P_TABLES2.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle3.generatedclasses.routines;
  */
 public class P_TABLES2 extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = -223556704;
+	private static final long serialVersionUID = 1995515147;
 
 
 	/**
@@ -25,7 +25,7 @@ public class P_TABLES2 extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 	 * Create a new routine call instance
 	 */
 	public P_TABLES2() {
-		super(org.jooq.SQLDialect.ORACLE, "P_TABLES2", org.jooq.test.oracle3.generatedclasses.TEST.TEST);
+		super("P_TABLES2", org.jooq.test.oracle3.generatedclasses.TEST.TEST);
 
 		addInParameter(IN_TABLE);
 		addOutParameter(OUT_TABLE);
diff --git a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/P_TABLES3.java b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/P_TABLES3.java
index 71097062d3..d538af2f4c 100644
--- a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/P_TABLES3.java
+++ b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/P_TABLES3.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle3.generatedclasses.routines;
  */
 public class P_TABLES3 extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = 378099079;
+	private static final long serialVersionUID = -1395555918;
 
 
 	/**
@@ -25,7 +25,7 @@ public class P_TABLES3 extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 	 * Create a new routine call instance
 	 */
 	public P_TABLES3() {
-		super(org.jooq.SQLDialect.ORACLE, "P_TABLES3", org.jooq.test.oracle3.generatedclasses.TEST.TEST);
+		super("P_TABLES3", org.jooq.test.oracle3.generatedclasses.TEST.TEST);
 
 		addInParameter(IN_TABLE);
 		addOutParameter(OUT_TABLE);
diff --git a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/P_TABLES4.java b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/P_TABLES4.java
index 7d59cc0bc7..1e6610c493 100644
--- a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/P_TABLES4.java
+++ b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/P_TABLES4.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle3.generatedclasses.routines;
  */
 public class P_TABLES4 extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = 329973852;
+	private static final long serialVersionUID = 643239687;
 
 
 	/**
@@ -25,7 +25,7 @@ public class P_TABLES4 extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 	 * Create a new routine call instance
 	 */
 	public P_TABLES4() {
-		super(org.jooq.SQLDialect.ORACLE, "P_TABLES4", org.jooq.test.oracle3.generatedclasses.TEST.TEST);
+		super("P_TABLES4", org.jooq.test.oracle3.generatedclasses.TEST.TEST);
 
 		addInParameter(IN_TABLE);
 		addOutParameter(OUT_TABLE);
diff --git a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/P_UNUSED.java b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/P_UNUSED.java
index 20db1135ed..65ce0a3e7f 100644
--- a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/P_UNUSED.java
+++ b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/routines/P_UNUSED.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle3.generatedclasses.routines;
  */
 public class P_UNUSED extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = -1026153375;
+	private static final long serialVersionUID = -19641194;
 
 
 	/**
@@ -30,7 +30,7 @@ public class P_UNUSED extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 	 * Create a new routine call instance
 	 */
 	public P_UNUSED() {
-		super(org.jooq.SQLDialect.ORACLE, "P_UNUSED", org.jooq.test.oracle3.generatedclasses.TEST.TEST);
+		super("P_UNUSED", org.jooq.test.oracle3.generatedclasses.TEST.TEST);
 
 		addInParameter(IN1);
 		addOutParameter(OUT1);
diff --git a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/udt/u_author_type/COUNT_BOOKS.java b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/udt/u_author_type/COUNT_BOOKS.java
index 5c04fa24f7..e98839f6c2 100644
--- a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/udt/u_author_type/COUNT_BOOKS.java
+++ b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/udt/u_author_type/COUNT_BOOKS.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle3.generatedclasses.udt.u_author_type;
  */
 public class COUNT_BOOKS extends org.jooq.impl.AbstractRoutine<java.math.BigDecimal> {
 
-	private static final long serialVersionUID = -210087555;
+	private static final long serialVersionUID = -814743822;
 
 
 	/**
@@ -25,7 +25,7 @@ public class COUNT_BOOKS extends org.jooq.impl.AbstractRoutine<java.math.BigDeci
 	 * Create a new routine call instance
 	 */
 	public COUNT_BOOKS() {
-		super(org.jooq.SQLDialect.ORACLE, "COUNT_BOOKS", org.jooq.test.oracle3.generatedclasses.TEST.TEST, org.jooq.test.oracle3.generatedclasses.udt.U_AUTHOR_TYPE.U_AUTHOR_TYPE, org.jooq.impl.SQLDataType.NUMERIC);
+		super("COUNT_BOOKS", org.jooq.test.oracle3.generatedclasses.TEST.TEST, org.jooq.test.oracle3.generatedclasses.udt.U_AUTHOR_TYPE.U_AUTHOR_TYPE, org.jooq.impl.SQLDataType.NUMERIC);
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(SELF);
diff --git a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/udt/u_author_type/GET_BOOKS.java b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/udt/u_author_type/GET_BOOKS.java
index 52294dea91..aec8834fdd 100644
--- a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/udt/u_author_type/GET_BOOKS.java
+++ b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/udt/u_author_type/GET_BOOKS.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle3.generatedclasses.udt.u_author_type;
  */
 public class GET_BOOKS extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = -2139421852;
+	private static final long serialVersionUID = -241362609;
 
 
 	/**
@@ -35,7 +35,7 @@ public class GET_BOOKS extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 	 * Create a new routine call instance
 	 */
 	public GET_BOOKS() {
-		super(org.jooq.SQLDialect.ORACLE, "GET_BOOKS", org.jooq.test.oracle3.generatedclasses.TEST.TEST, org.jooq.test.oracle3.generatedclasses.udt.U_AUTHOR_TYPE.U_AUTHOR_TYPE);
+		super("GET_BOOKS", org.jooq.test.oracle3.generatedclasses.TEST.TEST, org.jooq.test.oracle3.generatedclasses.udt.U_AUTHOR_TYPE.U_AUTHOR_TYPE);
 
 		addInOutParameter(SELF);
 		addOutParameter(BOOK1);
diff --git a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/udt/u_author_type/LOAD.java b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/udt/u_author_type/LOAD.java
index db03da2454..d92fe4e66c 100644
--- a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/udt/u_author_type/LOAD.java
+++ b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/udt/u_author_type/LOAD.java
@@ -8,7 +8,7 @@ package org.jooq.test.oracle3.generatedclasses.udt.u_author_type;
  */
 public class LOAD extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = -1827335466;
+	private static final long serialVersionUID = 1974052865;
 
 
 	/**
@@ -20,7 +20,7 @@ public class LOAD extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 	 * Create a new routine call instance
 	 */
 	public LOAD() {
-		super(org.jooq.SQLDialect.ORACLE, "LOAD", org.jooq.test.oracle3.generatedclasses.TEST.TEST, org.jooq.test.oracle3.generatedclasses.udt.U_AUTHOR_TYPE.U_AUTHOR_TYPE);
+		super("LOAD", org.jooq.test.oracle3.generatedclasses.TEST.TEST, org.jooq.test.oracle3.generatedclasses.udt.U_AUTHOR_TYPE.U_AUTHOR_TYPE);
 
 		addInOutParameter(SELF);
 	}
diff --git a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/routines/F317.java b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/routines/F317.java
index 2ddf0ef536..c8cf1ae336 100644
--- a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/routines/F317.java
+++ b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/routines/F317.java
@@ -8,7 +8,7 @@ package org.jooq.test.postgres.generatedclasses.routines;
  */
 public class F317 extends org.jooq.impl.AbstractRoutine<java.lang.Integer> {
 
-	private static final long serialVersionUID = 1868257073;
+	private static final long serialVersionUID = 58533431;
 
 
 	/**
@@ -40,7 +40,7 @@ public class F317 extends org.jooq.impl.AbstractRoutine<java.lang.Integer> {
 	 * Create a new routine call instance
 	 */
 	public F317() {
-		super(org.jooq.SQLDialect.POSTGRES, "f317", org.jooq.test.postgres.generatedclasses.Public.PUBLIC, org.jooq.impl.SQLDataType.INTEGER);
+		super("f317", org.jooq.test.postgres.generatedclasses.Public.PUBLIC, org.jooq.impl.SQLDataType.INTEGER);
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(P1);
diff --git a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/routines/FArrays1.java b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/routines/FArrays1.java
index f2f8f4b5bf..25c8d2bcf3 100644
--- a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/routines/FArrays1.java
+++ b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/routines/FArrays1.java
@@ -8,7 +8,7 @@ package org.jooq.test.postgres.generatedclasses.routines;
  */
 public class FArrays1 extends org.jooq.impl.AbstractRoutine<java.lang.Integer[]> {
 
-	private static final long serialVersionUID = -1570076615;
+	private static final long serialVersionUID = -363817677;
 
 
 	/**
@@ -25,7 +25,7 @@ public class FArrays1 extends org.jooq.impl.AbstractRoutine<java.lang.Integer[]>
 	 * Create a new routine call instance
 	 */
 	public FArrays1() {
-		super(org.jooq.SQLDialect.POSTGRES, "f_arrays", org.jooq.test.postgres.generatedclasses.Public.PUBLIC, org.jooq.impl.SQLDataType.INTEGER.getArrayDataType());
+		super("f_arrays", org.jooq.test.postgres.generatedclasses.Public.PUBLIC, org.jooq.impl.SQLDataType.INTEGER.getArrayDataType());
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(IN_ARRAY);
diff --git a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/routines/FArrays2.java b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/routines/FArrays2.java
index e557183eb1..8b4cb91f16 100644
--- a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/routines/FArrays2.java
+++ b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/routines/FArrays2.java
@@ -8,7 +8,7 @@ package org.jooq.test.postgres.generatedclasses.routines;
  */
 public class FArrays2 extends org.jooq.impl.AbstractRoutine<java.lang.Long[]> {
 
-	private static final long serialVersionUID = 732891272;
+	private static final long serialVersionUID = 622049102;
 
 
 	/**
@@ -25,7 +25,7 @@ public class FArrays2 extends org.jooq.impl.AbstractRoutine<java.lang.Long[]> {
 	 * Create a new routine call instance
 	 */
 	public FArrays2() {
-		super(org.jooq.SQLDialect.POSTGRES, "f_arrays", org.jooq.test.postgres.generatedclasses.Public.PUBLIC, org.jooq.impl.SQLDataType.BIGINT.getArrayDataType());
+		super("f_arrays", org.jooq.test.postgres.generatedclasses.Public.PUBLIC, org.jooq.impl.SQLDataType.BIGINT.getArrayDataType());
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(IN_ARRAY);
diff --git a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/routines/FArrays3.java b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/routines/FArrays3.java
index bf15344dbb..fbbfbda68e 100644
--- a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/routines/FArrays3.java
+++ b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/routines/FArrays3.java
@@ -8,7 +8,7 @@ package org.jooq.test.postgres.generatedclasses.routines;
  */
 public class FArrays3 extends org.jooq.impl.AbstractRoutine<java.lang.String[]> {
 
-	private static final long serialVersionUID = 1638128912;
+	private static final long serialVersionUID = 1518899478;
 
 
 	/**
@@ -25,7 +25,7 @@ public class FArrays3 extends org.jooq.impl.AbstractRoutine<java.lang.String[]>
 	 * Create a new routine call instance
 	 */
 	public FArrays3() {
-		super(org.jooq.SQLDialect.POSTGRES, "f_arrays", org.jooq.test.postgres.generatedclasses.Public.PUBLIC, org.jooq.impl.SQLDataType.CLOB.getArrayDataType());
+		super("f_arrays", org.jooq.test.postgres.generatedclasses.Public.PUBLIC, org.jooq.impl.SQLDataType.CLOB.getArrayDataType());
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(IN_ARRAY);
diff --git a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/routines/FAuthorExists.java b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/routines/FAuthorExists.java
index e16c026493..7df4849c59 100644
--- a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/routines/FAuthorExists.java
+++ b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/routines/FAuthorExists.java
@@ -8,7 +8,7 @@ package org.jooq.test.postgres.generatedclasses.routines;
  */
 public class FAuthorExists extends org.jooq.impl.AbstractRoutine<java.lang.Integer> {
 
-	private static final long serialVersionUID = -2002565734;
+	private static final long serialVersionUID = -1556250220;
 
 
 	/**
@@ -25,7 +25,7 @@ public class FAuthorExists extends org.jooq.impl.AbstractRoutine<java.lang.Integ
 	 * Create a new routine call instance
 	 */
 	public FAuthorExists() {
-		super(org.jooq.SQLDialect.POSTGRES, "f_author_exists", org.jooq.test.postgres.generatedclasses.Public.PUBLIC, org.jooq.impl.SQLDataType.INTEGER);
+		super("f_author_exists", org.jooq.test.postgres.generatedclasses.Public.PUBLIC, org.jooq.impl.SQLDataType.INTEGER);
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(AUTHOR_NAME);
diff --git a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/routines/FGetOneCursor.java b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/routines/FGetOneCursor.java
index d6794eb302..261453dc42 100644
--- a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/routines/FGetOneCursor.java
+++ b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/routines/FGetOneCursor.java
@@ -8,7 +8,7 @@ package org.jooq.test.postgres.generatedclasses.routines;
  */
 public class FGetOneCursor extends org.jooq.impl.AbstractRoutine<org.jooq.Result<org.jooq.Record>> {
 
-	private static final long serialVersionUID = 1281451429;
+	private static final long serialVersionUID = 72583979;
 
 
 	/**
@@ -25,7 +25,7 @@ public class FGetOneCursor extends org.jooq.impl.AbstractRoutine<org.jooq.Result
 	 * Create a new routine call instance
 	 */
 	public FGetOneCursor() {
-		super(org.jooq.SQLDialect.POSTGRES, "f_get_one_cursor", org.jooq.test.postgres.generatedclasses.Public.PUBLIC, org.jooq.impl.SQLDataType.RESULT);
+		super("f_get_one_cursor", org.jooq.test.postgres.generatedclasses.Public.PUBLIC, org.jooq.impl.SQLDataType.RESULT);
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(BOOK_IDS);
diff --git a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/routines/FNumber.java b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/routines/FNumber.java
index 7856ab527c..048bacbcc6 100644
--- a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/routines/FNumber.java
+++ b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/routines/FNumber.java
@@ -8,7 +8,7 @@ package org.jooq.test.postgres.generatedclasses.routines;
  */
 public class FNumber extends org.jooq.impl.AbstractRoutine<java.lang.Integer> {
 
-	private static final long serialVersionUID = -666279716;
+	private static final long serialVersionUID = 1070582946;
 
 
 	/**
@@ -25,7 +25,7 @@ public class FNumber extends org.jooq.impl.AbstractRoutine<java.lang.Integer> {
 	 * Create a new routine call instance
 	 */
 	public FNumber() {
-		super(org.jooq.SQLDialect.POSTGRES, "f_number", org.jooq.test.postgres.generatedclasses.Public.PUBLIC, org.jooq.impl.SQLDataType.INTEGER);
+		super("f_number", org.jooq.test.postgres.generatedclasses.Public.PUBLIC, org.jooq.impl.SQLDataType.INTEGER);
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(N);
diff --git a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/routines/FOne.java b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/routines/FOne.java
index 085586da09..6fa6e8548e 100644
--- a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/routines/FOne.java
+++ b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/routines/FOne.java
@@ -8,7 +8,7 @@ package org.jooq.test.postgres.generatedclasses.routines;
  */
 public class FOne extends org.jooq.impl.AbstractRoutine<java.lang.Integer> {
 
-	private static final long serialVersionUID = -639074895;
+	private static final long serialVersionUID = -916302997;
 
 
 	/**
@@ -20,7 +20,7 @@ public class FOne extends org.jooq.impl.AbstractRoutine<java.lang.Integer> {
 	 * Create a new routine call instance
 	 */
 	public FOne() {
-		super(org.jooq.SQLDialect.POSTGRES, "f_one", org.jooq.test.postgres.generatedclasses.Public.PUBLIC, org.jooq.impl.SQLDataType.INTEGER);
+		super("f_one", org.jooq.test.postgres.generatedclasses.Public.PUBLIC, org.jooq.impl.SQLDataType.INTEGER);
 
 		setReturnParameter(RETURN_VALUE);
 	}
diff --git a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/routines/P391.java b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/routines/P391.java
index afecd141c0..e3db060e25 100644
--- a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/routines/P391.java
+++ b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/routines/P391.java
@@ -8,7 +8,7 @@ package org.jooq.test.postgres.generatedclasses.routines;
  */
 public class P391 extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = 823678383;
+	private static final long serialVersionUID = -1289793495;
 
 
 	/**
@@ -45,7 +45,7 @@ public class P391 extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 	 * Create a new routine call instance
 	 */
 	public P391() {
-		super(org.jooq.SQLDialect.POSTGRES, "p391", org.jooq.test.postgres.generatedclasses.Public.PUBLIC);
+		super("p391", org.jooq.test.postgres.generatedclasses.Public.PUBLIC);
 
 		addInParameter(I1);
 		addInOutParameter(IO1);
diff --git a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/routines/PArrays1.java b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/routines/PArrays1.java
index 671f9d6211..f3b08f1806 100644
--- a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/routines/PArrays1.java
+++ b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/routines/PArrays1.java
@@ -8,7 +8,7 @@ package org.jooq.test.postgres.generatedclasses.routines;
  */
 public class PArrays1 extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = 388632146;
+	private static final long serialVersionUID = -755653044;
 
 
 	/**
@@ -25,7 +25,7 @@ public class PArrays1 extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 	 * Create a new routine call instance
 	 */
 	public PArrays1() {
-		super(org.jooq.SQLDialect.POSTGRES, "p_arrays", org.jooq.test.postgres.generatedclasses.Public.PUBLIC);
+		super("p_arrays", org.jooq.test.postgres.generatedclasses.Public.PUBLIC);
 
 		addInParameter(IN_ARRAY);
 		addOutParameter(OUT_ARRAY);
diff --git a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/routines/PArrays2.java b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/routines/PArrays2.java
index df7df8bd21..997a7a877d 100644
--- a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/routines/PArrays2.java
+++ b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/routines/PArrays2.java
@@ -8,7 +8,7 @@ package org.jooq.test.postgres.generatedclasses.routines;
  */
 public class PArrays2 extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = 1703526312;
+	private static final long serialVersionUID = -1740132702;
 
 
 	/**
@@ -25,7 +25,7 @@ public class PArrays2 extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 	 * Create a new routine call instance
 	 */
 	public PArrays2() {
-		super(org.jooq.SQLDialect.POSTGRES, "p_arrays", org.jooq.test.postgres.generatedclasses.Public.PUBLIC);
+		super("p_arrays", org.jooq.test.postgres.generatedclasses.Public.PUBLIC);
 
 		addInParameter(IN_ARRAY);
 		addOutParameter(OUT_ARRAY);
diff --git a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/routines/PArrays3.java b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/routines/PArrays3.java
index 5270c3d04a..39991f921e 100644
--- a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/routines/PArrays3.java
+++ b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/routines/PArrays3.java
@@ -8,7 +8,7 @@ package org.jooq.test.postgres.generatedclasses.routines;
  */
 public class PArrays3 extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = -1082119432;
+	private static final long serialVersionUID = -413851406;
 
 
 	/**
@@ -25,7 +25,7 @@ public class PArrays3 extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 	 * Create a new routine call instance
 	 */
 	public PArrays3() {
-		super(org.jooq.SQLDialect.POSTGRES, "p_arrays", org.jooq.test.postgres.generatedclasses.Public.PUBLIC);
+		super("p_arrays", org.jooq.test.postgres.generatedclasses.Public.PUBLIC);
 
 		addInParameter(IN_ARRAY);
 		addOutParameter(OUT_ARRAY);
diff --git a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/routines/PAuthorExists.java b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/routines/PAuthorExists.java
index ecd2e94279..fd635db602 100644
--- a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/routines/PAuthorExists.java
+++ b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/routines/PAuthorExists.java
@@ -8,7 +8,7 @@ package org.jooq.test.postgres.generatedclasses.routines;
  */
 public class PAuthorExists extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = 1539210254;
+	private static final long serialVersionUID = 1182445140;
 
 
 	/**
@@ -25,7 +25,7 @@ public class PAuthorExists extends org.jooq.impl.AbstractRoutine<java.lang.Void>
 	 * Create a new routine call instance
 	 */
 	public PAuthorExists() {
-		super(org.jooq.SQLDialect.POSTGRES, "p_author_exists", org.jooq.test.postgres.generatedclasses.Public.PUBLIC);
+		super("p_author_exists", org.jooq.test.postgres.generatedclasses.Public.PUBLIC);
 
 		addInParameter(AUTHOR_NAME);
 		addOutParameter(RESULT);
diff --git a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/routines/PCreateAuthor.java b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/routines/PCreateAuthor.java
index f8f5410601..2b69973424 100644
--- a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/routines/PCreateAuthor.java
+++ b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/routines/PCreateAuthor.java
@@ -8,13 +8,13 @@ package org.jooq.test.postgres.generatedclasses.routines;
  */
 public class PCreateAuthor extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = -658021986;
+	private static final long serialVersionUID = 1351289112;
 
 
 	/**
 	 * Create a new routine call instance
 	 */
 	public PCreateAuthor() {
-		super(org.jooq.SQLDialect.POSTGRES, "p_create_author", org.jooq.test.postgres.generatedclasses.Public.PUBLIC);
+		super("p_create_author", org.jooq.test.postgres.generatedclasses.Public.PUBLIC);
 	}
 }
diff --git a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/routines/PCreateAuthorByName.java b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/routines/PCreateAuthorByName.java
index f3e967db1e..02c1e24835 100644
--- a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/routines/PCreateAuthorByName.java
+++ b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/routines/PCreateAuthorByName.java
@@ -8,7 +8,7 @@ package org.jooq.test.postgres.generatedclasses.routines;
  */
 public class PCreateAuthorByName extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = 1917549996;
+	private static final long serialVersionUID = 1515826674;
 
 
 	/**
@@ -25,7 +25,7 @@ public class PCreateAuthorByName extends org.jooq.impl.AbstractRoutine<java.lang
 	 * Create a new routine call instance
 	 */
 	public PCreateAuthorByName() {
-		super(org.jooq.SQLDialect.POSTGRES, "p_create_author_by_name", org.jooq.test.postgres.generatedclasses.Public.PUBLIC);
+		super("p_create_author_by_name", org.jooq.test.postgres.generatedclasses.Public.PUBLIC);
 
 		addInParameter(FIRST_NAME);
 		addInParameter(LAST_NAME);
diff --git a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/routines/PEnhanceAddress1.java b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/routines/PEnhanceAddress1.java
index 71bb6ae28c..d6cfd60566 100644
--- a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/routines/PEnhanceAddress1.java
+++ b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/routines/PEnhanceAddress1.java
@@ -8,7 +8,7 @@ package org.jooq.test.postgres.generatedclasses.routines;
  */
 public class PEnhanceAddress1 extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = -802734501;
+	private static final long serialVersionUID = -1415952171;
 
 
 	/**
@@ -25,7 +25,7 @@ public class PEnhanceAddress1 extends org.jooq.impl.AbstractRoutine<java.lang.Vo
 	 * Create a new routine call instance
 	 */
 	public PEnhanceAddress1() {
-		super(org.jooq.SQLDialect.POSTGRES, "p_enhance_address1", org.jooq.test.postgres.generatedclasses.Public.PUBLIC);
+		super("p_enhance_address1", org.jooq.test.postgres.generatedclasses.Public.PUBLIC);
 
 		addInParameter(ADDRESS);
 		addOutParameter(NO);
diff --git a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/routines/PEnhanceAddress2.java b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/routines/PEnhanceAddress2.java
index ddd3be3e7d..8cbf94cd53 100644
--- a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/routines/PEnhanceAddress2.java
+++ b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/routines/PEnhanceAddress2.java
@@ -8,7 +8,7 @@ package org.jooq.test.postgres.generatedclasses.routines;
  */
 public class PEnhanceAddress2 extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = 624834683;
+	private static final long serialVersionUID = 1801276725;
 
 
 	/**
@@ -20,7 +20,7 @@ public class PEnhanceAddress2 extends org.jooq.impl.AbstractRoutine<java.lang.Vo
 	 * Create a new routine call instance
 	 */
 	public PEnhanceAddress2() {
-		super(org.jooq.SQLDialect.POSTGRES, "p_enhance_address2", org.jooq.test.postgres.generatedclasses.Public.PUBLIC);
+		super("p_enhance_address2", org.jooq.test.postgres.generatedclasses.Public.PUBLIC);
 
 		addOutParameter(ADDRESS);
 	}
diff --git a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/routines/PEnhanceAddress3.java b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/routines/PEnhanceAddress3.java
index d46d354142..259b97d3cf 100644
--- a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/routines/PEnhanceAddress3.java
+++ b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/routines/PEnhanceAddress3.java
@@ -8,7 +8,7 @@ package org.jooq.test.postgres.generatedclasses.routines;
  */
 public class PEnhanceAddress3 extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = -470467720;
+	private static final long serialVersionUID = 1270536882;
 
 
 	/**
@@ -20,7 +20,7 @@ public class PEnhanceAddress3 extends org.jooq.impl.AbstractRoutine<java.lang.Vo
 	 * Create a new routine call instance
 	 */
 	public PEnhanceAddress3() {
-		super(org.jooq.SQLDialect.POSTGRES, "p_enhance_address3", org.jooq.test.postgres.generatedclasses.Public.PUBLIC);
+		super("p_enhance_address3", org.jooq.test.postgres.generatedclasses.Public.PUBLIC);
 
 		addInOutParameter(ADDRESS);
 	}
diff --git a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/routines/PGetOneCursor.java b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/routines/PGetOneCursor.java
index e29084948b..95cfd776a7 100644
--- a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/routines/PGetOneCursor.java
+++ b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/routines/PGetOneCursor.java
@@ -8,7 +8,7 @@ package org.jooq.test.postgres.generatedclasses.routines;
  */
 public class PGetOneCursor extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = -1274699207;
+	private static final long serialVersionUID = -472046541;
 
 
 	/**
@@ -30,7 +30,7 @@ public class PGetOneCursor extends org.jooq.impl.AbstractRoutine<java.lang.Void>
 	 * Create a new routine call instance
 	 */
 	public PGetOneCursor() {
-		super(org.jooq.SQLDialect.POSTGRES, "p_get_one_cursor", org.jooq.test.postgres.generatedclasses.Public.PUBLIC);
+		super("p_get_one_cursor", org.jooq.test.postgres.generatedclasses.Public.PUBLIC);
 
 		addOutParameter(TOTAL);
 		addOutParameter(BOOKS);
diff --git a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/routines/PGetTwoCursors.java b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/routines/PGetTwoCursors.java
index 1fafdd6849..3225127f80 100644
--- a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/routines/PGetTwoCursors.java
+++ b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/routines/PGetTwoCursors.java
@@ -8,7 +8,7 @@ package org.jooq.test.postgres.generatedclasses.routines;
  */
 public class PGetTwoCursors extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = -1426295247;
+	private static final long serialVersionUID = -1548384649;
 
 
 	/**
@@ -25,7 +25,7 @@ public class PGetTwoCursors extends org.jooq.impl.AbstractRoutine<java.lang.Void
 	 * Create a new routine call instance
 	 */
 	public PGetTwoCursors() {
-		super(org.jooq.SQLDialect.POSTGRES, "p_get_two_cursors", org.jooq.test.postgres.generatedclasses.Public.PUBLIC);
+		super("p_get_two_cursors", org.jooq.test.postgres.generatedclasses.Public.PUBLIC);
 
 		addOutParameter(BOOKS);
 		addOutParameter(AUTHORS);
diff --git a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/routines/PTriggers.java b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/routines/PTriggers.java
index 31ad80b12d..8744b3004c 100644
--- a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/routines/PTriggers.java
+++ b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/routines/PTriggers.java
@@ -8,7 +8,7 @@ package org.jooq.test.postgres.generatedclasses.routines;
  */
 public class PTriggers extends org.jooq.impl.AbstractRoutine<java.lang.Object> {
 
-	private static final long serialVersionUID = 1080306299;
+	private static final long serialVersionUID = -1095013055;
 
 
 	/**
@@ -23,7 +23,7 @@ public class PTriggers extends org.jooq.impl.AbstractRoutine<java.lang.Object> {
 	 * Create a new routine call instance
 	 */
 	public PTriggers() {
-		super(org.jooq.SQLDialect.POSTGRES, "p_triggers", org.jooq.test.postgres.generatedclasses.Public.PUBLIC, org.jooq.util.postgres.PostgresDataType.getDefaultDataType("trigger"));
+		super("p_triggers", org.jooq.test.postgres.generatedclasses.Public.PUBLIC, org.jooq.util.postgres.PostgresDataType.getDefaultDataType("trigger"));
 
 		setReturnParameter(RETURN_VALUE);
 	}
diff --git a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/routines/PUnused.java b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/routines/PUnused.java
index 45c88e19ce..5d19f2f84b 100644
--- a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/routines/PUnused.java
+++ b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/routines/PUnused.java
@@ -8,7 +8,7 @@ package org.jooq.test.postgres.generatedclasses.routines;
  */
 public class PUnused extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = 863383961;
+	private static final long serialVersionUID = -83646817;
 
 
 	/**
@@ -30,7 +30,7 @@ public class PUnused extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 	 * Create a new routine call instance
 	 */
 	public PUnused() {
-		super(org.jooq.SQLDialect.POSTGRES, "p_unused", org.jooq.test.postgres.generatedclasses.Public.PUBLIC);
+		super("p_unused", org.jooq.test.postgres.generatedclasses.Public.PUBLIC);
 
 		addInParameter(IN1);
 		addOutParameter(OUT1);
diff --git a/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/Keys.java b/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/Keys.java
index 4326a01baa..4e357e9e5e 100644
--- a/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/Keys.java
+++ b/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/Keys.java
@@ -12,6 +12,7 @@ package org.jooq.test.sqlite.generatedclasses;
 public class Keys extends org.jooq.impl.AbstractKeys {
 
 	// IDENTITY definitions
+	public static final org.jooq.Identity<org.jooq.test.sqlite.generatedclasses.tables.records.TTriggersRecord, java.lang.Integer> IDENTITY_T_TRIGGERS = createIdentity(org.jooq.test.sqlite.generatedclasses.tables.TTriggers.T_TRIGGERS, org.jooq.test.sqlite.generatedclasses.tables.TTriggers.ID_GENERATED);
 
 	// UNIQUE and PRIMARY KEY definitions
 	public static final org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.T_639NumbersTableRecord> PK_T_639_NUMBERS_TABLE_ID = createUniqueKey(org.jooq.test.sqlite.generatedclasses.tables.T_639NumbersTable.T_639_NUMBERS_TABLE, org.jooq.test.sqlite.generatedclasses.tables.T_639NumbersTable.ID);
diff --git a/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/TTriggers.java b/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/TTriggers.java
index 6e9dbef84b..16f80b9294 100644
--- a/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/TTriggers.java
+++ b/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/TTriggers.java
@@ -8,7 +8,7 @@ package org.jooq.test.sqlite.generatedclasses.tables;
  */
 public class TTriggers extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.sqlite.generatedclasses.tables.records.TTriggersRecord> {
 
-	private static final long serialVersionUID = 2045958859;
+	private static final long serialVersionUID = 1377334678;
 
 	/**
 	 * The singleton instance of t_triggers
@@ -52,6 +52,11 @@ public class TTriggers extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.sq
 		super("t_triggers");
 	}
 
+	@Override
+	public org.jooq.Identity<org.jooq.test.sqlite.generatedclasses.tables.records.TTriggersRecord, java.lang.Integer> getIdentity() {
+		return org.jooq.test.sqlite.generatedclasses.Keys.IDENTITY_T_TRIGGERS;
+	}
+
 	@Override
 	public org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.TTriggersRecord> getMainKey() {
 		return org.jooq.test.sqlite.generatedclasses.Keys.PK_T_TRIGGERS_ID_GENERATED;
diff --git a/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/routines/F317.java b/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/routines/F317.java
index c22b84046d..2754046f55 100644
--- a/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/routines/F317.java
+++ b/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/routines/F317.java
@@ -8,7 +8,7 @@ package org.jooq.test.sqlserver.generatedclasses.routines;
  */
 public class F317 extends org.jooq.impl.AbstractRoutine<java.lang.Integer> {
 
-	private static final long serialVersionUID = -894355367;
+	private static final long serialVersionUID = 251552473;
 
 
 	/**
@@ -40,7 +40,7 @@ public class F317 extends org.jooq.impl.AbstractRoutine<java.lang.Integer> {
 	 * Create a new routine call instance
 	 */
 	public F317() {
-		super(org.jooq.SQLDialect.SQLSERVER, "f317", org.jooq.test.sqlserver.generatedclasses.Dbo.DBO, org.jooq.impl.SQLDataType.INTEGER);
+		super("f317", org.jooq.test.sqlserver.generatedclasses.Dbo.DBO, org.jooq.impl.SQLDataType.INTEGER);
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(P1);
diff --git a/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/routines/FAuthorExists.java b/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/routines/FAuthorExists.java
index 08b4891850..761a193f26 100644
--- a/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/routines/FAuthorExists.java
+++ b/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/routines/FAuthorExists.java
@@ -8,7 +8,7 @@ package org.jooq.test.sqlserver.generatedclasses.routines;
  */
 public class FAuthorExists extends org.jooq.impl.AbstractRoutine<java.lang.Integer> {
 
-	private static final long serialVersionUID = -766201074;
+	private static final long serialVersionUID = 1108393792;
 
 
 	/**
@@ -25,7 +25,7 @@ public class FAuthorExists extends org.jooq.impl.AbstractRoutine<java.lang.Integ
 	 * Create a new routine call instance
 	 */
 	public FAuthorExists() {
-		super(org.jooq.SQLDialect.SQLSERVER, "f_author_exists", org.jooq.test.sqlserver.generatedclasses.Dbo.DBO, org.jooq.impl.SQLDataType.INTEGER);
+		super("f_author_exists", org.jooq.test.sqlserver.generatedclasses.Dbo.DBO, org.jooq.impl.SQLDataType.INTEGER);
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(AUTHOR_NAME);
diff --git a/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/routines/FManyParameters.java b/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/routines/FManyParameters.java
index 7d3ba139ec..9131b72a9e 100644
--- a/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/routines/FManyParameters.java
+++ b/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/routines/FManyParameters.java
@@ -8,7 +8,7 @@ package org.jooq.test.sqlserver.generatedclasses.routines;
  */
 public class FManyParameters extends org.jooq.impl.AbstractRoutine<java.lang.Integer> {
 
-	private static final long serialVersionUID = 1981094233;
+	private static final long serialVersionUID = 1865526793;
 
 
 	/**
@@ -2020,7 +2020,7 @@ public class FManyParameters extends org.jooq.impl.AbstractRoutine<java.lang.Int
 	 * Create a new routine call instance
 	 */
 	public FManyParameters() {
-		super(org.jooq.SQLDialect.SQLSERVER, "f_many_parameters", org.jooq.test.sqlserver.generatedclasses.Dbo.DBO, org.jooq.impl.SQLDataType.INTEGER);
+		super("f_many_parameters", org.jooq.test.sqlserver.generatedclasses.Dbo.DBO, org.jooq.impl.SQLDataType.INTEGER);
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(F000);
diff --git a/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/routines/FNumber.java b/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/routines/FNumber.java
index d6f9514109..721f017334 100644
--- a/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/routines/FNumber.java
+++ b/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/routines/FNumber.java
@@ -8,7 +8,7 @@ package org.jooq.test.sqlserver.generatedclasses.routines;
  */
 public class FNumber extends org.jooq.impl.AbstractRoutine<java.lang.Integer> {
 
-	private static final long serialVersionUID = -1241759754;
+	private static final long serialVersionUID = 416070892;
 
 
 	/**
@@ -25,7 +25,7 @@ public class FNumber extends org.jooq.impl.AbstractRoutine<java.lang.Integer> {
 	 * Create a new routine call instance
 	 */
 	public FNumber() {
-		super(org.jooq.SQLDialect.SQLSERVER, "f_number", org.jooq.test.sqlserver.generatedclasses.Dbo.DBO, org.jooq.impl.SQLDataType.INTEGER);
+		super("f_number", org.jooq.test.sqlserver.generatedclasses.Dbo.DBO, org.jooq.impl.SQLDataType.INTEGER);
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(N);
diff --git a/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/routines/FOne.java b/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/routines/FOne.java
index 7c436a9a5e..95230df545 100644
--- a/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/routines/FOne.java
+++ b/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/routines/FOne.java
@@ -8,7 +8,7 @@ package org.jooq.test.sqlserver.generatedclasses.routines;
  */
 public class FOne extends org.jooq.impl.AbstractRoutine<java.lang.Integer> {
 
-	private static final long serialVersionUID = 2000333369;
+	private static final long serialVersionUID = -53440767;
 
 
 	/**
@@ -20,7 +20,7 @@ public class FOne extends org.jooq.impl.AbstractRoutine<java.lang.Integer> {
 	 * Create a new routine call instance
 	 */
 	public FOne() {
-		super(org.jooq.SQLDialect.SQLSERVER, "f_one", org.jooq.test.sqlserver.generatedclasses.Dbo.DBO, org.jooq.impl.SQLDataType.INTEGER);
+		super("f_one", org.jooq.test.sqlserver.generatedclasses.Dbo.DBO, org.jooq.impl.SQLDataType.INTEGER);
 
 		setReturnParameter(RETURN_VALUE);
 	}
diff --git a/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/routines/P391.java b/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/routines/P391.java
index cf6b17ed74..173d3c4cd6 100644
--- a/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/routines/P391.java
+++ b/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/routines/P391.java
@@ -8,7 +8,7 @@ package org.jooq.test.sqlserver.generatedclasses.routines;
  */
 public class P391 extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = 59165256;
+	private static final long serialVersionUID = -1681766898;
 
 
 	/**
@@ -45,7 +45,7 @@ public class P391 extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 	 * Create a new routine call instance
 	 */
 	public P391() {
-		super(org.jooq.SQLDialect.SQLSERVER, "p391", org.jooq.test.sqlserver.generatedclasses.Dbo.DBO);
+		super("p391", org.jooq.test.sqlserver.generatedclasses.Dbo.DBO);
 
 		addInParameter(I1);
 		addInOutParameter(IO1);
diff --git a/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/routines/PAuthorExists.java b/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/routines/PAuthorExists.java
index cfdc263644..183aa06bc4 100644
--- a/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/routines/PAuthorExists.java
+++ b/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/routines/PAuthorExists.java
@@ -8,7 +8,7 @@ package org.jooq.test.sqlserver.generatedclasses.routines;
  */
 public class PAuthorExists extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = 215734183;
+	private static final long serialVersionUID = 1792413373;
 
 
 	/**
@@ -25,7 +25,7 @@ public class PAuthorExists extends org.jooq.impl.AbstractRoutine<java.lang.Void>
 	 * Create a new routine call instance
 	 */
 	public PAuthorExists() {
-		super(org.jooq.SQLDialect.SQLSERVER, "p_author_exists", org.jooq.test.sqlserver.generatedclasses.Dbo.DBO);
+		super("p_author_exists", org.jooq.test.sqlserver.generatedclasses.Dbo.DBO);
 
 		addInParameter(AUTHOR_NAME);
 		addInOutParameter(RESULT);
diff --git a/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/routines/PCreateAuthor.java b/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/routines/PCreateAuthor.java
index b2e29b38fe..c5bef15f9c 100644
--- a/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/routines/PCreateAuthor.java
+++ b/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/routines/PCreateAuthor.java
@@ -8,13 +8,13 @@ package org.jooq.test.sqlserver.generatedclasses.routines;
  */
 public class PCreateAuthor extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = 830511298;
+	private static final long serialVersionUID = -1092533524;
 
 
 	/**
 	 * Create a new routine call instance
 	 */
 	public PCreateAuthor() {
-		super(org.jooq.SQLDialect.SQLSERVER, "p_create_author", org.jooq.test.sqlserver.generatedclasses.Dbo.DBO);
+		super("p_create_author", org.jooq.test.sqlserver.generatedclasses.Dbo.DBO);
 	}
 }
diff --git a/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/routines/PCreateAuthorByName.java b/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/routines/PCreateAuthorByName.java
index 8579a0f35f..610b29678a 100644
--- a/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/routines/PCreateAuthorByName.java
+++ b/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/routines/PCreateAuthorByName.java
@@ -8,7 +8,7 @@ package org.jooq.test.sqlserver.generatedclasses.routines;
  */
 public class PCreateAuthorByName extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = -1674478608;
+	private static final long serialVersionUID = -1034773390;
 
 
 	/**
@@ -25,7 +25,7 @@ public class PCreateAuthorByName extends org.jooq.impl.AbstractRoutine<java.lang
 	 * Create a new routine call instance
 	 */
 	public PCreateAuthorByName() {
-		super(org.jooq.SQLDialect.SQLSERVER, "p_create_author_by_name", org.jooq.test.sqlserver.generatedclasses.Dbo.DBO);
+		super("p_create_author_by_name", org.jooq.test.sqlserver.generatedclasses.Dbo.DBO);
 
 		addInParameter(FIRST_NAME);
 		addInParameter(LAST_NAME);
diff --git a/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/routines/PManyParameters.java b/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/routines/PManyParameters.java
index 116ab5ddef..85b43c0415 100644
--- a/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/routines/PManyParameters.java
+++ b/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/routines/PManyParameters.java
@@ -8,7 +8,7 @@ package org.jooq.test.sqlserver.generatedclasses.routines;
  */
 public class PManyParameters extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = -502179430;
+	private static final long serialVersionUID = -1049231864;
 
 
 	/**
@@ -2015,7 +2015,7 @@ public class PManyParameters extends org.jooq.impl.AbstractRoutine<java.lang.Voi
 	 * Create a new routine call instance
 	 */
 	public PManyParameters() {
-		super(org.jooq.SQLDialect.SQLSERVER, "p_many_parameters", org.jooq.test.sqlserver.generatedclasses.Dbo.DBO);
+		super("p_many_parameters", org.jooq.test.sqlserver.generatedclasses.Dbo.DBO);
 
 		addInParameter(F000);
 		addInParameter(F001);
diff --git a/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/routines/PUnused.java b/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/routines/PUnused.java
index 7287523f7f..40eb96ba51 100644
--- a/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/routines/PUnused.java
+++ b/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/routines/PUnused.java
@@ -8,7 +8,7 @@ package org.jooq.test.sqlserver.generatedclasses.routines;
  */
 public class PUnused extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = 736619290;
+	private static final long serialVersionUID = -252045178;
 
 
 	/**
@@ -30,7 +30,7 @@ public class PUnused extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 	 * Create a new routine call instance
 	 */
 	public PUnused() {
-		super(org.jooq.SQLDialect.SQLSERVER, "p_unused", org.jooq.test.sqlserver.generatedclasses.Dbo.DBO);
+		super("p_unused", org.jooq.test.sqlserver.generatedclasses.Dbo.DBO);
 
 		addInParameter(IN1);
 		addInOutParameter(OUT1);
diff --git a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/routines/F317.java b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/routines/F317.java
index 22433b81b8..7baadfe24f 100644
--- a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/routines/F317.java
+++ b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/routines/F317.java
@@ -8,7 +8,7 @@ package org.jooq.test.sybase.generatedclasses.routines;
  */
 public class F317 extends org.jooq.impl.AbstractRoutine<java.lang.Integer> {
 
-	private static final long serialVersionUID = -1345293919;
+	private static final long serialVersionUID = -1218680091;
 
 
 	/**
@@ -40,7 +40,7 @@ public class F317 extends org.jooq.impl.AbstractRoutine<java.lang.Integer> {
 	 * Create a new routine call instance
 	 */
 	public F317() {
-		super(org.jooq.SQLDialect.SYBASE, "f317", org.jooq.test.sybase.generatedclasses.Dba.DBA, org.jooq.impl.SQLDataType.INTEGER);
+		super("f317", org.jooq.test.sybase.generatedclasses.Dba.DBA, org.jooq.impl.SQLDataType.INTEGER);
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(P1);
diff --git a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/routines/FAuthorExists.java b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/routines/FAuthorExists.java
index ce016b55cf..3b874ba4ce 100644
--- a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/routines/FAuthorExists.java
+++ b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/routines/FAuthorExists.java
@@ -8,7 +8,7 @@ package org.jooq.test.sybase.generatedclasses.routines;
  */
 public class FAuthorExists extends org.jooq.impl.AbstractRoutine<java.lang.Integer> {
 
-	private static final long serialVersionUID = -179531838;
+	private static final long serialVersionUID = 1416783742;
 
 
 	/**
@@ -25,7 +25,7 @@ public class FAuthorExists extends org.jooq.impl.AbstractRoutine<java.lang.Integ
 	 * Create a new routine call instance
 	 */
 	public FAuthorExists() {
-		super(org.jooq.SQLDialect.SYBASE, "f_author_exists", org.jooq.test.sybase.generatedclasses.Dba.DBA, org.jooq.impl.SQLDataType.INTEGER);
+		super("f_author_exists", org.jooq.test.sybase.generatedclasses.Dba.DBA, org.jooq.impl.SQLDataType.INTEGER);
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(AUTHOR_NAME);
diff --git a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/routines/FNumber.java b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/routines/FNumber.java
index 171daf1c64..bf6ae28622 100644
--- a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/routines/FNumber.java
+++ b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/routines/FNumber.java
@@ -8,7 +8,7 @@ package org.jooq.test.sybase.generatedclasses.routines;
  */
 public class FNumber extends org.jooq.impl.AbstractRoutine<java.lang.Integer> {
 
-	private static final long serialVersionUID = -1836635192;
+	private static final long serialVersionUID = -763476852;
 
 
 	/**
@@ -25,7 +25,7 @@ public class FNumber extends org.jooq.impl.AbstractRoutine<java.lang.Integer> {
 	 * Create a new routine call instance
 	 */
 	public FNumber() {
-		super(org.jooq.SQLDialect.SYBASE, "f_number", org.jooq.test.sybase.generatedclasses.Dba.DBA, org.jooq.impl.SQLDataType.INTEGER);
+		super("f_number", org.jooq.test.sybase.generatedclasses.Dba.DBA, org.jooq.impl.SQLDataType.INTEGER);
 
 		setReturnParameter(RETURN_VALUE);
 		addInParameter(N);
diff --git a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/routines/FOne.java b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/routines/FOne.java
index dfd6fc7385..20f66ad3ee 100644
--- a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/routines/FOne.java
+++ b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/routines/FOne.java
@@ -8,7 +8,7 @@ package org.jooq.test.sybase.generatedclasses.routines;
  */
 public class FOne extends org.jooq.impl.AbstractRoutine<java.lang.Integer> {
 
-	private static final long serialVersionUID = 920888601;
+	private static final long serialVersionUID = -1295751083;
 
 
 	/**
@@ -20,7 +20,7 @@ public class FOne extends org.jooq.impl.AbstractRoutine<java.lang.Integer> {
 	 * Create a new routine call instance
 	 */
 	public FOne() {
-		super(org.jooq.SQLDialect.SYBASE, "f_one", org.jooq.test.sybase.generatedclasses.Dba.DBA, org.jooq.impl.SQLDataType.INTEGER);
+		super("f_one", org.jooq.test.sybase.generatedclasses.Dba.DBA, org.jooq.impl.SQLDataType.INTEGER);
 
 		setReturnParameter(RETURN_VALUE);
 	}
diff --git a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/routines/P391.java b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/routines/P391.java
index 2f0785c80a..fbacebcac8 100644
--- a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/routines/P391.java
+++ b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/routines/P391.java
@@ -8,7 +8,7 @@ package org.jooq.test.sybase.generatedclasses.routines;
  */
 public class P391 extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = -42323969;
+	private static final long serialVersionUID = -42558277;
 
 
 	/**
@@ -45,7 +45,7 @@ public class P391 extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 	 * Create a new routine call instance
 	 */
 	public P391() {
-		super(org.jooq.SQLDialect.SYBASE, "p391", org.jooq.test.sybase.generatedclasses.Dba.DBA);
+		super("p391", org.jooq.test.sybase.generatedclasses.Dba.DBA);
 
 		addInParameter(I1);
 		addInOutParameter(IO1);
diff --git a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/routines/PAuthorExists.java b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/routines/PAuthorExists.java
index fcadbe4272..566606b43e 100644
--- a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/routines/PAuthorExists.java
+++ b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/routines/PAuthorExists.java
@@ -8,7 +8,7 @@ package org.jooq.test.sybase.generatedclasses.routines;
  */
 public class PAuthorExists extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = 136701218;
+	private static final long serialVersionUID = 27987174;
 
 
 	/**
@@ -25,7 +25,7 @@ public class PAuthorExists extends org.jooq.impl.AbstractRoutine<java.lang.Void>
 	 * Create a new routine call instance
 	 */
 	public PAuthorExists() {
-		super(org.jooq.SQLDialect.SYBASE, "p_author_exists", org.jooq.test.sybase.generatedclasses.Dba.DBA);
+		super("p_author_exists", org.jooq.test.sybase.generatedclasses.Dba.DBA);
 
 		addInParameter(AUTHOR_NAME);
 		addOutParameter(RESULT);
diff --git a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/routines/PCreateAuthor.java b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/routines/PCreateAuthor.java
index 4bdf106136..58e70b6564 100644
--- a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/routines/PCreateAuthor.java
+++ b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/routines/PCreateAuthor.java
@@ -8,13 +8,13 @@ package org.jooq.test.sybase.generatedclasses.routines;
  */
 public class PCreateAuthor extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = 1664117318;
+	private static final long serialVersionUID = 1936806658;
 
 
 	/**
 	 * Create a new routine call instance
 	 */
 	public PCreateAuthor() {
-		super(org.jooq.SQLDialect.SYBASE, "p_create_author", org.jooq.test.sybase.generatedclasses.Dba.DBA);
+		super("p_create_author", org.jooq.test.sybase.generatedclasses.Dba.DBA);
 	}
 }
diff --git a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/routines/PCreateAuthorByName.java b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/routines/PCreateAuthorByName.java
index 722ffccc4a..e2f65658c6 100644
--- a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/routines/PCreateAuthorByName.java
+++ b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/routines/PCreateAuthorByName.java
@@ -8,7 +8,7 @@ package org.jooq.test.sybase.generatedclasses.routines;
  */
 public class PCreateAuthorByName extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = 706955466;
+	private static final long serialVersionUID = -372932978;
 
 
 	/**
@@ -25,7 +25,7 @@ public class PCreateAuthorByName extends org.jooq.impl.AbstractRoutine<java.lang
 	 * Create a new routine call instance
 	 */
 	public PCreateAuthorByName() {
-		super(org.jooq.SQLDialect.SYBASE, "p_create_author_by_name", org.jooq.test.sybase.generatedclasses.Dba.DBA);
+		super("p_create_author_by_name", org.jooq.test.sybase.generatedclasses.Dba.DBA);
 
 		addInParameter(P_FIRST_NAME);
 		addInParameter(P_LAST_NAME);
diff --git a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/routines/PUnused.java b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/routines/PUnused.java
index 152b2251af..8eef04512c 100644
--- a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/routines/PUnused.java
+++ b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/routines/PUnused.java
@@ -8,7 +8,7 @@ package org.jooq.test.sybase.generatedclasses.routines;
  */
 public class PUnused extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 
-	private static final long serialVersionUID = 539639049;
+	private static final long serialVersionUID = 2000983117;
 
 
 	/**
@@ -30,7 +30,7 @@ public class PUnused extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
 	 * Create a new routine call instance
 	 */
 	public PUnused() {
-		super(org.jooq.SQLDialect.SYBASE, "p_unused", org.jooq.test.sybase.generatedclasses.Dba.DBA);
+		super("p_unused", org.jooq.test.sybase.generatedclasses.Dba.DBA);
 
 		addInParameter(IN1);
 		addOutParameter(OUT1);
diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractRoutine.java b/jOOQ/src/main/java/org/jooq/impl/AbstractRoutine.java
index eb68bfcbac..2ab3f37e8b 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AbstractRoutine.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AbstractRoutine.java
@@ -101,22 +101,58 @@ public abstract class AbstractRoutine<T> extends AbstractSchemaProviderQueryPart
     // Constructors
     // ------------------------------------------------------------------------
 
+    /**
+     * @deprecated - 2.1.0 [#625] - Regenerate your schema
+     */
+    @SuppressWarnings("unused")
+    @Deprecated
     protected AbstractRoutine(SQLDialect dialect, String name, Schema schema) {
-        this(dialect, name, schema, null, null);
+        this(name, schema, null, null);
     }
 
+    /**
+     * @deprecated - 2.1.0 [#625] - Regenerate your schema
+     */
+    @SuppressWarnings("unused")
+    @Deprecated
     protected AbstractRoutine(SQLDialect dialect, String name, Schema schema, Package pkg) {
-        this(dialect, name, schema, pkg, null);
+        this(name, schema, pkg, null);
     }
 
+    /**
+     * @deprecated - 2.1.0 [#625] - Regenerate your schema
+     */
+    @SuppressWarnings("unused")
+    @Deprecated
     protected AbstractRoutine(SQLDialect dialect, String name, Schema schema, DataType<T> type) {
-        this(dialect, name, schema, null, type);
+        this(name, schema, null, type);
     }
 
+    /**
+     * @deprecated - 2.1.0 [#625] - Regenerate your schema
+     */
+    @SuppressWarnings("unused")
+    @Deprecated
     protected AbstractRoutine(SQLDialect dialect, String name, Schema schema, Package pkg, DataType<T> type) {
+        this(name, schema, pkg, type);
+    }
+
+    protected AbstractRoutine(String name, Schema schema) {
+        this(name, schema, null, null);
+    }
+
+    protected AbstractRoutine(String name, Schema schema, Package pkg) {
+        this(name, schema, pkg, null);
+    }
+
+    protected AbstractRoutine(String name, Schema schema, DataType<T> type) {
+        this(name, schema, null, type);
+    }
+
+    protected AbstractRoutine(String name, Schema schema, Package pkg, DataType<T> type) {
         super(name, schema);
 
-        this.attachable = new AttachableImpl(this, Factory.getNewFactory(dialect));
+        this.attachable = new AttachableImpl(this);
         this.parameterIndexes = new HashMap<Parameter<?>, Integer>();
 
         this.pkg = pkg;
@@ -510,25 +546,7 @@ public abstract class AbstractRoutine<T> extends AbstractSchemaProviderQueryPart
 
     public final Field<T> asField() {
         if (function == null) {
-            Field<?>[] array = new Field<?>[getInParameters().size()];
-
-            int i = 0;
-            for (Parameter<?> p : getInParameters()) {
-
-                // Disambiguate overloaded function signatures
-                // TODO [#625] This won't work any longer, when generated
-                // routine artefacts are dialect-independent
-                if (SQLDialect.POSTGRES == attachable.getDialect() && isOverloaded()) {
-                    array[i] = getInValues().get(p).cast(p.getType());
-                }
-                else {
-                    array[i] = getInValues().get(p);
-                }
-
-                i++;
-            }
-
-            function = new RoutineField<T>(getName(), type, array);
+            function = new RoutineField();
         }
 
         return function;
@@ -551,25 +569,41 @@ public abstract class AbstractRoutine<T> extends AbstractSchemaProviderQueryPart
 
     /**
      * The {@link Field} representation of this {@link Routine}
-     *
-     * @author Lukas Eder
      */
-    private class RoutineField<Z> extends AbstractFunction<Z> {
+    private class RoutineField extends AbstractFunction<T> {
 
         /**
          * Generated UID
          */
         private static final long serialVersionUID = -5730297947647252624L;
 
-        RoutineField(String name, DataType<Z> type, Field<?>[] arguments) {
-            super(name, type, arguments);
+        RoutineField() {
+            super(AbstractRoutine.this.getName(),
+                  AbstractRoutine.this.type);
         }
 
         @Override
-        final Field<Z> getFunction0(Configuration configuration) {
+        final Field<T> getFunction0(Configuration configuration) {
             RenderContext local = create(configuration).renderContext();
             toSQLQualifiedName(local);
-            return function(local.render(), getDataType(), getArguments());
+
+            Field<?>[] array = new Field<?>[getInParameters().size()];
+
+            int i = 0;
+            for (Parameter<?> p : getInParameters()) {
+
+                // Disambiguate overloaded function signatures
+                if (SQLDialect.POSTGRES == configuration.getDialect() && isOverloaded()) {
+                    array[i] = getInValues().get(p).cast(p.getType());
+                }
+                else {
+                    array[i] = getInValues().get(p);
+                }
+
+                i++;
+            }
+
+            return function(local.render(), getDataType(), array);
         }
     }
 }