diff --git a/jOOQ-test/src/org/jooq/test/ase/create.sql b/jOOQ-test/src/org/jooq/test/ase/create.sql
index 216ad300ec..b3861b4f72 100644
--- a/jOOQ-test/src/org/jooq/test/ase/create.sql
+++ b/jOOQ-test/src/org/jooq/test/ase/create.sql
@@ -29,6 +29,13 @@ DROP TABLE t_986_1/
 DROP TABLE t_986_2/
 DROP TABLE x_unused/
 DROP TABLE t_639_numbers_table/
+DROP TABLE t_658_ref/
+DROP TABLE t_658_11/
+DROP TABLE t_658_21/
+DROP TABLE t_658_31/
+DROP TABLE t_658_12/
+DROP TABLE t_658_22/
+DROP TABLE t_658_32/
 DROP TABLE t_725_lob_test/
 DROP TABLE t_785/
 DROP TABLE t_booleans/
diff --git a/jOOQ-test/src/org/jooq/test/cubrid/create.sql b/jOOQ-test/src/org/jooq/test/cubrid/create.sql
index 62e8dec16b..828f9b10d9 100644
--- a/jOOQ-test/src/org/jooq/test/cubrid/create.sql
+++ b/jOOQ-test/src/org/jooq/test/cubrid/create.sql
@@ -20,6 +20,13 @@ DROP TABLE t_986_1/
 DROP TABLE t_986_2/
 DROP TABLE x_unused/
 DROP TABLE t_639_numbers_table/
+DROP TABLE t_658_ref/
+DROP TABLE t_658_11/
+DROP TABLE t_658_21/
+DROP TABLE t_658_31/
+DROP TABLE t_658_12/
+DROP TABLE t_658_22/
+DROP TABLE t_658_32/
 DROP TABLE t_725_lob_test/
 DROP TABLE t_785/
 DROP TABLE t_booleans/
diff --git a/jOOQ-test/src/org/jooq/test/db2/create.sql b/jOOQ-test/src/org/jooq/test/db2/create.sql
index 04652bc528..fe57f67b44 100644
--- a/jOOQ-test/src/org/jooq/test/db2/create.sql
+++ b/jOOQ-test/src/org/jooq/test/db2/create.sql
@@ -31,6 +31,13 @@ DROP TABLE t_986_1/
 DROP TABLE t_986_2/
 DROP TABLE x_unused/
 DROP TABLE t_639_numbers_table/
+DROP TABLE t_658_ref/
+DROP TABLE t_658_11/
+DROP TABLE t_658_21/
+DROP TABLE t_658_31/
+DROP TABLE t_658_12/
+DROP TABLE t_658_22/
+DROP TABLE t_658_32/
 DROP TABLE t_725_lob_test/
 DROP TABLE t_785/
 DROP TABLE t_booleans/
diff --git a/jOOQ-test/src/org/jooq/test/derby/create.sql b/jOOQ-test/src/org/jooq/test/derby/create.sql
index 80a320ce99..8f1640c2fb 100644
--- a/jOOQ-test/src/org/jooq/test/derby/create.sql
+++ b/jOOQ-test/src/org/jooq/test/derby/create.sql
@@ -17,6 +17,13 @@ DROP TABLE x_test_case_64_69/
 DROP TABLE x_test_case_85/
 DROP TABLE x_unused/
 DROP TABLE t_639_numbers_table/
+DROP TABLE t_658_ref/
+DROP TABLE t_658_11/
+DROP TABLE t_658_21/
+DROP TABLE t_658_31/
+DROP TABLE t_658_12/
+DROP TABLE t_658_22/
+DROP TABLE t_658_32/
 DROP TABLE t_725_lob_test/
 DROP TABLE t_785/
 DROP TABLE t_booleans/
diff --git a/jOOQ-test/src/org/jooq/test/firebird/create.sql b/jOOQ-test/src/org/jooq/test/firebird/create.sql
index 06612c4328..0a9689b342 100644
--- a/jOOQ-test/src/org/jooq/test/firebird/create.sql
+++ b/jOOQ-test/src/org/jooq/test/firebird/create.sql
@@ -19,6 +19,13 @@ DROP TABLE x_test_case_85/
 DROP TABLE x_test_case_64_69/
 DROP TABLE x_unused/
 DROP TABLE t_639_numbers_table/
+DROP TABLE t_658_ref/
+DROP TABLE t_658_11/
+DROP TABLE t_658_21/
+DROP TABLE t_658_31/
+DROP TABLE t_658_12/
+DROP TABLE t_658_22/
+DROP TABLE t_658_32/
 DROP TABLE t_725_lob_test/
 DROP TABLE t_785/
 DROP TABLE T_937/
diff --git a/jOOQ-test/src/org/jooq/test/h2/create.sql b/jOOQ-test/src/org/jooq/test/h2/create.sql
index f90c1ccc54..958405a0d0 100644
--- a/jOOQ-test/src/org/jooq/test/h2/create.sql
+++ b/jOOQ-test/src/org/jooq/test/h2/create.sql
@@ -31,6 +31,13 @@ DROP TABLE IF EXISTS x_test_case_64_69/
 DROP TABLE IF EXISTS x_test_case_85/
 DROP TABLE IF EXISTS x_unused/
 DROP TABLE IF EXISTS t_639_numbers_table/
+DROP TABLE IF EXISTS t_658_ref/
+DROP TABLE IF EXISTS t_658_11/
+DROP TABLE IF EXISTS t_658_21/
+DROP TABLE IF EXISTS t_658_31/
+DROP TABLE IF EXISTS t_658_12/
+DROP TABLE IF EXISTS t_658_22/
+DROP TABLE IF EXISTS t_658_32/
 DROP TABLE IF EXISTS t_725_lob_test/
 DROP TABLE IF EXISTS t_785/
 DROP TABLE IF EXISTS t_877/
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/create.sql b/jOOQ-test/src/org/jooq/test/hsqldb/create.sql
index edc3f96b12..97606f7c61 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/create.sql
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/create.sql
@@ -38,6 +38,13 @@ DROP TABLE IF EXISTS x_test_case_85/
 DROP TABLE IF EXISTS x_test_case_64_69/
 DROP TABLE IF EXISTS x_unused/
 DROP TABLE IF EXISTS t_639_numbers_table/
+DROP TABLE IF EXISTS t_658_ref/
+DROP TABLE IF EXISTS t_658_11/
+DROP TABLE IF EXISTS t_658_21/
+DROP TABLE IF EXISTS t_658_31/
+DROP TABLE IF EXISTS t_658_12/
+DROP TABLE IF EXISTS t_658_22/
+DROP TABLE IF EXISTS t_658_32/
 DROP TABLE IF EXISTS t_725_lob_test/
 DROP TABLE IF EXISTS t_785/
 DROP TABLE IF EXISTS T_937/
diff --git a/jOOQ-test/src/org/jooq/test/ingres/create.sql b/jOOQ-test/src/org/jooq/test/ingres/create.sql
index 68e79c0668..cf297dc517 100644
--- a/jOOQ-test/src/org/jooq/test/ingres/create.sql
+++ b/jOOQ-test/src/org/jooq/test/ingres/create.sql
@@ -18,6 +18,13 @@ DROP TABLE IF EXISTS x_test_case_64_69/
 DROP TABLE IF EXISTS x_test_case_85/
 DROP TABLE IF EXISTS x_unused/
 DROP TABLE IF EXISTS t_639_numbers_table/
+DROP TABLE IF EXISTS t_658_ref/
+DROP TABLE IF EXISTS t_658_11/
+DROP TABLE IF EXISTS t_658_21/
+DROP TABLE IF EXISTS t_658_31/
+DROP TABLE IF EXISTS t_658_12/
+DROP TABLE IF EXISTS t_658_22/
+DROP TABLE IF EXISTS t_658_32/
 DROP TABLE IF EXISTS t_725_lob_test/
 DROP TABLE IF EXISTS t_785/
 DROP TABLE IF EXISTS t_booleans/
diff --git a/jOOQ-test/src/org/jooq/test/mysql/create.sql b/jOOQ-test/src/org/jooq/test/mysql/create.sql
index 684bbe9c56..fe9f07b59e 100644
--- a/jOOQ-test/src/org/jooq/test/mysql/create.sql
+++ b/jOOQ-test/src/org/jooq/test/mysql/create.sql
@@ -27,6 +27,13 @@ DROP TABLE IF EXISTS x_test_case_64_69/
 DROP TABLE IF EXISTS x_test_case_85/
 DROP TABLE IF EXISTS x_unused/
 DROP TABLE IF EXISTS t_639_numbers_table/
+DROP TABLE IF EXISTS t_658_ref/
+DROP TABLE IF EXISTS t_658_11/
+DROP TABLE IF EXISTS t_658_21/
+DROP TABLE IF EXISTS t_658_31/
+DROP TABLE IF EXISTS t_658_12/
+DROP TABLE IF EXISTS t_658_22/
+DROP TABLE IF EXISTS t_658_32/
 DROP TABLE IF EXISTS t_725_lob_test/
 DROP TABLE IF EXISTS t_785/
 DROP TABLE IF EXISTS t_unsigned/
diff --git a/jOOQ-test/src/org/jooq/test/oracle/create.sql b/jOOQ-test/src/org/jooq/test/oracle/create.sql
index 5c583379f1..c9bfe4d2d8 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/create.sql
+++ b/jOOQ-test/src/org/jooq/test/oracle/create.sql
@@ -32,6 +32,13 @@ DROP TABLE x_test_case_85/
 DROP TABLE x_unused/
 DROP TABLE x_many_fields/
 DROP TABLE t_639_numbers_table/
+DROP TABLE t_658_ref/
+DROP TABLE t_658_11/
+DROP TABLE t_658_21/
+DROP TABLE t_658_31/
+DROP TABLE t_658_12/
+DROP TABLE t_658_22/
+DROP TABLE t_658_32/
 DROP TABLE t_725_lob_test/
 DROP TABLE t_785/
 DROP TABLE t_booleans/
diff --git a/jOOQ-test/src/org/jooq/test/postgres/create.sql b/jOOQ-test/src/org/jooq/test/postgres/create.sql
index d15d89aba8..b60507f697 100644
--- a/jOOQ-test/src/org/jooq/test/postgres/create.sql
+++ b/jOOQ-test/src/org/jooq/test/postgres/create.sql
@@ -46,6 +46,13 @@ DROP TABLE IF EXISTS t_986_1/
 DROP TABLE IF EXISTS t_986_2/
 DROP TABLE IF EXISTS x_unused/
 DROP TABLE IF EXISTS t_639_numbers_table/
+DROP TABLE IF EXISTS t_658_ref/
+DROP TABLE IF EXISTS t_658_11/
+DROP TABLE IF EXISTS t_658_21/
+DROP TABLE IF EXISTS t_658_31/
+DROP TABLE IF EXISTS t_658_12/
+DROP TABLE IF EXISTS t_658_22/
+DROP TABLE IF EXISTS t_658_32/
 DROP TABLE IF EXISTS t_725_lob_test/
 DROP TABLE IF EXISTS t_785/
 DROP TABLE IF EXISTS t_959/
diff --git a/jOOQ-test/src/org/jooq/test/sqlite/create.sql b/jOOQ-test/src/org/jooq/test/sqlite/create.sql
index 6e7eed723e..f5b00b7c02 100644
--- a/jOOQ-test/src/org/jooq/test/sqlite/create.sql
+++ b/jOOQ-test/src/org/jooq/test/sqlite/create.sql
@@ -17,6 +17,13 @@ DROP TABLE IF EXISTS t_986_1/
 DROP TABLE IF EXISTS t_986_2/
 DROP TABLE IF EXISTS x_unused/
 DROP TABLE IF EXISTS t_639_numbers_table/
+DROP TABLE IF EXISTS t_658_ref/
+DROP TABLE IF EXISTS t_658_11/
+DROP TABLE IF EXISTS t_658_21/
+DROP TABLE IF EXISTS t_658_31/
+DROP TABLE IF EXISTS t_658_12/
+DROP TABLE IF EXISTS t_658_22/
+DROP TABLE IF EXISTS t_658_32/
 DROP TABLE IF EXISTS t_725_lob_test/
 DROP TABLE IF EXISTS t_785/
 DROP TABLE IF EXISTS t_booleans/
diff --git a/jOOQ-test/src/org/jooq/test/sqlserver/create.sql b/jOOQ-test/src/org/jooq/test/sqlserver/create.sql
index 10bf791356..d3903bd71b 100644
--- a/jOOQ-test/src/org/jooq/test/sqlserver/create.sql
+++ b/jOOQ-test/src/org/jooq/test/sqlserver/create.sql
@@ -43,6 +43,13 @@ DROP TABLE x_test_case_85/
 DROP TABLE x_unused/
 DROP TABLE x_many_fields/
 DROP TABLE t_639_numbers_table/
+DROP TABLE t_658_ref/
+DROP TABLE t_658_11/
+DROP TABLE t_658_21/
+DROP TABLE t_658_31/
+DROP TABLE t_658_12/
+DROP TABLE t_658_22/
+DROP TABLE t_658_32/
 DROP TABLE t_725_lob_test/
 DROP TABLE t_785/
 DROP TABLE t_booleans/
diff --git a/jOOQ-test/src/org/jooq/test/sybase/create.sql b/jOOQ-test/src/org/jooq/test/sybase/create.sql
index 67b4d67911..983c0cfbc4 100644
--- a/jOOQ-test/src/org/jooq/test/sybase/create.sql
+++ b/jOOQ-test/src/org/jooq/test/sybase/create.sql
@@ -29,6 +29,13 @@ DROP TABLE IF EXISTS t_986_1/
 DROP TABLE IF EXISTS t_986_2/
 DROP TABLE IF EXISTS x_unused/
 DROP TABLE IF EXISTS t_639_numbers_table/
+DROP TABLE IF EXISTS t_658_ref/
+DROP TABLE IF EXISTS t_658_11/
+DROP TABLE IF EXISTS t_658_21/
+DROP TABLE IF EXISTS t_658_31/
+DROP TABLE IF EXISTS t_658_12/
+DROP TABLE IF EXISTS t_658_22/
+DROP TABLE IF EXISTS t_658_32/
 DROP TABLE IF EXISTS t_725_lob_test/
 DROP TABLE IF EXISTS t_785/
 DROP TABLE IF EXISTS t_booleans/