diff --git a/jOOQ-test/src/org/jooq/test/ASETest.java b/jOOQ-test/src/org/jooq/test/ASETest.java
index ab33a9ed26..77d8c01797 100644
--- a/jOOQ-test/src/org/jooq/test/ASETest.java
+++ b/jOOQ-test/src/org/jooq/test/ASETest.java
@@ -134,7 +134,8 @@ xxxxxx xxxxx xxxxxxx xxxxxxx xxxxxxxxxxxxxxxxx
         xxxxxxxxxxxxxxxxxx
         xxxxxxxxxxxxxxxxxxx
         xxxxxxxxxxxxxxxxxxxxxxxx
-        xxxxxxxxxxxx x
+        xxxxxxxxxxxx
+        xxxxxxxxxxxxxx x
 
     xxxxxxxxx
     xxxxxxxxx xxxxxxxxxx xxxxxxxxxxxxxxxx xxxxxxxxx x
@@ -281,6 +282,11 @@ xxxxxx xxxxx xxxxxxx xxxxxxx xxxxxxxxxxxxxxxxx
         xxxxxx xxxxxxxxxxxx
     x
 
+    xxxxxxxxx
+    xxxxxxxxx xxxxxxxxxxxxxxxxxxxx xxxxxx x
+        xxxxxx xxxxx
+    x
+
     xxxxxxxxx
     xxxxxxxxx xxxxxxxxxxxxxxxxxxxx xxxxxxxxxxx x
         xxxxxx xxxxx
diff --git a/jOOQ-test/src/org/jooq/test/AccessTest.java b/jOOQ-test/src/org/jooq/test/AccessTest.java
index 6955feebc3..6df6dbf008 100644
--- a/jOOQ-test/src/org/jooq/test/AccessTest.java
+++ b/jOOQ-test/src/org/jooq/test/AccessTest.java
@@ -131,7 +131,8 @@ xxxxxx xxxxx xxxxxxxxxx xxxxxxx xxxxxxxxxxxxxxxxx
         xxxxxxxxxxxxxxxxxx
         xxxxxxxxxxxxxxxxxxx
         xxxxxxxxxxxxxxxxxxxxxxxx
-        xxxxxxxxxxxx x
+        xxxxxxxxxxxx
+        xxxxxxxxxxxxxx x
 
     xxxxxxxxx
     xxxxxxxxx xxxxxxxxxx xxxxxxxxxxxxxxxx xxxxxxxxx x
@@ -338,6 +339,11 @@ xxxxxx xxxxx xxxxxxxxxx xxxxxxx xxxxxxxxxxxxxxxxx
         xxxxxx xxxxxxxxxxxx
     x
 
+    xxxxxxxxx
+    xxxxxxxxx xxxxxxxxxxxxxxxxxxxx xxxxxx x
+        xxxxxx xxxxx
+    x
+
     xxxxxxxxx
     xxxxxxxxx xxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxx x
         xxxxxx xxxxxxxxxxx
diff --git a/jOOQ-test/src/org/jooq/test/BaseTest.java b/jOOQ-test/src/org/jooq/test/BaseTest.java
index bcddd6ee90..f66e2b0d8f 100644
--- a/jOOQ-test/src/org/jooq/test/BaseTest.java
+++ b/jOOQ-test/src/org/jooq/test/BaseTest.java
@@ -153,7 +153,8 @@ public abstract class BaseTest<
     // Various tables related to trac ticket numbers
     T725 extends UpdatableRecord<T725>,
     T639 extends UpdatableRecord<T639>,
-    T785 extends TableRecord<T785>> {
+    T785 extends TableRecord<T785>,
+    CASE extends UpdatableRecord<CASE>> {
 
     protected static final List<Short>     BOOK_IDS_SHORT     = Arrays.asList((short) 1, (short) 2, (short) 3, (short) 4);
     protected static final List<Integer>   BOOK_IDS           = Arrays.asList(1, 2, 3, 4);
@@ -169,9 +170,9 @@ public abstract class BaseTest<
 
     protected static final JooqLogger      log                = JooqLogger.getLogger(jOOQAbstractTest.class);
 
-    protected final jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785> delegate;
+    protected final jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785, CASE> delegate;
 
-    protected BaseTest(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785> delegate) {
+    protected BaseTest(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785, CASE> delegate) {
         this.delegate = delegate;
     }
 
@@ -259,6 +260,30 @@ public abstract class BaseTest<
         return delegate.T785_VALUE();
     }
 
+    protected Table<CASE> CASE() {
+        return delegate.CASE();
+    }
+
+    protected TableField<CASE, Integer> CASE_ID() {
+        return delegate.CASE_ID();
+    }
+
+    protected TableField<CASE, Integer> CASE_insensitive() {
+        return delegate.CASE_insensitive();
+    }
+
+    protected TableField<CASE, Integer> CASE_UPPER() {
+        return delegate.CASE_UPPER();
+    }
+
+    protected TableField<CASE, Integer> CASE_lower() {
+        return delegate.CASE_lower();
+    }
+
+    protected TableField<CASE, Integer> CASE_Mixed() {
+        return delegate.CASE_Mixed();
+    }
+
     protected Table<U> TUnsigned() {
         return delegate.TUnsigned();
     }
diff --git a/jOOQ-test/src/org/jooq/test/CUBRIDTest.java b/jOOQ-test/src/org/jooq/test/CUBRIDTest.java
index 32f5eab06f..bf8d827da1 100644
--- a/jOOQ-test/src/org/jooq/test/CUBRIDTest.java
+++ b/jOOQ-test/src/org/jooq/test/CUBRIDTest.java
@@ -142,7 +142,8 @@ public class CUBRIDTest extends jOOQAbstractTest<
         TIdentityPkRecord,
         T_725LobTestRecord,
         T_639NumbersTableRecord,
-        T_785Record> {
+        T_785Record,
+        XUnusedRecord> {
 
     @Override
     protected DSLContext create0(Settings settings) {
@@ -279,6 +280,11 @@ public class CUBRIDTest extends jOOQAbstractTest<
         return T_785.VALUE;
     }
 
+    @Override
+    protected Table<XUnusedRecord> CASE() {
+        return null;
+    }
+
     @Override
     protected Table<TUnsignedRecord> TUnsigned() {
         return T_UNSIGNED;
diff --git a/jOOQ-test/src/org/jooq/test/DB2Test.java b/jOOQ-test/src/org/jooq/test/DB2Test.java
index 4fd9a649f3..61a85527ca 100644
--- a/jOOQ-test/src/org/jooq/test/DB2Test.java
+++ b/jOOQ-test/src/org/jooq/test/DB2Test.java
@@ -139,7 +139,8 @@ xxxxxx xxxxx xxxxxxx xxxxxxx xxxxxxxxxxxxxxxxx
         xxxxxxxxxxxxxxxxxx
         xxxxxxxxxxxxxxxxxxx
         xxxxxxxxxxxxxxxxxxxxxxxx
-        xxxxxxxxxxxx x
+        xxxxxxxxxxxx
+        xxxxxxxxxxxxxx x
 
     xxxxxxxxx
     xxxxxxxxx xxxxxxxxxx xxxxxxxxxxxxxxxx xxxxxxxxx x
@@ -351,6 +352,11 @@ xxxxxx xxxxx xxxxxxx xxxxxxx xxxxxxxxxxxxxxxxx
         xxxxxx xxxxxxxxxxxx
     x
 
+    xxxxxxxxx
+    xxxxxxxxx xxxxxxxxxxxxxxxxxxxx xxxxxx x
+        xxxxxx xxxxx
+    x
+
     xxxxxxxxx
     xxxxxxxxx xxxxxxxxxxxxxxxxxxxx xxxxxxxxxxx x
         xxxxxx xxxxx
diff --git a/jOOQ-test/src/org/jooq/test/DerbyTest.java b/jOOQ-test/src/org/jooq/test/DerbyTest.java
index 497b049cd1..c25e000d09 100644
--- a/jOOQ-test/src/org/jooq/test/DerbyTest.java
+++ b/jOOQ-test/src/org/jooq/test/DerbyTest.java
@@ -137,7 +137,8 @@ public class DerbyTest extends jOOQAbstractTest<
         TIdentityPkRecord,
         T_725LobTestRecord,
         T_639NumbersTableRecord,
-        T_785Record> {
+        T_785Record,
+        XUnusedRecord> {
 
 	@Override
     protected DSLContext create0(Settings settings) {
@@ -354,6 +355,11 @@ public class DerbyTest extends jOOQAbstractTest<
         return T_785.VALUE;
     }
 
+    @Override
+    protected Table<XUnusedRecord> CASE() {
+        return null;
+    }
+
     @Override
     protected Table<TUnsignedRecord> TUnsigned() {
         return T_UNSIGNED;
diff --git a/jOOQ-test/src/org/jooq/test/FirebirdTest.java b/jOOQ-test/src/org/jooq/test/FirebirdTest.java
index da254d6d7b..c39873e4c5 100644
--- a/jOOQ-test/src/org/jooq/test/FirebirdTest.java
+++ b/jOOQ-test/src/org/jooq/test/FirebirdTest.java
@@ -128,7 +128,8 @@ public class FirebirdTest extends jOOQAbstractTest<
         XUnusedRecord,
         T_725LobTestRecord,
         T_639NumbersTableRecord,
-        T_785Record> {
+        T_785Record,
+        XUnusedRecord> {
 
     @Override
     protected DSLContext create0(Settings settings) {
@@ -335,6 +336,11 @@ public class FirebirdTest extends jOOQAbstractTest<
         return T_785.VALUE;
     }
 
+    @Override
+    protected Table<XUnusedRecord> CASE() {
+        return null;
+    }
+
     @Override
     protected Table<TUnsignedRecord> TUnsigned() {
         return T_UNSIGNED;
diff --git a/jOOQ-test/src/org/jooq/test/H2Test.java b/jOOQ-test/src/org/jooq/test/H2Test.java
index 881209a6a8..6b8f386bfd 100644
--- a/jOOQ-test/src/org/jooq/test/H2Test.java
+++ b/jOOQ-test/src/org/jooq/test/H2Test.java
@@ -165,7 +165,8 @@ public class H2Test extends jOOQAbstractTest<
         TIdentityPkRecord,
         T_725LobTestRecord,
         T_639NumbersTableRecord,
-        T_785Record> {
+        T_785Record,
+        XUnusedRecord> {
 
     @Override
     protected DSLContext create0(Settings settings) {
@@ -387,6 +388,11 @@ public class H2Test extends jOOQAbstractTest<
         return T_785.VALUE;
     }
 
+    @Override
+    protected Table<XUnusedRecord> CASE() {
+        return null;
+    }
+
     @Override
     protected Table<TUnsignedRecord> TUnsigned() {
         return T_UNSIGNED;
diff --git a/jOOQ-test/src/org/jooq/test/HSQLDBTest.java b/jOOQ-test/src/org/jooq/test/HSQLDBTest.java
index 7925ad86a9..a48ee8f0f6 100644
--- a/jOOQ-test/src/org/jooq/test/HSQLDBTest.java
+++ b/jOOQ-test/src/org/jooq/test/HSQLDBTest.java
@@ -41,6 +41,7 @@
 
 package org.jooq.test;
 
+import static org.jooq.test.hsqldb.generatedclasses.Tables.T_2845_CASE_SENSITIVITY;
 import static org.jooq.test.hsqldb.generatedclasses.Tables.T_639_NUMBERS_TABLE;
 import static org.jooq.test.hsqldb.generatedclasses.Tables.T_725_LOB_TEST;
 import static org.jooq.test.hsqldb.generatedclasses.Tables.T_785;
@@ -101,6 +102,7 @@ import org.jooq.test.hsqldb.generatedclasses.tables.records.TIdentityPkRecord;
 import org.jooq.test.hsqldb.generatedclasses.tables.records.TIdentityRecord;
 import org.jooq.test.hsqldb.generatedclasses.tables.records.TTriggersRecord;
 import org.jooq.test.hsqldb.generatedclasses.tables.records.TUnsignedRecord;
+import org.jooq.test.hsqldb.generatedclasses.tables.records.T_2845CaseSensitivityRecord;
 import org.jooq.test.hsqldb.generatedclasses.tables.records.T_639NumbersTableRecord;
 import org.jooq.test.hsqldb.generatedclasses.tables.records.T_725LobTestRecord;
 import org.jooq.test.hsqldb.generatedclasses.tables.records.T_785Record;
@@ -134,7 +136,8 @@ public class HSQLDBTest extends jOOQAbstractTest<
         TIdentityPkRecord,
         T_725LobTestRecord,
         T_639NumbersTableRecord,
-        T_785Record> {
+        T_785Record,
+        T_2845CaseSensitivityRecord> {
 
 	@Override
     protected DSLContext create0(Settings settings) {
@@ -351,6 +354,11 @@ public class HSQLDBTest extends jOOQAbstractTest<
         return T_785.VALUE;
     }
 
+    @Override
+    protected Table<T_2845CaseSensitivityRecord> CASE() {
+        return T_2845_CASE_SENSITIVITY;
+    }
+
     @Override
     protected Table<TUnsignedRecord> TUnsigned() {
         return T_UNSIGNED;
diff --git a/jOOQ-test/src/org/jooq/test/HSQLDBTest2.java b/jOOQ-test/src/org/jooq/test/HSQLDBTest2.java
index ce7847f5a1..ce6b1b3766 100644
--- a/jOOQ-test/src/org/jooq/test/HSQLDBTest2.java
+++ b/jOOQ-test/src/org/jooq/test/HSQLDBTest2.java
@@ -131,7 +131,8 @@ public class HSQLDBTest2 extends jOOQAbstractTest<
         XUnusedRecord,
         T_725LobTestRecord,
         T_639NumbersTableRecord,
-        T_785Record> {
+        T_785Record,
+        XUnusedRecord> {
 
 	@Override
     protected DSLContext create0(Settings settings) {
@@ -353,6 +354,11 @@ public class HSQLDBTest2 extends jOOQAbstractTest<
         return T_785.VALUE;
     }
 
+    @Override
+    protected Table<XUnusedRecord> CASE() {
+        return null;
+    }
+
     @Override
     protected Table<XUnusedRecord> TUnsigned() {
         return null;
diff --git a/jOOQ-test/src/org/jooq/test/IngresTest.java b/jOOQ-test/src/org/jooq/test/IngresTest.java
index ce0c9f2b86..1329deea1b 100644
--- a/jOOQ-test/src/org/jooq/test/IngresTest.java
+++ b/jOOQ-test/src/org/jooq/test/IngresTest.java
@@ -139,7 +139,8 @@ xxxxxx xxxxx xxxxxxxxxx xxxxxxx xxxxxxxxxxxxxxxxx
         xxxxxxxxxxxxxxxxxx
         xxxxxxxxxxxxxxxxxxx
         xxxxxxxxxxxxxxxxxxxxxxxx
-        xxxxxxxxxxxx x
+        xxxxxxxxxxxx
+        xxxxxxxxxxxxxx x
 
     xxxxxxxxx
     xxxxxxxxx xxxxxxxxxx xxxxxxxxxxxxxxxx xxxxxxxxx x
@@ -346,6 +347,11 @@ xxxxxx xxxxx xxxxxxxxxx xxxxxxx xxxxxxxxxxxxxxxxx
         xxxxxx xxxxxxxxxxxx
     x
 
+    xxxxxxxxx
+    xxxxxxxxx xxxxxxxxxxxxxxxxxxxx xxxxxx x
+        xxxxxx xxxxx
+    x
+
     xxxxxxxxx
     xxxxxxxxx xxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxx x
         xxxxxx xxxxxxxxxxx
diff --git a/jOOQ-test/src/org/jooq/test/MariaDBTest.java b/jOOQ-test/src/org/jooq/test/MariaDBTest.java
index d04a04c08f..e8cdf4f24a 100644
--- a/jOOQ-test/src/org/jooq/test/MariaDBTest.java
+++ b/jOOQ-test/src/org/jooq/test/MariaDBTest.java
@@ -160,7 +160,8 @@ public class MariaDBTest extends jOOQAbstractTest<
         TIdentityPkRecord,
         T_725LobTestRecord,
         T_639NumbersTableRecord,
-        T_785Record> {
+        T_785Record,
+        XUnusedRecord> {
 
     @Override
     protected DSLContext create0(Settings settings) {
@@ -372,6 +373,11 @@ public class MariaDBTest extends jOOQAbstractTest<
         return T_785.VALUE;
     }
 
+    @Override
+    protected Table<XUnusedRecord> CASE() {
+        return null;
+    }
+
     @Override
     protected Table<TUnsignedRecord> TUnsigned() {
         return T_UNSIGNED;
diff --git a/jOOQ-test/src/org/jooq/test/MySQLTest.java b/jOOQ-test/src/org/jooq/test/MySQLTest.java
index f012c4ccae..72bcaec104 100644
--- a/jOOQ-test/src/org/jooq/test/MySQLTest.java
+++ b/jOOQ-test/src/org/jooq/test/MySQLTest.java
@@ -161,7 +161,8 @@ public class MySQLTest extends jOOQAbstractTest<
         TIdentityPkRecord,
         T_725LobTestRecord,
         T_639NumbersTableRecord,
-        T_785Record> {
+        T_785Record,
+        XUnusedRecord> {
 
     @Override
     protected DSLContext create0(Settings settings) {
@@ -373,6 +374,11 @@ public class MySQLTest extends jOOQAbstractTest<
         return T_785.VALUE;
     }
 
+    @Override
+    protected Table<XUnusedRecord> CASE() {
+        return null;
+    }
+
     @Override
     protected Table<TUnsignedRecord> TUnsigned() {
         return T_UNSIGNED;
diff --git a/jOOQ-test/src/org/jooq/test/MySQLTestSchemaRewrite.java b/jOOQ-test/src/org/jooq/test/MySQLTestSchemaRewrite.java
index 97ed9e6cd4..93db9f3fa7 100644
--- a/jOOQ-test/src/org/jooq/test/MySQLTestSchemaRewrite.java
+++ b/jOOQ-test/src/org/jooq/test/MySQLTestSchemaRewrite.java
@@ -129,7 +129,8 @@ public class MySQLTestSchemaRewrite extends jOOQAbstractTest<
         TIdentityPkRecord,
         T_725LobTestRecord,
         T_639NumbersTableRecord,
-        T_785Record> {
+        T_785Record,
+        XUnusedRecord> {
 
     @Override
     protected String getSchemaSuffix() {
@@ -341,6 +342,11 @@ public class MySQLTestSchemaRewrite extends jOOQAbstractTest<
         return T_785.VALUE;
     }
 
+    @Override
+    protected Table<XUnusedRecord> CASE() {
+        return null;
+    }
+
     @Override
     protected Table<TUnsignedRecord> TUnsigned() {
         return T_UNSIGNED;
diff --git a/jOOQ-test/src/org/jooq/test/OracleTest.java b/jOOQ-test/src/org/jooq/test/OracleTest.java
index 4d677a1716..2c4c55cf35 100644
--- a/jOOQ-test/src/org/jooq/test/OracleTest.java
+++ b/jOOQ-test/src/org/jooq/test/OracleTest.java
@@ -212,7 +212,8 @@ xxxxxx xxxxx xxxxxxxxxx xxxxxxx xxxxxxxxxxxxxxxxx
         xxxxxxxxxxxxxx
         xxxxxxxxxxxxxxxxxxx
         xxxxxxxxxxxxxxxxxxxxxxxx
-        xxxxxxxxxxxx x
+        xxxxxxxxxxxx
+        xxxxxxxxxxxxxx x
 
     xxxxxx x
         xx xxxxxx xxxxxxxxxx xx xxxxxxxxx xxxxxxxxx xxxx xx xxxxxxxxx xxxx xxxx
@@ -374,6 +375,11 @@ xxxxxx xxxxx xxxxxxxxxx xxxxxxx xxxxxxxxxxxxxxxxx
         xxxxxx xxxxxxxxxxxx
     x
 
+    xxxxxxxxx
+    xxxxxxxxx xxxxxxxxxxxxxxxxxxxx xxxxxx x
+        xxxxxx xxxxx
+    x
+
     xxxxxxxxx
     xxxxxxxxx xxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxx x
         xxxxxx xxxxxxxxxxx
diff --git a/jOOQ-test/src/org/jooq/test/PostgresTest.java b/jOOQ-test/src/org/jooq/test/PostgresTest.java
index e4a54530fe..94417e9d80 100644
--- a/jOOQ-test/src/org/jooq/test/PostgresTest.java
+++ b/jOOQ-test/src/org/jooq/test/PostgresTest.java
@@ -168,7 +168,8 @@ public class PostgresTest extends jOOQAbstractTest<
         TIdentityPkRecord,
         T_725LobTestRecord,
         T_639NumbersTableRecord,
-        T_785Record> {
+        T_785Record,
+        XUnusedRecord> {
 
     @Override
     protected DSLContext create0(Settings settings) {
@@ -305,6 +306,11 @@ public class PostgresTest extends jOOQAbstractTest<
         return T_785.VALUE;
     }
 
+    @Override
+    protected Table<XUnusedRecord> CASE() {
+        return null;
+    }
+
     @Override
     protected Table<TUnsignedRecord> TUnsigned() {
         return T_UNSIGNED;
diff --git a/jOOQ-test/src/org/jooq/test/SQLServerTest.java b/jOOQ-test/src/org/jooq/test/SQLServerTest.java
index 313990390f..b7a951cf69 100644
--- a/jOOQ-test/src/org/jooq/test/SQLServerTest.java
+++ b/jOOQ-test/src/org/jooq/test/SQLServerTest.java
@@ -136,7 +136,8 @@ xxxxxx xxxxx xxxxxxxxxxxxx xxxxxxx xxxxxxxxxxxxxxxxx
         xxxxxxxxxxxxxxxxxx
         xxxxxxxxxxxxxxxxxxx
         xxxxxxxxxxxxxxxxxxxxxxxx
-        xxxxxxxxxxxx x
+        xxxxxxxxxxxx
+        xxxxxxxxxxxxxx x
 
     xxxxxxxxx
     xxxxxxxxx xxxxxxxxxx xxxxxxxxxxxxxxxx xxxxxxxxx x
@@ -343,6 +344,11 @@ xxxxxx xxxxx xxxxxxxxxxxxx xxxxxxx xxxxxxxxxxxxxxxxx
         xxxxxx xxxxxxxxxxxx
     x
 
+    xxxxxxxxx
+    xxxxxxxxx xxxxxxxxxxxxxxxxxxxx xxxxxx x
+        xxxxxx xxxxx
+    x
+
     xxxxxxxxx
     xxxxxxxxx xxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxx x
         xxxxxx xxxxxxxxxxx
diff --git a/jOOQ-test/src/org/jooq/test/SQLiteTest.java b/jOOQ-test/src/org/jooq/test/SQLiteTest.java
index e3b1720046..5020e78815 100644
--- a/jOOQ-test/src/org/jooq/test/SQLiteTest.java
+++ b/jOOQ-test/src/org/jooq/test/SQLiteTest.java
@@ -131,7 +131,8 @@ public class SQLiteTest extends jOOQAbstractTest<
         XUnusedRecord,
         T_725LobTestRecord,
         T_639NumbersTableRecord,
-        T_785Record> {
+        T_785Record,
+        XUnusedRecord> {
 
     @Override
     protected DSLContext create0(Settings settings) {
@@ -338,6 +339,11 @@ public class SQLiteTest extends jOOQAbstractTest<
         return T_785.VALUE;
     }
 
+    @Override
+    protected Table<XUnusedRecord> CASE() {
+        return null;
+    }
+
     @Override
     protected Table<TUnsignedRecord> TUnsigned() {
         return T_UNSIGNED;
diff --git a/jOOQ-test/src/org/jooq/test/SybaseTest.java b/jOOQ-test/src/org/jooq/test/SybaseTest.java
index 4ea2fd06b8..ec6099e69f 100644
--- a/jOOQ-test/src/org/jooq/test/SybaseTest.java
+++ b/jOOQ-test/src/org/jooq/test/SybaseTest.java
@@ -137,7 +137,8 @@ xxxxxx xxxxx xxxxxxxxxx xxxxxxx xxxxxxxxxxxxxxxxx
         xxxxxxxxxxxxxxxxxx
         xxxxxxxxxxxxxxxxxxx
         xxxxxxxxxxxxxxxxxxxxxxxx
-        xxxxxxxxxxxx x
+        xxxxxxxxxxxx
+        xxxxxxxxxxxxxx x
 
     xxxxxxxxx
     xxxxxxxxx xxxxxxxxxx xxxxxxxxxxxxxxxx xxxxxxxxx x
@@ -275,6 +276,11 @@ xxxxxx xxxxx xxxxxxxxxx xxxxxxx xxxxxxxxxxxxxxxxx
         xxxxxx xxxxxxxxxxxx
     x
 
+    xxxxxxxxx
+    xxxxxxxxx xxxxxxxxxxxxxxxxxxxx xxxxxx x
+        xxxxxx xxxxx
+    x
+
     xxxxxxxxx
     xxxxxxxxx xxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxx x
         xxxxxx xxxxxxxxxxx
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/AbstractLoaderTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/AbstractLoaderTests.java
index 5981fb9916..f3a50e9aaa 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/AbstractLoaderTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/AbstractLoaderTests.java
@@ -87,10 +87,11 @@ public abstract class AbstractLoaderTests<
     IPK  extends UpdatableRecord<IPK>,
     T725 extends UpdatableRecord<T725>,
     T639 extends UpdatableRecord<T639>,
-    T785 extends TableRecord<T785>>
-extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785> {
+    T785 extends TableRecord<T785>,
+    CASE extends UpdatableRecord<CASE>>
+extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785, CASE> {
 
-    public AbstractLoaderTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785> delegate) {
+    public AbstractLoaderTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785, CASE> delegate) {
         super(delegate);
     }
 
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/AggregateWindowFunctionTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/AggregateWindowFunctionTests.java
index de67d93a4f..53c8025ed7 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/AggregateWindowFunctionTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/AggregateWindowFunctionTests.java
@@ -147,10 +147,11 @@ public class AggregateWindowFunctionTests<
     IPK  extends UpdatableRecord<IPK>,
     T725 extends UpdatableRecord<T725>,
     T639 extends UpdatableRecord<T639>,
-    T785 extends TableRecord<T785>>
-extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785> {
+    T785 extends TableRecord<T785>,
+    CASE extends UpdatableRecord<CASE>>
+extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785, CASE> {
 
-    public AggregateWindowFunctionTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785> delegate) {
+    public AggregateWindowFunctionTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785, CASE> delegate) {
         super(delegate);
     }
 
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/AliasTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/AliasTests.java
index 4119053815..1f84a363d3 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/AliasTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/AliasTests.java
@@ -87,10 +87,11 @@ public class AliasTests<
     IPK  extends UpdatableRecord<IPK>,
     T725 extends UpdatableRecord<T725>,
     T639 extends UpdatableRecord<T639>,
-    T785 extends TableRecord<T785>>
-extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785> {
+    T785 extends TableRecord<T785>,
+    CASE extends UpdatableRecord<CASE>>
+extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785, CASE> {
 
-    public AliasTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785> delegate) {
+    public AliasTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785, CASE> delegate) {
         super(delegate);
     }
 
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/BatchTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/BatchTests.java
index e082ca9b59..1099ead051 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/BatchTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/BatchTests.java
@@ -90,10 +90,11 @@ public class BatchTests<
     IPK  extends UpdatableRecord<IPK>,
     T725 extends UpdatableRecord<T725>,
     T639 extends UpdatableRecord<T639>,
-    T785 extends TableRecord<T785>>
-extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785> {
+    T785 extends TableRecord<T785>,
+    CASE extends UpdatableRecord<CASE>>
+extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785, CASE> {
 
-    public BatchTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785> delegate) {
+    public BatchTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785, CASE> delegate) {
         super(delegate);
     }
 
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/BenchmarkTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/BenchmarkTests.java
index 08d0169334..ff09eb0dc9 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/BenchmarkTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/BenchmarkTests.java
@@ -83,8 +83,9 @@ public class BenchmarkTests<
     IPK  extends UpdatableRecord<IPK>,
     T725 extends UpdatableRecord<T725>,
     T639 extends UpdatableRecord<T639>,
-    T785 extends TableRecord<T785>>
-extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785> {
+    T785 extends TableRecord<T785>,
+    CASE extends UpdatableRecord<CASE>>
+extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785, CASE> {
 
     private static final int    REPETITIONS_NEW_RECORD   = 1000000;
     private static final int    REPETITIONS_RECORD_INTO  = 2000;
@@ -92,7 +93,7 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
     private static final int    REPETITIONS_SELECT       = 100;
     private static final String RANDOM                   = "" + new Random().nextLong();
 
-    public BenchmarkTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785> delegate) {
+    public BenchmarkTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785, CASE> delegate) {
         super(delegate);
     }
 
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/CRUDTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/CRUDTests.java
index d08b404972..37c6e64b32 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/CRUDTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/CRUDTests.java
@@ -99,10 +99,11 @@ public class CRUDTests<
     IPK  extends UpdatableRecord<IPK>,
     T725 extends UpdatableRecord<T725>,
     T639 extends UpdatableRecord<T639>,
-    T785 extends TableRecord<T785>>
-extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785> {
+    T785 extends TableRecord<T785>,
+    CASE extends UpdatableRecord<CASE>>
+extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785, CASE> {
 
-    public CRUDTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785> delegate) {
+    public CRUDTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785, CASE> delegate) {
         super(delegate);
     }
 
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/CsvLoaderTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/CsvLoaderTests.java
index 21a62a2e65..72e1cbe33e 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/CsvLoaderTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/CsvLoaderTests.java
@@ -74,10 +74,11 @@ public class CsvLoaderTests<
     IPK extends UpdatableRecord<IPK>,
     T725 extends UpdatableRecord<T725>,
     T639 extends UpdatableRecord<T639>,
-    T785 extends TableRecord<T785>>
-extends AbstractLoaderTests<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785> {
+    T785 extends TableRecord<T785>,
+    CASE extends UpdatableRecord<CASE>>
+extends AbstractLoaderTests<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785, CASE> {
 
-    public CsvLoaderTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785> delegate) {
+    public CsvLoaderTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785, CASE> delegate) {
         super(delegate);
     }
 
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/DaoTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/DaoTests.java
index bed281420e..be9c1f96b7 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/DaoTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/DaoTests.java
@@ -83,10 +83,11 @@ public class DaoTests<
     IPK  extends UpdatableRecord<IPK>,
     T725 extends UpdatableRecord<T725>,
     T639 extends UpdatableRecord<T639>,
-    T785 extends TableRecord<T785>>
-extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785> {
+    T785 extends TableRecord<T785>,
+    CASE extends UpdatableRecord<CASE>>
+extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785, CASE> {
 
-    public DaoTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785> delegate) {
+    public DaoTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785, CASE> delegate) {
         super(delegate);
     }
 
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/DataTypeTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/DataTypeTests.java
index 8ab450a391..ee3b4bc3f8 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/DataTypeTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/DataTypeTests.java
@@ -136,10 +136,11 @@ public class DataTypeTests<
     IPK  extends UpdatableRecord<IPK>,
     T725 extends UpdatableRecord<T725>,
     T639 extends UpdatableRecord<T639>,
-    T785 extends TableRecord<T785>>
-extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785> {
+    T785 extends TableRecord<T785>,
+    CASE extends UpdatableRecord<CASE>>
+extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785, CASE> {
 
-    public DataTypeTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785> delegate) {
+    public DataTypeTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785, CASE> delegate) {
         super(delegate);
     }
 
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/EnumTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/EnumTests.java
index f6f012cde3..d13fba59e1 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/EnumTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/EnumTests.java
@@ -86,10 +86,11 @@ public class EnumTests<
     IPK  extends UpdatableRecord<IPK>,
     T725 extends UpdatableRecord<T725>,
     T639 extends UpdatableRecord<T639>,
-    T785 extends TableRecord<T785>>
-extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785> {
+    T785 extends TableRecord<T785>,
+    CASE extends UpdatableRecord<CASE>>
+extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785, CASE> {
 
-    public EnumTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785> delegate) {
+    public EnumTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785, CASE> delegate) {
         super(delegate);
     }
 
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/ExecuteListenerTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/ExecuteListenerTests.java
index 00d72ecf2a..0a1315487f 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/ExecuteListenerTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/ExecuteListenerTests.java
@@ -99,10 +99,11 @@ public class ExecuteListenerTests<
     IPK  extends UpdatableRecord<IPK>,
     T725 extends UpdatableRecord<T725>,
     T639 extends UpdatableRecord<T639>,
-    T785 extends TableRecord<T785>>
-extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785> {
+    T785 extends TableRecord<T785>,
+    CASE extends UpdatableRecord<CASE>>
+extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785, CASE> {
 
-    public ExecuteListenerTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785> delegate) {
+    public ExecuteListenerTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785, CASE> delegate) {
         super(delegate);
     }
 
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/ExoticTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/ExoticTests.java
index b8cdf68ad7..fc89bf3e20 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/ExoticTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/ExoticTests.java
@@ -104,10 +104,11 @@ public class ExoticTests<
     IPK  extends UpdatableRecord<IPK>,
     T725 extends UpdatableRecord<T725>,
     T639 extends UpdatableRecord<T639>,
-    T785 extends TableRecord<T785>>
-extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785> {
+    T785 extends TableRecord<T785>,
+    CASE extends UpdatableRecord<CASE>>
+extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785, CASE> {
 
-    public ExoticTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785> delegate) {
+    public ExoticTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785, CASE> delegate) {
         super(delegate);
     }
 
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/FetchTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/FetchTests.java
index 84c38c0f1c..254169da46 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/FetchTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/FetchTests.java
@@ -142,10 +142,11 @@ public class FetchTests<
     IPK  extends UpdatableRecord<IPK>,
     T725 extends UpdatableRecord<T725>,
     T639 extends UpdatableRecord<T639>,
-    T785 extends TableRecord<T785>>
-extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785> {
+    T785 extends TableRecord<T785>,
+    CASE extends UpdatableRecord<CASE>>
+extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785, CASE> {
 
-    public FetchTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785> delegate) {
+    public FetchTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785, CASE> delegate) {
         super(delegate);
     }
 
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/FormatTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/FormatTests.java
index 79f95da9a8..78ad345753 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/FormatTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/FormatTests.java
@@ -100,10 +100,11 @@ public class FormatTests<
     IPK  extends UpdatableRecord<IPK>,
     T725 extends UpdatableRecord<T725>,
     T639 extends UpdatableRecord<T639>,
-    T785 extends TableRecord<T785>>
-extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785> {
+    T785 extends TableRecord<T785>,
+    CASE extends UpdatableRecord<CASE>>
+extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785, CASE> {
 
-    public FormatTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785> delegate) {
+    public FormatTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785, CASE> delegate) {
         super(delegate);
     }
 
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/FunctionTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/FunctionTests.java
index 130be7b314..5283a023d6 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/FunctionTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/FunctionTests.java
@@ -174,10 +174,11 @@ public class FunctionTests<
     IPK  extends UpdatableRecord<IPK>,
     T725 extends UpdatableRecord<T725>,
     T639 extends UpdatableRecord<T639>,
-    T785 extends TableRecord<T785>>
-extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785> {
+    T785 extends TableRecord<T785>,
+    CASE extends UpdatableRecord<CASE>>
+extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785, CASE> {
 
-    public FunctionTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785> delegate) {
+    public FunctionTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785, CASE> delegate) {
         super(delegate);
     }
 
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/GeneralTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/GeneralTests.java
index c025afad24..17988d9ffe 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/GeneralTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/GeneralTests.java
@@ -109,10 +109,11 @@ public class GeneralTests<
     IPK  extends UpdatableRecord<IPK>,
     T725 extends UpdatableRecord<T725>,
     T639 extends UpdatableRecord<T639>,
-    T785 extends TableRecord<T785>>
-extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785> {
+    T785 extends TableRecord<T785>,
+    CASE extends UpdatableRecord<CASE>>
+extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785, CASE> {
 
-    public GeneralTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785> delegate) {
+    public GeneralTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785, CASE> delegate) {
         super(delegate);
     }
 
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/GroupByTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/GroupByTests.java
index 14461b493f..334baf0a27 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/GroupByTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/GroupByTests.java
@@ -93,10 +93,11 @@ public class GroupByTests<
     IPK  extends UpdatableRecord<IPK>,
     T725 extends UpdatableRecord<T725>,
     T639 extends UpdatableRecord<T639>,
-    T785 extends TableRecord<T785>>
-extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785> {
+    T785 extends TableRecord<T785>,
+    CASE extends UpdatableRecord<CASE>>
+extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785, CASE> {
 
-    public GroupByTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785> delegate) {
+    public GroupByTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785, CASE> delegate) {
         super(delegate);
     }
 
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/InsertUpdateTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/InsertUpdateTests.java
index 96163f40c4..6dc25329a4 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/InsertUpdateTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/InsertUpdateTests.java
@@ -92,6 +92,8 @@ import org.jooq.TableField;
 import org.jooq.TableRecord;
 import org.jooq.UpdatableRecord;
 import org.jooq.UpdateQuery;
+import org.jooq.conf.RenderNameStyle;
+import org.jooq.conf.Settings;
 import org.jooq.test.BaseTest;
 import org.jooq.test.jOOQAbstractTest;
 
@@ -116,10 +118,11 @@ public class InsertUpdateTests<
     IPK  extends UpdatableRecord<IPK>,
     T725 extends UpdatableRecord<T725>,
     T639 extends UpdatableRecord<T639>,
-    T785 extends TableRecord<T785>>
-extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785> {
+    T785 extends TableRecord<T785>,
+    CASE extends UpdatableRecord<CASE>>
+extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785, CASE> {
 
-    public InsertUpdateTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785> delegate) {
+    public InsertUpdateTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785, CASE> delegate) {
         super(delegate);
     }
 
@@ -722,6 +725,45 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
         return create().selectFrom(TTriggers()).fetchOne(TTriggers_ID_GENERATED());
     }
 
+    @Test
+    public void testInsertReturningWithCaseSensitiveColumns() throws Exception {
+        if (CASE() == null) {
+            log.info("SKIPPING", "INSERT RETURNING tests with case sensitive columns");
+            return;
+        }
+
+        jOOQAbstractTest.reset = false;
+
+        CASE c =
+        create().insertInto(CASE(), CASE_ID(), CASE_insensitive(), CASE_lower(), CASE_Mixed(), CASE_UPPER())
+                .values(1, 2, 3, 4, 5)
+                .returning()
+                .fetchOne();
+
+        assertEquals(1, (int) c.getValue(CASE_ID()));
+        assertEquals(2, (int) c.getValue(CASE_insensitive()));
+        assertEquals(3, (int) c.getValue(CASE_lower()));
+        assertEquals(4, (int) c.getValue(CASE_Mixed()));
+        assertEquals(5, (int) c.getValue(CASE_UPPER()));
+    }
+
+    @Test
+    public void testInsertReturningWithRenderNameStyleAS_IS() throws Exception {
+        jOOQAbstractTest.reset = false;
+
+        // [#2845] Some SQL dialects use Connection.prepareStatement(String, String[])
+        // in case of which column names should be transformed according to RenderNameStyle
+        A author =
+        create(new Settings().withRenderNameStyle(RenderNameStyle.AS_IS))
+                .insertInto(TAuthor(), TAuthor_ID(), TAuthor_LAST_NAME())
+                .values(5, "XMF")
+                .returning()
+                .fetchOne();
+
+        assertEquals(5, (int) author.getValue(TAuthor_ID()));
+        assertEquals("XMF", author.getValue(TAuthor_LAST_NAME()));
+    }
+
     @Test
     public void testInsertReturningWithPlainSQL() throws Exception {
         if (TTriggers() == null) {
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/JDBCTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/JDBCTests.java
index 52e8d03d0a..fd92e8ccf3 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/JDBCTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/JDBCTests.java
@@ -78,10 +78,11 @@ public class JDBCTests<
     IPK  extends UpdatableRecord<IPK>,
     T725 extends UpdatableRecord<T725>,
     T639 extends UpdatableRecord<T639>,
-    T785 extends TableRecord<T785>>
-extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785> {
+    T785 extends TableRecord<T785>,
+    CASE extends UpdatableRecord<CASE>>
+extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785, CASE> {
 
-    public JDBCTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785> delegate) {
+    public JDBCTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785, CASE> delegate) {
         super(delegate);
     }
 
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/JoinTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/JoinTests.java
index d4bfd2ef81..9b9c74b944 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/JoinTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/JoinTests.java
@@ -101,10 +101,11 @@ public class JoinTests<
     IPK  extends UpdatableRecord<IPK>,
     T725 extends UpdatableRecord<T725>,
     T639 extends UpdatableRecord<T639>,
-    T785 extends TableRecord<T785>>
-extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785> {
+    T785 extends TableRecord<T785>,
+    CASE extends UpdatableRecord<CASE>>
+extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785, CASE> {
 
-    public JoinTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785> delegate) {
+    public JoinTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785, CASE> delegate) {
         super(delegate);
     }
 
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/JsonLoaderTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/JsonLoaderTests.java
index e1909358bb..a1846f902e 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/JsonLoaderTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/JsonLoaderTests.java
@@ -72,10 +72,11 @@ public class JsonLoaderTests<
     IPK extends UpdatableRecord<IPK>,
     T725 extends UpdatableRecord<T725>,
     T639 extends UpdatableRecord<T639>,
-    T785 extends TableRecord<T785>>
-extends AbstractLoaderTests<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785> {
+    T785 extends TableRecord<T785>,
+    CASE extends UpdatableRecord<CASE>>
+extends AbstractLoaderTests<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785, CASE> {
 
-    public JsonLoaderTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785> delegate) {
+    public JsonLoaderTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785, CASE> delegate) {
         super(delegate);
     }
 
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/MetaDataTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/MetaDataTests.java
index c3a2a76f86..19c0da25fd 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/MetaDataTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/MetaDataTests.java
@@ -97,10 +97,11 @@ public class MetaDataTests<
     IPK  extends UpdatableRecord<IPK>,
     T725 extends UpdatableRecord<T725>,
     T639 extends UpdatableRecord<T639>,
-    T785 extends TableRecord<T785>>
-extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785> {
+    T785 extends TableRecord<T785>,
+    CASE extends UpdatableRecord<CASE>>
+extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785, CASE> {
 
-    public MetaDataTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785> delegate) {
+    public MetaDataTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785, CASE> delegate) {
         super(delegate);
     }
 
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/OrderByTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/OrderByTests.java
index 6ad60e525e..a436b1a755 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/OrderByTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/OrderByTests.java
@@ -97,10 +97,11 @@ public class OrderByTests<
     IPK  extends UpdatableRecord<IPK>,
     T725 extends UpdatableRecord<T725>,
     T639 extends UpdatableRecord<T639>,
-    T785 extends TableRecord<T785>>
-extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785> {
+    T785 extends TableRecord<T785>,
+    CASE extends UpdatableRecord<CASE>>
+extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785, CASE> {
 
-    public OrderByTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785> delegate) {
+    public OrderByTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785, CASE> delegate) {
         super(delegate);
     }
 
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/PlainSQLTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/PlainSQLTests.java
index d8e5de038b..7cab45a528 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/PlainSQLTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/PlainSQLTests.java
@@ -111,10 +111,11 @@ public class PlainSQLTests<
     IPK  extends UpdatableRecord<IPK>,
     T725 extends UpdatableRecord<T725>,
     T639 extends UpdatableRecord<T639>,
-    T785 extends TableRecord<T785>>
-extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785> {
+    T785 extends TableRecord<T785>,
+    CASE extends UpdatableRecord<CASE>>
+extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785, CASE> {
 
-    public PlainSQLTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785> delegate) {
+    public PlainSQLTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785, CASE> delegate) {
         super(delegate);
     }
 
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/PredicateTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/PredicateTests.java
index 4ce57ca818..3ae47860c7 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/PredicateTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/PredicateTests.java
@@ -109,10 +109,11 @@ public class PredicateTests<
     IPK  extends UpdatableRecord<IPK>,
     T725 extends UpdatableRecord<T725>,
     T639 extends UpdatableRecord<T639>,
-    T785 extends TableRecord<T785>>
-extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785> {
+    T785 extends TableRecord<T785>,
+    CASE extends UpdatableRecord<CASE>>
+extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785, CASE> {
 
-    public PredicateTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785> delegate) {
+    public PredicateTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785, CASE> delegate) {
         super(delegate);
     }
 
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/RecordListenerTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/RecordListenerTests.java
index 48cadc1c92..c10ead0722 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/RecordListenerTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/RecordListenerTests.java
@@ -79,10 +79,11 @@ public class RecordListenerTests<
     IPK  extends UpdatableRecord<IPK>,
     T725 extends UpdatableRecord<T725>,
     T639 extends UpdatableRecord<T639>,
-    T785 extends TableRecord<T785>>
-extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785> {
+    T785 extends TableRecord<T785>,
+    CASE extends UpdatableRecord<CASE>>
+extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785, CASE> {
 
-    public RecordListenerTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785> delegate) {
+    public RecordListenerTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785, CASE> delegate) {
         super(delegate);
     }
 
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/RecordTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/RecordTests.java
index f069ad37cb..c59338d4fc 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/RecordTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/RecordTests.java
@@ -77,10 +77,11 @@ public class RecordTests<
     IPK  extends UpdatableRecord<IPK>,
     T725 extends UpdatableRecord<T725>,
     T639 extends UpdatableRecord<T639>,
-    T785 extends TableRecord<T785>>
-extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785> {
+    T785 extends TableRecord<T785>,
+    CASE extends UpdatableRecord<CASE>>
+extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785, CASE> {
 
-    public RecordTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785> delegate) {
+    public RecordTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785, CASE> delegate) {
         super(delegate);
     }
 
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/ReferentialTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/ReferentialTests.java
index 61c4d22ddd..2304209fbd 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/ReferentialTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/ReferentialTests.java
@@ -77,10 +77,11 @@ public class ReferentialTests<
     IPK  extends UpdatableRecord<IPK>,
     T725 extends UpdatableRecord<T725>,
     T639 extends UpdatableRecord<T639>,
-    T785 extends TableRecord<T785>>
-extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785> {
+    T785 extends TableRecord<T785>,
+    CASE extends UpdatableRecord<CASE>>
+extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785, CASE> {
 
-    public ReferentialTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785> delegate) {
+    public ReferentialTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785, CASE> delegate) {
         super(delegate);
     }
 
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/RenderAndBindTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/RenderAndBindTests.java
index c3ca1ee106..68d5f47cd0 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/RenderAndBindTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/RenderAndBindTests.java
@@ -103,10 +103,11 @@ public class RenderAndBindTests<
     IPK  extends UpdatableRecord<IPK>,
     T725 extends UpdatableRecord<T725>,
     T639 extends UpdatableRecord<T639>,
-    T785 extends TableRecord<T785>>
-extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785> {
+    T785 extends TableRecord<T785>,
+    CASE extends UpdatableRecord<CASE>>
+extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785, CASE> {
 
-    public RenderAndBindTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785> delegate) {
+    public RenderAndBindTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785, CASE> delegate) {
         super(delegate);
     }
 
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/ResultSetTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/ResultSetTests.java
index 4dd79e9bbc..91452a0c98 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/ResultSetTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/ResultSetTests.java
@@ -82,10 +82,11 @@ public class ResultSetTests<
     IPK  extends UpdatableRecord<IPK>,
     T725 extends UpdatableRecord<T725>,
     T639 extends UpdatableRecord<T639>,
-    T785 extends TableRecord<T785>>
-extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785> {
+    T785 extends TableRecord<T785>,
+    CASE extends UpdatableRecord<CASE>>
+extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785, CASE> {
 
-    public ResultSetTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785> delegate) {
+    public ResultSetTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785, CASE> delegate) {
         super(delegate);
     }
 
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/ResultTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/ResultTests.java
index f9bdc56ddc..2e447b6258 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/ResultTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/ResultTests.java
@@ -78,10 +78,11 @@ public class ResultTests<
     IPK  extends UpdatableRecord<IPK>,
     T725 extends UpdatableRecord<T725>,
     T639 extends UpdatableRecord<T639>,
-    T785 extends TableRecord<T785>>
-extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785> {
+    T785 extends TableRecord<T785>,
+    CASE extends UpdatableRecord<CASE>>
+extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785, CASE> {
 
-    public ResultTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785> delegate) {
+    public ResultTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785, CASE> delegate) {
         super(delegate);
     }
 
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/RoutineAndUDTTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/RoutineAndUDTTests.java
index 5a9c97fcb7..4782f916d2 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/RoutineAndUDTTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/RoutineAndUDTTests.java
@@ -97,10 +97,11 @@ public class RoutineAndUDTTests<
     IPK  extends UpdatableRecord<IPK>,
     T725 extends UpdatableRecord<T725>,
     T639 extends UpdatableRecord<T639>,
-    T785 extends TableRecord<T785>>
-extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785> {
+    T785 extends TableRecord<T785>,
+    CASE extends UpdatableRecord<CASE>>
+extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785, CASE> {
 
-    public RoutineAndUDTTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785> delegate) {
+    public RoutineAndUDTTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785, CASE> delegate) {
         super(delegate);
     }
     @Test
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/RowValueExpressionTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/RowValueExpressionTests.java
index 49ab16463f..ae399854a1 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/RowValueExpressionTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/RowValueExpressionTests.java
@@ -99,10 +99,11 @@ public class RowValueExpressionTests<
     IPK  extends UpdatableRecord<IPK>,
     T725 extends UpdatableRecord<T725>,
     T639 extends UpdatableRecord<T639>,
-    T785 extends TableRecord<T785>>
-extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785> {
+    T785 extends TableRecord<T785>,
+    CASE extends UpdatableRecord<CASE>>
+extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785, CASE> {
 
-    public RowValueExpressionTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785> delegate) {
+    public RowValueExpressionTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785, CASE> delegate) {
         super(delegate);
     }
 
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/SchemaAndMappingTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/SchemaAndMappingTests.java
index be23178fdd..021fbc36a1 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/SchemaAndMappingTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/SchemaAndMappingTests.java
@@ -89,10 +89,11 @@ public class SchemaAndMappingTests<
     IPK  extends UpdatableRecord<IPK>,
     T725 extends UpdatableRecord<T725>,
     T639 extends UpdatableRecord<T639>,
-    T785 extends TableRecord<T785>>
-extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785> {
+    T785 extends TableRecord<T785>,
+    CASE extends UpdatableRecord<CASE>>
+extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785, CASE> {
 
-    public SchemaAndMappingTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785> delegate) {
+    public SchemaAndMappingTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785, CASE> delegate) {
         super(delegate);
     }
 
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/SelectTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/SelectTests.java
index 980897fbcf..e23094feec 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/SelectTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/SelectTests.java
@@ -94,10 +94,11 @@ public class SelectTests<
     IPK  extends UpdatableRecord<IPK>,
     T725 extends UpdatableRecord<T725>,
     T639 extends UpdatableRecord<T639>,
-    T785 extends TableRecord<T785>>
-extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785> {
+    T785 extends TableRecord<T785>,
+    CASE extends UpdatableRecord<CASE>>
+extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785, CASE> {
 
-    public SelectTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785> delegate) {
+    public SelectTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785, CASE> delegate) {
         super(delegate);
     }
 
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/StatementTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/StatementTests.java
index 3d29156f9b..7387cdaafa 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/StatementTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/StatementTests.java
@@ -95,10 +95,11 @@ public class StatementTests<
     IPK  extends UpdatableRecord<IPK>,
     T725 extends UpdatableRecord<T725>,
     T639 extends UpdatableRecord<T639>,
-    T785 extends TableRecord<T785>>
-extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785> {
+    T785 extends TableRecord<T785>,
+    CASE extends UpdatableRecord<CASE>>
+extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785, CASE> {
 
-    public StatementTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785> delegate) {
+    public StatementTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785, CASE> delegate) {
         super(delegate);
     }
 
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/TableFunctionTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/TableFunctionTests.java
index 748f4dc925..befbd1bc81 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/TableFunctionTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/TableFunctionTests.java
@@ -84,10 +84,11 @@ public class TableFunctionTests<
     IPK  extends UpdatableRecord<IPK>,
     T725 extends UpdatableRecord<T725>,
     T639 extends UpdatableRecord<T639>,
-    T785 extends TableRecord<T785>>
-extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785> {
+    T785 extends TableRecord<T785>,
+    CASE extends UpdatableRecord<CASE>>
+extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785, CASE> {
 
-    public TableFunctionTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785> delegate) {
+    public TableFunctionTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785, CASE> delegate) {
         super(delegate);
     }
 
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/Template.java b/jOOQ-test/src/org/jooq/test/_/testcases/Template.java
index 7d692cf34d..d9863bf5a9 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/Template.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/Template.java
@@ -70,10 +70,11 @@ public class Template<
     IPK  extends UpdatableRecord<IPK>,
     T725 extends UpdatableRecord<T725>,
     T639 extends UpdatableRecord<T639>,
-    T785 extends TableRecord<T785>>
-extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785> {
+    T785 extends TableRecord<T785>,
+    CASE extends UpdatableRecord<CASE>>
+extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785, CASE> {
 
-    public Template(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785> delegate) {
+    public Template(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785, CASE> delegate) {
         super(delegate);
     }
 }
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/ThreadSafetyTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/ThreadSafetyTests.java
index 70c77e9970..737d1e8845 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/ThreadSafetyTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/ThreadSafetyTests.java
@@ -75,10 +75,11 @@ public class ThreadSafetyTests<
     IPK  extends UpdatableRecord<IPK>,
     T725 extends UpdatableRecord<T725>,
     T639 extends UpdatableRecord<T639>,
-    T785 extends TableRecord<T785>>
-extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785> {
+    T785 extends TableRecord<T785>,
+    CASE extends UpdatableRecord<CASE>>
+extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785, CASE> {
 
-    public ThreadSafetyTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785> delegate) {
+    public ThreadSafetyTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785, CASE> delegate) {
         super(delegate);
     }
 
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/TruncateTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/TruncateTests.java
index ec11726e6b..31728ad97d 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/TruncateTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/TruncateTests.java
@@ -81,10 +81,11 @@ public class TruncateTests<
     IPK  extends UpdatableRecord<IPK>,
     T725 extends UpdatableRecord<T725>,
     T639 extends UpdatableRecord<T639>,
-    T785 extends TableRecord<T785>>
-extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785> {
+    T785 extends TableRecord<T785>,
+    CASE extends UpdatableRecord<CASE>>
+extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785, CASE> {
 
-    public TruncateTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785> delegate) {
+    public TruncateTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785, CASE> delegate) {
         super(delegate);
     }
 
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/ValuesConstructorTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/ValuesConstructorTests.java
index 271f0e0232..4a4e6dfbaf 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/ValuesConstructorTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/ValuesConstructorTests.java
@@ -77,10 +77,11 @@ public class ValuesConstructorTests<
     IPK  extends UpdatableRecord<IPK>,
     T725 extends UpdatableRecord<T725>,
     T639 extends UpdatableRecord<T639>,
-    T785 extends TableRecord<T785>>
-extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785> {
+    T785 extends TableRecord<T785>,
+    CASE extends UpdatableRecord<CASE>>
+extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785, CASE> {
 
-    public ValuesConstructorTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785> delegate) {
+    public ValuesConstructorTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785, CASE> delegate) {
         super(delegate);
     }
 
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/VisitListenerTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/VisitListenerTests.java
index d9e0295e17..3fbca215ba 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/VisitListenerTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/VisitListenerTests.java
@@ -115,10 +115,11 @@ public class VisitListenerTests<
     IPK  extends UpdatableRecord<IPK>,
     T725 extends UpdatableRecord<T725>,
     T639 extends UpdatableRecord<T639>,
-    T785 extends TableRecord<T785>>
-extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785> {
+    T785 extends TableRecord<T785>,
+    CASE extends UpdatableRecord<CASE>>
+extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785, CASE> {
 
-    public VisitListenerTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785> delegate) {
+    public VisitListenerTests(jOOQAbstractTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T725, T639, T785, CASE> delegate) {
         super(delegate);
     }
 
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/create.sql b/jOOQ-test/src/org/jooq/test/hsqldb/create.sql
index b2fdccafef..9876b6d11a 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/create.sql
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/create.sql
@@ -59,6 +59,7 @@ DROP TABLE IF EXISTS T_937/
 DROP TABLE IF EXISTS "T_941"/
 DROP TABLE IF EXISTS "t_941"/
 DROP TABLE IF EXISTS T_943/
+DROP TABLE IF EXISTS "T_2845_CASE_sensitivity"/
 DROP TABLE IF EXISTS system/
 DROP TABLE IF EXISTS class/
 DROP TABLE IF EXISTS integer/
@@ -185,6 +186,18 @@ CREATE TABLE T_937 (
 )
 /
 
+CREATE TABLE "T_2845_CASE_sensitivity" ( 
+  id int,
+  
+  insensitive int,
+  "UPPER" int,
+  "lower" int,
+  "Mixed" int,
+  
+  CONSTRAINT pk_t_2845_case_sensitivity PRIMARY KEY (id)
+)
+/
+
 CREATE TABLE t_author (
   ID INT,
   FIRST_NAME VARCHAR(50),
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 7f67bf9312..eda02f6ddd 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/Keys.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/Keys.java
@@ -23,6 +23,7 @@ public class Keys {
 	// UNIQUE and PRIMARY KEY definitions
 	// -------------------------------------------------------------------------
 
+	public static final org.jooq.UniqueKey<org.jooq.test.hsqldb.generatedclasses.tables.records.T_2845CaseSensitivityRecord> PK_T_2845_CASE_SENSITIVITY = UniqueKeys0.PK_T_2845_CASE_SENSITIVITY;
 	public static final org.jooq.UniqueKey<org.jooq.test.hsqldb.generatedclasses.tables.records.T_639NumbersTableRecord> PK_T_639_NUMBERS_TABLE = UniqueKeys0.PK_T_639_NUMBERS_TABLE;
 	public static final org.jooq.UniqueKey<org.jooq.test.hsqldb.generatedclasses.tables.records.T_725LobTestRecord> PK_T_725_LOB_TEST = UniqueKeys0.PK_T_725_LOB_TEST;
 	public static final org.jooq.UniqueKey<org.jooq.test.hsqldb.generatedclasses.tables.records.T_937Record> T_937 = UniqueKeys0.T_937;
@@ -70,6 +71,7 @@ public class Keys {
 	}
 
 	private static class UniqueKeys0 extends org.jooq.impl.AbstractKeys {
+		public static final org.jooq.UniqueKey<org.jooq.test.hsqldb.generatedclasses.tables.records.T_2845CaseSensitivityRecord> PK_T_2845_CASE_SENSITIVITY = createUniqueKey(org.jooq.test.hsqldb.generatedclasses.tables.T_2845CaseSensitivity.T_2845_CASE_SENSITIVITY, org.jooq.test.hsqldb.generatedclasses.tables.T_2845CaseSensitivity.T_2845_CASE_SENSITIVITY.ID);
 		public static final org.jooq.UniqueKey<org.jooq.test.hsqldb.generatedclasses.tables.records.T_639NumbersTableRecord> PK_T_639_NUMBERS_TABLE = createUniqueKey(org.jooq.test.hsqldb.generatedclasses.tables.T_639NumbersTable.T_639_NUMBERS_TABLE, org.jooq.test.hsqldb.generatedclasses.tables.T_639NumbersTable.T_639_NUMBERS_TABLE.ID);
 		public static final org.jooq.UniqueKey<org.jooq.test.hsqldb.generatedclasses.tables.records.T_725LobTestRecord> PK_T_725_LOB_TEST = createUniqueKey(org.jooq.test.hsqldb.generatedclasses.tables.T_725LobTest.T_725_LOB_TEST, org.jooq.test.hsqldb.generatedclasses.tables.T_725LobTest.T_725_LOB_TEST.ID);
 		public static final org.jooq.UniqueKey<org.jooq.test.hsqldb.generatedclasses.tables.records.T_937Record> T_937 = createUniqueKey(org.jooq.test.hsqldb.generatedclasses.tables.T_937.T_937, org.jooq.test.hsqldb.generatedclasses.tables.T_937.T_937.T_937_);
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 0f98ab1140..95a8ba2219 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/Public.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/Public.java
@@ -9,7 +9,7 @@ package org.jooq.test.hsqldb.generatedclasses;
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class Public extends org.jooq.impl.SchemaImpl {
 
-	private static final long serialVersionUID = -1560664464;
+	private static final long serialVersionUID = -157711550;
 
 	/**
 	 * The singleton instance of <code>PUBLIC</code>
@@ -53,6 +53,7 @@ public class Public extends org.jooq.impl.SchemaImpl {
 			org.jooq.test.hsqldb.generatedclasses.tables.PreparedStatement.PREPARED_STATEMENT,
 			org.jooq.test.hsqldb.generatedclasses.tables.String.STRING,
 			org.jooq.test.hsqldb.generatedclasses.tables.System.SYSTEM,
+			org.jooq.test.hsqldb.generatedclasses.tables.T_2845CaseSensitivity.T_2845_CASE_SENSITIVITY,
 			org.jooq.test.hsqldb.generatedclasses.tables.T_639NumbersTable.T_639_NUMBERS_TABLE,
 			org.jooq.test.hsqldb.generatedclasses.tables.T_725LobTest.T_725_LOB_TEST,
 			org.jooq.test.hsqldb.generatedclasses.tables.T_785.T_785,
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 81bee46777..62b3bf6a40 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/Tables.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/Tables.java
@@ -56,6 +56,11 @@ public class Tables {
 	 */
 	public static final org.jooq.test.hsqldb.generatedclasses.tables.System SYSTEM = org.jooq.test.hsqldb.generatedclasses.tables.System.SYSTEM;
 
+	/**
+	 * The table PUBLIC.T_2845_CASE_sensitivity
+	 */
+	public static final org.jooq.test.hsqldb.generatedclasses.tables.T_2845CaseSensitivity T_2845_CASE_SENSITIVITY = org.jooq.test.hsqldb.generatedclasses.tables.T_2845CaseSensitivity.T_2845_CASE_SENSITIVITY;
+
 	/**
 	 * The table PUBLIC.T_639_NUMBERS_TABLE
 	 */
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/T_2845CaseSensitivity.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/T_2845CaseSensitivity.java
new file mode 100644
index 0000000000..7a702a49ba
--- /dev/null
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/T_2845CaseSensitivity.java
@@ -0,0 +1,89 @@
+/**
+ * This class is generated by jOOQ
+ */
+package org.jooq.test.hsqldb.generatedclasses.tables;
+
+/**
+ * This class is generated by jOOQ.
+ */
+@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
+public class T_2845CaseSensitivity extends org.jooq.impl.TableImpl<org.jooq.test.hsqldb.generatedclasses.tables.records.T_2845CaseSensitivityRecord> {
+
+	private static final long serialVersionUID = 402465836;
+
+	/**
+	 * The singleton instance of <code>PUBLIC.T_2845_CASE_sensitivity</code>
+	 */
+	public static final org.jooq.test.hsqldb.generatedclasses.tables.T_2845CaseSensitivity T_2845_CASE_SENSITIVITY = new org.jooq.test.hsqldb.generatedclasses.tables.T_2845CaseSensitivity();
+
+	/**
+	 * The class holding records for this type
+	 */
+	@Override
+	public java.lang.Class<org.jooq.test.hsqldb.generatedclasses.tables.records.T_2845CaseSensitivityRecord> getRecordType() {
+		return org.jooq.test.hsqldb.generatedclasses.tables.records.T_2845CaseSensitivityRecord.class;
+	}
+
+	/**
+	 * The column <code>PUBLIC.T_2845_CASE_sensitivity.ID</code>. 
+	 */
+	public final org.jooq.TableField<org.jooq.test.hsqldb.generatedclasses.tables.records.T_2845CaseSensitivityRecord, java.lang.Integer> ID = createField("ID", org.jooq.impl.SQLDataType.INTEGER, this);
+
+	/**
+	 * The column <code>PUBLIC.T_2845_CASE_sensitivity.INSENSITIVE</code>. 
+	 */
+	public final org.jooq.TableField<org.jooq.test.hsqldb.generatedclasses.tables.records.T_2845CaseSensitivityRecord, java.lang.Integer> INSENSITIVE = createField("INSENSITIVE", org.jooq.impl.SQLDataType.INTEGER, this);
+
+	/**
+	 * The column <code>PUBLIC.T_2845_CASE_sensitivity.UPPER</code>. 
+	 */
+	public final org.jooq.TableField<org.jooq.test.hsqldb.generatedclasses.tables.records.T_2845CaseSensitivityRecord, java.lang.Integer> UPPER = createField("UPPER", org.jooq.impl.SQLDataType.INTEGER, this);
+
+	/**
+	 * The column <code>PUBLIC.T_2845_CASE_sensitivity.lower</code>. 
+	 */
+	public final org.jooq.TableField<org.jooq.test.hsqldb.generatedclasses.tables.records.T_2845CaseSensitivityRecord, java.lang.Integer> LOWER = createField("lower", org.jooq.impl.SQLDataType.INTEGER, this);
+
+	/**
+	 * The column <code>PUBLIC.T_2845_CASE_sensitivity.Mixed</code>. 
+	 */
+	public final org.jooq.TableField<org.jooq.test.hsqldb.generatedclasses.tables.records.T_2845CaseSensitivityRecord, java.lang.Integer> MIXED = createField("Mixed", org.jooq.impl.SQLDataType.INTEGER, this);
+
+	/**
+	 * Create a <code>PUBLIC.T_2845_CASE_sensitivity</code> table reference
+	 */
+	public T_2845CaseSensitivity() {
+		super("T_2845_CASE_sensitivity", org.jooq.test.hsqldb.generatedclasses.Public.PUBLIC);
+	}
+
+	/**
+	 * Create an aliased <code>PUBLIC.T_2845_CASE_sensitivity</code> table reference
+	 */
+	public T_2845CaseSensitivity(java.lang.String alias) {
+		super(alias, org.jooq.test.hsqldb.generatedclasses.Public.PUBLIC, org.jooq.test.hsqldb.generatedclasses.tables.T_2845CaseSensitivity.T_2845_CASE_SENSITIVITY);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.UniqueKey<org.jooq.test.hsqldb.generatedclasses.tables.records.T_2845CaseSensitivityRecord> getPrimaryKey() {
+		return org.jooq.test.hsqldb.generatedclasses.Keys.PK_T_2845_CASE_SENSITIVITY;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.util.List<org.jooq.UniqueKey<org.jooq.test.hsqldb.generatedclasses.tables.records.T_2845CaseSensitivityRecord>> getKeys() {
+		return java.util.Arrays.<org.jooq.UniqueKey<org.jooq.test.hsqldb.generatedclasses.tables.records.T_2845CaseSensitivityRecord>>asList(org.jooq.test.hsqldb.generatedclasses.Keys.PK_T_2845_CASE_SENSITIVITY);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.test.hsqldb.generatedclasses.tables.T_2845CaseSensitivity as(java.lang.String alias) {
+		return new org.jooq.test.hsqldb.generatedclasses.tables.T_2845CaseSensitivity(alias);
+	}
+}
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/interfaces/IT_2845CaseSensitivity.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/interfaces/IT_2845CaseSensitivity.java
new file mode 100644
index 0000000000..b7f5c9d120
--- /dev/null
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/interfaces/IT_2845CaseSensitivity.java
@@ -0,0 +1,75 @@
+/**
+ * This class is generated by jOOQ
+ */
+package org.jooq.test.hsqldb.generatedclasses.tables.interfaces;
+
+/**
+ * This class is generated by jOOQ.
+ */
+@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
+public interface IT_2845CaseSensitivity extends java.io.Serializable {
+
+	/**
+	 * Setter for <code>PUBLIC.T_2845_CASE_sensitivity.ID</code>. 
+	 */
+	public void setId(java.lang.Integer value);
+
+	/**
+	 * Getter for <code>PUBLIC.T_2845_CASE_sensitivity.ID</code>. 
+	 */
+	public java.lang.Integer getId();
+
+	/**
+	 * Setter for <code>PUBLIC.T_2845_CASE_sensitivity.INSENSITIVE</code>. 
+	 */
+	public void setInsensitive(java.lang.Integer value);
+
+	/**
+	 * Getter for <code>PUBLIC.T_2845_CASE_sensitivity.INSENSITIVE</code>. 
+	 */
+	public java.lang.Integer getInsensitive();
+
+	/**
+	 * Setter for <code>PUBLIC.T_2845_CASE_sensitivity.UPPER</code>. 
+	 */
+	public void setUpper(java.lang.Integer value);
+
+	/**
+	 * Getter for <code>PUBLIC.T_2845_CASE_sensitivity.UPPER</code>. 
+	 */
+	public java.lang.Integer getUpper();
+
+	/**
+	 * Setter for <code>PUBLIC.T_2845_CASE_sensitivity.lower</code>. 
+	 */
+	public void setLower(java.lang.Integer value);
+
+	/**
+	 * Getter for <code>PUBLIC.T_2845_CASE_sensitivity.lower</code>. 
+	 */
+	public java.lang.Integer getLower();
+
+	/**
+	 * Setter for <code>PUBLIC.T_2845_CASE_sensitivity.Mixed</code>. 
+	 */
+	public void setMixed(java.lang.Integer value);
+
+	/**
+	 * Getter for <code>PUBLIC.T_2845_CASE_sensitivity.Mixed</code>. 
+	 */
+	public java.lang.Integer getMixed();
+
+	// -------------------------------------------------------------------------
+	// FROM and INTO
+	// -------------------------------------------------------------------------
+
+	/**
+	 * Load data from another generated Record/POJO implementing the common interface IT_2845CaseSensitivity
+	 */
+	public void from(org.jooq.test.hsqldb.generatedclasses.tables.interfaces.IT_2845CaseSensitivity from);
+
+	/**
+	 * Copy data into another generated Record/POJO implementing the common interface IT_2845CaseSensitivity
+	 */
+	public <E extends org.jooq.test.hsqldb.generatedclasses.tables.interfaces.IT_2845CaseSensitivity> E into(E into);
+}
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/T_2845CaseSensitivityRecord.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/T_2845CaseSensitivityRecord.java
new file mode 100644
index 0000000000..a986de37b4
--- /dev/null
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/tables/records/T_2845CaseSensitivityRecord.java
@@ -0,0 +1,254 @@
+/**
+ * This class is generated by jOOQ
+ */
+package org.jooq.test.hsqldb.generatedclasses.tables.records;
+
+/**
+ * This class is generated by jOOQ.
+ */
+@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
+public class T_2845CaseSensitivityRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.test.hsqldb.generatedclasses.tables.records.T_2845CaseSensitivityRecord> implements org.jooq.Record5<java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer>, org.jooq.test.hsqldb.generatedclasses.tables.interfaces.IT_2845CaseSensitivity {
+
+	private static final long serialVersionUID = 1513811873;
+
+	/**
+	 * Setter for <code>PUBLIC.T_2845_CASE_sensitivity.ID</code>. 
+	 */
+	@Override
+	public void setId(java.lang.Integer value) {
+		setValue(0, value);
+	}
+
+	/**
+	 * Getter for <code>PUBLIC.T_2845_CASE_sensitivity.ID</code>. 
+	 */
+	@Override
+	public java.lang.Integer getId() {
+		return (java.lang.Integer) getValue(0);
+	}
+
+	/**
+	 * Setter for <code>PUBLIC.T_2845_CASE_sensitivity.INSENSITIVE</code>. 
+	 */
+	@Override
+	public void setInsensitive(java.lang.Integer value) {
+		setValue(1, value);
+	}
+
+	/**
+	 * Getter for <code>PUBLIC.T_2845_CASE_sensitivity.INSENSITIVE</code>. 
+	 */
+	@Override
+	public java.lang.Integer getInsensitive() {
+		return (java.lang.Integer) getValue(1);
+	}
+
+	/**
+	 * Setter for <code>PUBLIC.T_2845_CASE_sensitivity.UPPER</code>. 
+	 */
+	@Override
+	public void setUpper(java.lang.Integer value) {
+		setValue(2, value);
+	}
+
+	/**
+	 * Getter for <code>PUBLIC.T_2845_CASE_sensitivity.UPPER</code>. 
+	 */
+	@Override
+	public java.lang.Integer getUpper() {
+		return (java.lang.Integer) getValue(2);
+	}
+
+	/**
+	 * Setter for <code>PUBLIC.T_2845_CASE_sensitivity.lower</code>. 
+	 */
+	@Override
+	public void setLower(java.lang.Integer value) {
+		setValue(3, value);
+	}
+
+	/**
+	 * Getter for <code>PUBLIC.T_2845_CASE_sensitivity.lower</code>. 
+	 */
+	@Override
+	public java.lang.Integer getLower() {
+		return (java.lang.Integer) getValue(3);
+	}
+
+	/**
+	 * Setter for <code>PUBLIC.T_2845_CASE_sensitivity.Mixed</code>. 
+	 */
+	@Override
+	public void setMixed(java.lang.Integer value) {
+		setValue(4, value);
+	}
+
+	/**
+	 * Getter for <code>PUBLIC.T_2845_CASE_sensitivity.Mixed</code>. 
+	 */
+	@Override
+	public java.lang.Integer getMixed() {
+		return (java.lang.Integer) getValue(4);
+	}
+
+	// -------------------------------------------------------------------------
+	// Primary key information
+	// -------------------------------------------------------------------------
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Record1<java.lang.Integer> key() {
+		return (org.jooq.Record1) super.key();
+	}
+
+	// -------------------------------------------------------------------------
+	// Record5 type implementation
+	// -------------------------------------------------------------------------
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Row5<java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer> fieldsRow() {
+		return (org.jooq.Row5) super.fieldsRow();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Row5<java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer> valuesRow() {
+		return (org.jooq.Row5) super.valuesRow();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.Integer> field1() {
+		return org.jooq.test.hsqldb.generatedclasses.tables.T_2845CaseSensitivity.T_2845_CASE_SENSITIVITY.ID;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.Integer> field2() {
+		return org.jooq.test.hsqldb.generatedclasses.tables.T_2845CaseSensitivity.T_2845_CASE_SENSITIVITY.INSENSITIVE;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.Integer> field3() {
+		return org.jooq.test.hsqldb.generatedclasses.tables.T_2845CaseSensitivity.T_2845_CASE_SENSITIVITY.UPPER;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.Integer> field4() {
+		return org.jooq.test.hsqldb.generatedclasses.tables.T_2845CaseSensitivity.T_2845_CASE_SENSITIVITY.LOWER;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.Integer> field5() {
+		return org.jooq.test.hsqldb.generatedclasses.tables.T_2845CaseSensitivity.T_2845_CASE_SENSITIVITY.MIXED;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.Integer value1() {
+		return getId();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.Integer value2() {
+		return getInsensitive();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.Integer value3() {
+		return getUpper();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.Integer value4() {
+		return getLower();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.Integer value5() {
+		return getMixed();
+	}
+
+	// -------------------------------------------------------------------------
+	// FROM and INTO
+	// -------------------------------------------------------------------------
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void from(org.jooq.test.hsqldb.generatedclasses.tables.interfaces.IT_2845CaseSensitivity from) {
+		setId(from.getId());
+		setInsensitive(from.getInsensitive());
+		setUpper(from.getUpper());
+		setLower(from.getLower());
+		setMixed(from.getMixed());
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public <E extends org.jooq.test.hsqldb.generatedclasses.tables.interfaces.IT_2845CaseSensitivity> E into(E into) {
+		into.from(this);
+		return into;
+	}
+
+	// -------------------------------------------------------------------------
+	// Constructors
+	// -------------------------------------------------------------------------
+
+	/**
+	 * Create a detached T_2845CaseSensitivityRecord
+	 */
+	public T_2845CaseSensitivityRecord() {
+		super(org.jooq.test.hsqldb.generatedclasses.tables.T_2845CaseSensitivity.T_2845_CASE_SENSITIVITY);
+	}
+
+	/**
+	 * Create a detached, initialised T_2845CaseSensitivityRecord
+	 */
+	public T_2845CaseSensitivityRecord(java.lang.Integer id, java.lang.Integer insensitive, java.lang.Integer upper, java.lang.Integer lower, java.lang.Integer mixed) {
+		super(org.jooq.test.hsqldb.generatedclasses.tables.T_2845CaseSensitivity.T_2845_CASE_SENSITIVITY);
+
+		setValue(0, id);
+		setValue(1, insensitive);
+		setValue(2, upper);
+		setValue(3, lower);
+		setValue(4, mixed);
+	}
+}
diff --git a/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java b/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java
index 3b1a837a1c..5c84f6f6e6 100644
--- a/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java
+++ b/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java
@@ -237,7 +237,8 @@ public abstract class jOOQAbstractTest<
         // Various tables related to trac ticket numbers
         T725 extends UpdatableRecord<T725>,
         T639 extends UpdatableRecord<T639>,
-        T785 extends TableRecord<T785>> {
+        T785 extends TableRecord<T785>,
+        CASE extends UpdatableRecord<CASE>> {
 
     protected static final List<Short>   BOOK_IDS_SHORT         = Arrays.asList((short) 1, (short) 2, (short) 3, (short) 4);
     protected static final List<Integer> BOOK_IDS               = Arrays.asList(1, 2, 3, 4);
@@ -743,6 +744,23 @@ public abstract class jOOQAbstractTest<
     protected abstract TableField<T785, String> T785_NAME();
     protected abstract TableField<T785, String> T785_VALUE();
 
+    protected abstract Table<CASE> CASE();
+    protected TableField<CASE, Integer> CASE_ID() {
+        return (TableField<CASE, Integer>) CASE().field(0);
+    }
+    protected TableField<CASE, Integer> CASE_insensitive() {
+        return (TableField<CASE, Integer>) CASE().field(1);
+    }
+    protected TableField<CASE, Integer> CASE_UPPER() {
+        return (TableField<CASE, Integer>) CASE().field(2);
+    }
+    protected TableField<CASE, Integer> CASE_lower() {
+        return (TableField<CASE, Integer>) CASE().field(3);
+    }
+    protected TableField<CASE, Integer> CASE_Mixed() {
+        return (TableField<CASE, Integer>) CASE().field(4);
+    }
+
     protected abstract Table<U> TUnsigned();
     protected abstract TableField<U, UByte> TUnsigned_U_BYTE();
     protected abstract TableField<U, UShort> TUnsigned_U_SHORT();
@@ -1667,6 +1685,16 @@ public abstract class jOOQAbstractTest<
         new InsertUpdateTests(this).testInsertReturning();
     }
 
+    @Test
+    public void testInsertReturningWithCaseSensitiveColumns() throws Exception {
+        new InsertUpdateTests(this).testInsertReturningWithCaseSensitiveColumns();
+    }
+
+    @Test
+    public void testInsertReturningWithRenderNameStyleAS_IS() throws Exception {
+        new InsertUpdateTests(this).testInsertReturningWithRenderNameStyleAS_IS();
+    }
+
     // @Test [#2374]
     public void testInsertReturningWithPlainSQL() throws Exception {
         new InsertUpdateTests(this).testInsertReturningWithPlainSQL();