diff --git a/jOOQ-test/src/org/jooq/test/BaseTest.java b/jOOQ-test/src/org/jooq/test/BaseTest.java
index f78cbaadf2..eb9de9d53b 100644
--- a/jOOQ-test/src/org/jooq/test/BaseTest.java
+++ b/jOOQ-test/src/org/jooq/test/BaseTest.java
@@ -88,9 +88,12 @@ public abstract class BaseTest<
     // V_LIBRARY view
     L extends TableRecord<L>,
 
-    // X_UNUSED table
+    // T_ARRAYS table
     X extends TableRecord<X>,
 
+    // T_DATES table
+    DATE extends UpdatableRecord<DATE>,
+
     // T_DIRECTORY table
     D extends UpdatableRecord<D>,
 
@@ -124,9 +127,9 @@ public abstract class BaseTest<
 
     protected static final JooqLogger      log                = JooqLogger.getLogger(jOOQAbstractTest.class);
 
-    protected final jOOQAbstractTest<A, B, S, B2S, BS, L, X, D, T, U, I, IPK, T658, T725, T639, T785> delegate;
+    protected final jOOQAbstractTest<A, B, S, B2S, BS, L, X, DATE, D, T, U, I, IPK, T658, T725, T639, T785> delegate;
 
-    protected BaseTest(jOOQAbstractTest<A, B, S, B2S, BS, L, X, D, T, U, I, IPK, T658, T725, T639, T785> delegate) {
+    protected BaseTest(jOOQAbstractTest<A, B, S, B2S, BS, L, X, DATE, D, T, U, I, IPK, T658, T725, T639, T785> delegate) {
         this.delegate = delegate;
     }
 
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/AggregateWindowFunctionTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/AggregateWindowFunctionTests.java
index 54fb4c3109..c4df561ffd 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/AggregateWindowFunctionTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/AggregateWindowFunctionTests.java
@@ -88,6 +88,7 @@ public class AggregateWindowFunctionTests<
     BS   extends UpdatableRecord<BS>,
     L    extends TableRecord<L>,
     X    extends TableRecord<X>,
+    DATE extends UpdatableRecord<DATE>,
     D    extends UpdatableRecord<D>,
     T    extends UpdatableRecord<T>,
     U    extends TableRecord<U>,
@@ -97,9 +98,9 @@ public class AggregateWindowFunctionTests<
     T725 extends UpdatableRecord<T725>,
     T639 extends UpdatableRecord<T639>,
     T785 extends TableRecord<T785>>
-extends BaseTest<A, B, S, B2S, BS, L, X, D, T, U, I, IPK, T658, T725, T639, T785> {
+extends BaseTest<A, B, S, B2S, BS, L, X, DATE, D, T, U, I, IPK, T658, T725, T639, T785> {
 
-    public AggregateWindowFunctionTests(jOOQAbstractTest<A, B, S, B2S, BS, L, X, D, T, U, I, IPK, T658, T725, T639, T785> delegate) {
+    public AggregateWindowFunctionTests(jOOQAbstractTest<A, B, S, B2S, BS, L, X, DATE, D, T, U, I, IPK, T658, T725, T639, T785> 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 22c6cc4da7..97f2f56ea0 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/CRUDTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/CRUDTests.java
@@ -75,6 +75,7 @@ public class CRUDTests<
     BS   extends UpdatableRecord<BS>,
     L    extends TableRecord<L>,
     X    extends TableRecord<X>,
+    DATE extends UpdatableRecord<DATE>,
     D    extends UpdatableRecord<D>,
     T    extends UpdatableRecord<T>,
     U    extends TableRecord<U>,
@@ -84,9 +85,9 @@ public class CRUDTests<
     T725 extends UpdatableRecord<T725>,
     T639 extends UpdatableRecord<T639>,
     T785 extends TableRecord<T785>>
-extends BaseTest<A, B, S, B2S, BS, L, X, D, T, U, I, IPK, T658, T725, T639, T785> {
+extends BaseTest<A, B, S, B2S, BS, L, X, DATE, D, T, U, I, IPK, T658, T725, T639, T785> {
 
-    public CRUDTests(jOOQAbstractTest<A, B, S, B2S, BS, L, X, D, T, U, I, IPK, T658, T725, T639, T785> delegate) {
+    public CRUDTests(jOOQAbstractTest<A, B, S, B2S, BS, L, X, DATE, D, T, U, I, IPK, T658, T725, T639, T785> 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 b70f4b3ed3..c107b55f43 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/DataTypeTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/DataTypeTests.java
@@ -84,6 +84,7 @@ public class DataTypeTests<
     BS   extends UpdatableRecord<BS>,
     L    extends TableRecord<L>,
     X    extends TableRecord<X>,
+    DATE extends UpdatableRecord<DATE>,
     D    extends UpdatableRecord<D>,
     T    extends UpdatableRecord<T>,
     U    extends TableRecord<U>,
@@ -93,9 +94,9 @@ public class DataTypeTests<
     T725 extends UpdatableRecord<T725>,
     T639 extends UpdatableRecord<T639>,
     T785 extends TableRecord<T785>>
-extends BaseTest<A, B, S, B2S, BS, L, X, D, T, U, I, IPK, T658, T725, T639, T785> {
+extends BaseTest<A, B, S, B2S, BS, L, X, DATE, D, T, U, I, IPK, T658, T725, T639, T785> {
 
-    public DataTypeTests(jOOQAbstractTest<A, B, S, B2S, BS, L, X, D, T, U, I, IPK, T658, T725, T639, T785> delegate) {
+    public DataTypeTests(jOOQAbstractTest<A, B, S, B2S, BS, L, X, DATE, D, T, U, I, IPK, T658, T725, T639, T785> 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 bd0d653579..7cc62d223a 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/EnumTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/EnumTests.java
@@ -60,6 +60,7 @@ public class EnumTests<
     BS   extends UpdatableRecord<BS>,
     L    extends TableRecord<L>,
     X    extends TableRecord<X>,
+    DATE extends UpdatableRecord<DATE>,
     D    extends UpdatableRecord<D>,
     T    extends UpdatableRecord<T>,
     U    extends TableRecord<U>,
@@ -69,9 +70,9 @@ public class EnumTests<
     T725 extends UpdatableRecord<T725>,
     T639 extends UpdatableRecord<T639>,
     T785 extends TableRecord<T785>>
-extends BaseTest<A, B, S, B2S, BS, L, X, D, T, U, I, IPK, T658, T725, T639, T785> {
+extends BaseTest<A, B, S, B2S, BS, L, X, DATE, D, T, U, I, IPK, T658, T725, T639, T785> {
 
-    public EnumTests(jOOQAbstractTest<A, B, S, B2S, BS, L, X, D, T, U, I, IPK, T658, T725, T639, T785> delegate) {
+    public EnumTests(jOOQAbstractTest<A, B, S, B2S, BS, L, X, DATE, D, T, U, I, IPK, T658, T725, T639, T785> 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 1e333fd24b..8e716223da 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/ExoticTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/ExoticTests.java
@@ -64,6 +64,7 @@ public class ExoticTests<
     BS   extends UpdatableRecord<BS>,
     L    extends TableRecord<L>,
     X    extends TableRecord<X>,
+    DATE extends UpdatableRecord<DATE>,
     D    extends UpdatableRecord<D>,
     T    extends UpdatableRecord<T>,
     U    extends TableRecord<U>,
@@ -73,9 +74,9 @@ public class ExoticTests<
     T725 extends UpdatableRecord<T725>,
     T639 extends UpdatableRecord<T639>,
     T785 extends TableRecord<T785>>
-extends BaseTest<A, B, S, B2S, BS, L, X, D, T, U, I, IPK, T658, T725, T639, T785> {
+extends BaseTest<A, B, S, B2S, BS, L, X, DATE, D, T, U, I, IPK, T658, T725, T639, T785> {
 
-    public ExoticTests(jOOQAbstractTest<A, B, S, B2S, BS, L, X, D, T, U, I, IPK, T658, T725, T639, T785> delegate) {
+    public ExoticTests(jOOQAbstractTest<A, B, S, B2S, BS, L, X, DATE, D, T, U, I, IPK, T658, T725, T639, T785> 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 f4d0fcaf70..aa90b22925 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/FetchTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/FetchTests.java
@@ -96,6 +96,7 @@ public class FetchTests<
     BS   extends UpdatableRecord<BS>,
     L    extends TableRecord<L>,
     X    extends TableRecord<X>,
+    DATE extends UpdatableRecord<DATE>,
     D    extends UpdatableRecord<D>,
     T    extends UpdatableRecord<T>,
     U    extends TableRecord<U>,
@@ -105,9 +106,9 @@ public class FetchTests<
     T725 extends UpdatableRecord<T725>,
     T639 extends UpdatableRecord<T639>,
     T785 extends TableRecord<T785>>
-extends BaseTest<A, B, S, B2S, BS, L, X, D, T, U, I, IPK, T658, T725, T639, T785> {
+extends BaseTest<A, B, S, B2S, BS, L, X, DATE, D, T, U, I, IPK, T658, T725, T639, T785> {
 
-    public FetchTests(jOOQAbstractTest<A, B, S, B2S, BS, L, X, D, T, U, I, IPK, T658, T725, T639, T785> delegate) {
+    public FetchTests(jOOQAbstractTest<A, B, S, B2S, BS, L, X, DATE, D, T, U, I, IPK, T658, T725, T639, T785> 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 ba2f837653..8bf8076036 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/FormatTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/FormatTests.java
@@ -67,6 +67,7 @@ public class FormatTests<
     BS   extends UpdatableRecord<BS>,
     L    extends TableRecord<L>,
     X    extends TableRecord<X>,
+    DATE extends UpdatableRecord<DATE>,
     D    extends UpdatableRecord<D>,
     T    extends UpdatableRecord<T>,
     U    extends TableRecord<U>,
@@ -76,9 +77,9 @@ public class FormatTests<
     T725 extends UpdatableRecord<T725>,
     T639 extends UpdatableRecord<T639>,
     T785 extends TableRecord<T785>>
-extends BaseTest<A, B, S, B2S, BS, L, X, D, T, U, I, IPK, T658, T725, T639, T785> {
+extends BaseTest<A, B, S, B2S, BS, L, X, DATE, D, T, U, I, IPK, T658, T725, T639, T785> {
 
-    public FormatTests(jOOQAbstractTest<A, B, S, B2S, BS, L, X, D, T, U, I, IPK, T658, T725, T639, T785> delegate) {
+    public FormatTests(jOOQAbstractTest<A, B, S, B2S, BS, L, X, DATE, D, T, U, I, IPK, T658, T725, T639, T785> 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 f0951dccfd..4c2805de11 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/FunctionTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/FunctionTests.java
@@ -139,6 +139,7 @@ public class FunctionTests<
     BS   extends UpdatableRecord<BS>,
     L    extends TableRecord<L>,
     X    extends TableRecord<X>,
+    DATE extends UpdatableRecord<DATE>,
     D    extends UpdatableRecord<D>,
     T    extends UpdatableRecord<T>,
     U    extends TableRecord<U>,
@@ -148,9 +149,9 @@ public class FunctionTests<
     T725 extends UpdatableRecord<T725>,
     T639 extends UpdatableRecord<T639>,
     T785 extends TableRecord<T785>>
-extends BaseTest<A, B, S, B2S, BS, L, X, D, T, U, I, IPK, T658, T725, T639, T785> {
+extends BaseTest<A, B, S, B2S, BS, L, X, DATE, D, T, U, I, IPK, T658, T725, T639, T785> {
 
-    public FunctionTests(jOOQAbstractTest<A, B, S, B2S, BS, L, X, D, T, U, I, IPK, T658, T725, T639, T785> delegate) {
+    public FunctionTests(jOOQAbstractTest<A, B, S, B2S, BS, L, X, DATE, D, T, U, I, IPK, T658, T725, T639, T785> 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 5ad3280af5..bbc9824064 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/GeneralTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/GeneralTests.java
@@ -104,6 +104,7 @@ public class GeneralTests<
     BS   extends UpdatableRecord<BS>,
     L    extends TableRecord<L>,
     X    extends TableRecord<X>,
+    DATE extends UpdatableRecord<DATE>,
     D    extends UpdatableRecord<D>,
     T    extends UpdatableRecord<T>,
     U    extends TableRecord<U>,
@@ -113,9 +114,9 @@ public class GeneralTests<
     T725 extends UpdatableRecord<T725>,
     T639 extends UpdatableRecord<T639>,
     T785 extends TableRecord<T785>>
-extends BaseTest<A, B, S, B2S, BS, L, X, D, T, U, I, IPK, T658, T725, T639, T785> {
+extends BaseTest<A, B, S, B2S, BS, L, X, DATE, D, T, U, I, IPK, T658, T725, T639, T785> {
 
-    public GeneralTests(jOOQAbstractTest<A, B, S, B2S, BS, L, X, D, T, U, I, IPK, T658, T725, T639, T785> delegate) {
+    public GeneralTests(jOOQAbstractTest<A, B, S, B2S, BS, L, X, DATE, D, T, U, I, IPK, T658, T725, T639, T785> 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 616cfd1e5a..7740a44f87 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/GroupByTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/GroupByTests.java
@@ -69,6 +69,7 @@ public class GroupByTests<
     BS   extends UpdatableRecord<BS>,
     L    extends TableRecord<L>,
     X    extends TableRecord<X>,
+    DATE extends UpdatableRecord<DATE>,
     D    extends UpdatableRecord<D>,
     T    extends UpdatableRecord<T>,
     U    extends TableRecord<U>,
@@ -78,9 +79,9 @@ public class GroupByTests<
     T725 extends UpdatableRecord<T725>,
     T639 extends UpdatableRecord<T639>,
     T785 extends TableRecord<T785>>
-extends BaseTest<A, B, S, B2S, BS, L, X, D, T, U, I, IPK, T658, T725, T639, T785> {
+extends BaseTest<A, B, S, B2S, BS, L, X, DATE, D, T, U, I, IPK, T658, T725, T639, T785> {
 
-    public GroupByTests(jOOQAbstractTest<A, B, S, B2S, BS, L, X, D, T, U, I, IPK, T658, T725, T639, T785> delegate) {
+    public GroupByTests(jOOQAbstractTest<A, B, S, B2S, BS, L, X, DATE, D, T, U, I, IPK, T658, T725, T639, T785> 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 1f4d66bf79..af652b2573 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/InsertUpdateTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/InsertUpdateTests.java
@@ -84,6 +84,7 @@ public class InsertUpdateTests<
     BS   extends UpdatableRecord<BS>,
     L    extends TableRecord<L>,
     X    extends TableRecord<X>,
+    DATE extends UpdatableRecord<DATE>,
     D    extends UpdatableRecord<D>,
     T    extends UpdatableRecord<T>,
     U    extends TableRecord<U>,
@@ -93,9 +94,9 @@ public class InsertUpdateTests<
     T725 extends UpdatableRecord<T725>,
     T639 extends UpdatableRecord<T639>,
     T785 extends TableRecord<T785>>
-extends BaseTest<A, B, S, B2S, BS, L, X, D, T, U, I, IPK, T658, T725, T639, T785> {
+extends BaseTest<A, B, S, B2S, BS, L, X, DATE, D, T, U, I, IPK, T658, T725, T639, T785> {
 
-    public InsertUpdateTests(jOOQAbstractTest<A, B, S, B2S, BS, L, X, D, T, U, I, IPK, T658, T725, T639, T785> delegate) {
+    public InsertUpdateTests(jOOQAbstractTest<A, B, S, B2S, BS, L, X, DATE, D, T, U, I, IPK, T658, T725, T639, T785> 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 29dbb1b88d..1fabc5a5e2 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/JoinTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/JoinTests.java
@@ -75,6 +75,7 @@ public class JoinTests<
     BS   extends UpdatableRecord<BS>,
     L    extends TableRecord<L>,
     X    extends TableRecord<X>,
+    DATE extends UpdatableRecord<DATE>,
     D    extends UpdatableRecord<D>,
     T    extends UpdatableRecord<T>,
     U    extends TableRecord<U>,
@@ -84,9 +85,9 @@ public class JoinTests<
     T725 extends UpdatableRecord<T725>,
     T639 extends UpdatableRecord<T639>,
     T785 extends TableRecord<T785>>
-extends BaseTest<A, B, S, B2S, BS, L, X, D, T, U, I, IPK, T658, T725, T639, T785> {
+extends BaseTest<A, B, S, B2S, BS, L, X, DATE, D, T, U, I, IPK, T658, T725, T639, T785> {
 
-    public JoinTests(jOOQAbstractTest<A, B, S, B2S, BS, L, X, D, T, U, I, IPK, T658, T725, T639, T785> delegate) {
+    public JoinTests(jOOQAbstractTest<A, B, S, B2S, BS, L, X, DATE, D, T, U, I, IPK, T658, T725, T639, T785> delegate) {
         super(delegate);
     }
 
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/LoaderTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/LoaderTests.java
index 0c42687377..621577bdc3 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/LoaderTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/LoaderTests.java
@@ -61,6 +61,7 @@ public class LoaderTests<
     BS   extends UpdatableRecord<BS>,
     L    extends TableRecord<L>,
     X    extends TableRecord<X>,
+    DATE extends UpdatableRecord<DATE>,
     D    extends UpdatableRecord<D>,
     T    extends UpdatableRecord<T>,
     U    extends TableRecord<U>,
@@ -70,9 +71,9 @@ public class LoaderTests<
     T725 extends UpdatableRecord<T725>,
     T639 extends UpdatableRecord<T639>,
     T785 extends TableRecord<T785>>
-extends BaseTest<A, B, S, B2S, BS, L, X, D, T, U, I, IPK, T658, T725, T639, T785> {
+extends BaseTest<A, B, S, B2S, BS, L, X, DATE, D, T, U, I, IPK, T658, T725, T639, T785> {
 
-    public LoaderTests(jOOQAbstractTest<A, B, S, B2S, BS, L, X, D, T, U, I, IPK, T658, T725, T639, T785> delegate) {
+    public LoaderTests(jOOQAbstractTest<A, B, S, B2S, BS, L, X, DATE, D, T, U, I, IPK, T658, T725, T639, T785> 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 74940bd1be..511e92d7c3 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/OrderByTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/OrderByTests.java
@@ -74,6 +74,7 @@ public class OrderByTests<
     BS   extends UpdatableRecord<BS>,
     L    extends TableRecord<L>,
     X    extends TableRecord<X>,
+    DATE extends UpdatableRecord<DATE>,
     D    extends UpdatableRecord<D>,
     T    extends UpdatableRecord<T>,
     U    extends TableRecord<U>,
@@ -83,9 +84,9 @@ public class OrderByTests<
     T725 extends UpdatableRecord<T725>,
     T639 extends UpdatableRecord<T639>,
     T785 extends TableRecord<T785>>
-extends BaseTest<A, B, S, B2S, BS, L, X, D, T, U, I, IPK, T658, T725, T639, T785> {
+extends BaseTest<A, B, S, B2S, BS, L, X, DATE, D, T, U, I, IPK, T658, T725, T639, T785> {
 
-    public OrderByTests(jOOQAbstractTest<A, B, S, B2S, BS, L, X, D, T, U, I, IPK, T658, T725, T639, T785> delegate) {
+    public OrderByTests(jOOQAbstractTest<A, B, S, B2S, BS, L, X, DATE, D, T, U, I, IPK, T658, T725, T639, T785> 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 48ded7fb18..895f2315c3 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/PlainSQLTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/PlainSQLTests.java
@@ -78,6 +78,7 @@ public class PlainSQLTests<
     BS   extends UpdatableRecord<BS>,
     L    extends TableRecord<L>,
     X    extends TableRecord<X>,
+    DATE extends UpdatableRecord<DATE>,
     D    extends UpdatableRecord<D>,
     T    extends UpdatableRecord<T>,
     U    extends TableRecord<U>,
@@ -87,9 +88,9 @@ public class PlainSQLTests<
     T725 extends UpdatableRecord<T725>,
     T639 extends UpdatableRecord<T639>,
     T785 extends TableRecord<T785>>
-extends BaseTest<A, B, S, B2S, BS, L, X, D, T, U, I, IPK, T658, T725, T639, T785> {
+extends BaseTest<A, B, S, B2S, BS, L, X, DATE, D, T, U, I, IPK, T658, T725, T639, T785> {
 
-    public PlainSQLTests(jOOQAbstractTest<A, B, S, B2S, BS, L, X, D, T, U, I, IPK, T658, T725, T639, T785> delegate) {
+    public PlainSQLTests(jOOQAbstractTest<A, B, S, B2S, BS, L, X, DATE, D, T, U, I, IPK, T658, T725, T639, T785> 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 8895ed72e4..f62a56b058 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/PredicateTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/PredicateTests.java
@@ -73,6 +73,7 @@ public class PredicateTests<
     BS   extends UpdatableRecord<BS>,
     L    extends TableRecord<L>,
     X    extends TableRecord<X>,
+    DATE extends UpdatableRecord<DATE>,
     D    extends UpdatableRecord<D>,
     T    extends UpdatableRecord<T>,
     U    extends TableRecord<U>,
@@ -82,9 +83,9 @@ public class PredicateTests<
     T725 extends UpdatableRecord<T725>,
     T639 extends UpdatableRecord<T639>,
     T785 extends TableRecord<T785>>
-extends BaseTest<A, B, S, B2S, BS, L, X, D, T, U, I, IPK, T658, T725, T639, T785> {
+extends BaseTest<A, B, S, B2S, BS, L, X, DATE, D, T, U, I, IPK, T658, T725, T639, T785> {
 
-    public PredicateTests(jOOQAbstractTest<A, B, S, B2S, BS, L, X, D, T, U, I, IPK, T658, T725, T639, T785> delegate) {
+    public PredicateTests(jOOQAbstractTest<A, B, S, B2S, BS, L, X, DATE, D, T, U, I, IPK, T658, T725, T639, T785> 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 4cce5fa5fa..17822aa1aa 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/RenderAndBindTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/RenderAndBindTests.java
@@ -76,6 +76,7 @@ public class RenderAndBindTests<
     BS   extends UpdatableRecord<BS>,
     L    extends TableRecord<L>,
     X    extends TableRecord<X>,
+    DATE extends UpdatableRecord<DATE>,
     D    extends UpdatableRecord<D>,
     T    extends UpdatableRecord<T>,
     U    extends TableRecord<U>,
@@ -85,9 +86,9 @@ public class RenderAndBindTests<
     T725 extends UpdatableRecord<T725>,
     T639 extends UpdatableRecord<T639>,
     T785 extends TableRecord<T785>>
-extends BaseTest<A, B, S, B2S, BS, L, X, D, T, U, I, IPK, T658, T725, T639, T785> {
+extends BaseTest<A, B, S, B2S, BS, L, X, DATE, D, T, U, I, IPK, T658, T725, T639, T785> {
 
-    public RenderAndBindTests(jOOQAbstractTest<A, B, S, B2S, BS, L, X, D, T, U, I, IPK, T658, T725, T639, T785> delegate) {
+    public RenderAndBindTests(jOOQAbstractTest<A, B, S, B2S, BS, L, X, DATE, D, T, U, I, IPK, T658, T725, T639, T785> 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 61158849b7..083b774414 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/RoutineAndUDTTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/RoutineAndUDTTests.java
@@ -73,6 +73,7 @@ public class RoutineAndUDTTests<
     BS   extends UpdatableRecord<BS>,
     L    extends TableRecord<L>,
     X    extends TableRecord<X>,
+    DATE extends UpdatableRecord<DATE>,
     D    extends UpdatableRecord<D>,
     T    extends UpdatableRecord<T>,
     U    extends TableRecord<U>,
@@ -82,9 +83,9 @@ public class RoutineAndUDTTests<
     T725 extends UpdatableRecord<T725>,
     T639 extends UpdatableRecord<T639>,
     T785 extends TableRecord<T785>>
-extends BaseTest<A, B, S, B2S, BS, L, X, D, T, U, I, IPK, T658, T725, T639, T785> {
+extends BaseTest<A, B, S, B2S, BS, L, X, DATE, D, T, U, I, IPK, T658, T725, T639, T785> {
 
-    public RoutineAndUDTTests(jOOQAbstractTest<A, B, S, B2S, BS, L, X, D, T, U, I, IPK, T658, T725, T639, T785> delegate) {
+    public RoutineAndUDTTests(jOOQAbstractTest<A, B, S, B2S, BS, L, X, DATE, D, T, U, I, IPK, T658, T725, T639, T785> delegate) {
         super(delegate);
     }
     @Test
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/SchemaAndMappingTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/SchemaAndMappingTests.java
index ec0debe9f5..373a35e44b 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/SchemaAndMappingTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/SchemaAndMappingTests.java
@@ -73,6 +73,7 @@ public class SchemaAndMappingTests<
     BS   extends UpdatableRecord<BS>,
     L    extends TableRecord<L>,
     X    extends TableRecord<X>,
+    DATE extends UpdatableRecord<DATE>,
     D    extends UpdatableRecord<D>,
     T    extends UpdatableRecord<T>,
     U    extends TableRecord<U>,
@@ -82,9 +83,9 @@ public class SchemaAndMappingTests<
     T725 extends UpdatableRecord<T725>,
     T639 extends UpdatableRecord<T639>,
     T785 extends TableRecord<T785>>
-extends BaseTest<A, B, S, B2S, BS, L, X, D, T, U, I, IPK, T658, T725, T639, T785> {
+extends BaseTest<A, B, S, B2S, BS, L, X, DATE, D, T, U, I, IPK, T658, T725, T639, T785> {
 
-    public SchemaAndMappingTests(jOOQAbstractTest<A, B, S, B2S, BS, L, X, D, T, U, I, IPK, T658, T725, T639, T785> delegate) {
+    public SchemaAndMappingTests(jOOQAbstractTest<A, B, S, B2S, BS, L, X, DATE, D, T, U, I, IPK, T658, T725, T639, T785> 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 7b6db7c2f9..2fa96b00eb 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/SelectTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/SelectTests.java
@@ -63,6 +63,7 @@ public class SelectTests<
     BS   extends UpdatableRecord<BS>,
     L    extends TableRecord<L>,
     X    extends TableRecord<X>,
+    DATE extends UpdatableRecord<DATE>,
     D    extends UpdatableRecord<D>,
     T    extends UpdatableRecord<T>,
     U    extends TableRecord<U>,
@@ -72,9 +73,9 @@ public class SelectTests<
     T725 extends UpdatableRecord<T725>,
     T639 extends UpdatableRecord<T639>,
     T785 extends TableRecord<T785>>
-extends BaseTest<A, B, S, B2S, BS, L, X, D, T, U, I, IPK, T658, T725, T639, T785> {
+extends BaseTest<A, B, S, B2S, BS, L, X, DATE, D, T, U, I, IPK, T658, T725, T639, T785> {
 
-    public SelectTests(jOOQAbstractTest<A, B, S, B2S, BS, L, X, D, T, U, I, IPK, T658, T725, T639, T785> delegate) {
+    public SelectTests(jOOQAbstractTest<A, B, S, B2S, BS, L, X, DATE, D, T, U, I, IPK, T658, T725, T639, T785> 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 94fad2aace..de37a2dea9 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/Template.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/Template.java
@@ -48,6 +48,7 @@ public class Template<
     BS   extends UpdatableRecord<BS>,
     L    extends TableRecord<L>,
     X    extends TableRecord<X>,
+    DATE extends UpdatableRecord<DATE>,
     D    extends UpdatableRecord<D>,
     T    extends UpdatableRecord<T>,
     U    extends TableRecord<U>,
@@ -57,9 +58,9 @@ public class Template<
     T725 extends UpdatableRecord<T725>,
     T639 extends UpdatableRecord<T639>,
     T785 extends TableRecord<T785>>
-extends BaseTest<A, B, S, B2S, BS, L, X, D, T, U, I, IPK, T658, T725, T639, T785> {
+extends BaseTest<A, B, S, B2S, BS, L, X, DATE, D, T, U, I, IPK, T658, T725, T639, T785> {
 
-    public Template(jOOQAbstractTest<A, B, S, B2S, BS, L, X, D, T, U, I, IPK, T658, T725, T639, T785> delegate) {
+    public Template(jOOQAbstractTest<A, B, S, B2S, BS, L, X, DATE, D, T, U, I, IPK, T658, T725, T639, T785> delegate) {
         super(delegate);
     }
 }
diff --git a/jOOQ-test/src/org/jooq/test/jOOQASETest.java b/jOOQ-test/src/org/jooq/test/jOOQASETest.java
index 87aed84e4b..31a485259a 100644
--- a/jOOQ-test/src/org/jooq/test/jOOQASETest.java
+++ b/jOOQ-test/src/org/jooq/test/jOOQASETest.java
@@ -32,6 +32,7 @@
 package org.jooq.test;
 
 import static org.jooq.test.ase.generatedclasses.Tables.T_BOOK_TO_BOOK_STORE;
+import static org.jooq.test.ase.generatedclasses.Tables.T_DATES;
 import static org.jooq.test.ase.generatedclasses.Tables.T_IDENTITY;
 import static org.jooq.test.ase.generatedclasses.Tables.T_IDENTITY_PK;
 import static org.jooq.test.ase.generatedclasses.Tables.V_AUTHOR;
@@ -69,6 +70,7 @@ import org.jooq.test.ase.generatedclasses.tables.records.TAuthorRecord;
 import org.jooq.test.ase.generatedclasses.tables.records.TBookRecord;
 import org.jooq.test.ase.generatedclasses.tables.records.TBookStoreRecord;
 import org.jooq.test.ase.generatedclasses.tables.records.TBookToBookStoreRecord;
+import org.jooq.test.ase.generatedclasses.tables.records.TDatesRecord;
 import org.jooq.test.ase.generatedclasses.tables.records.TIdentityPkRecord;
 import org.jooq.test.ase.generatedclasses.tables.records.TIdentityRecord;
 import org.jooq.test.ase.generatedclasses.tables.records.TTriggersRecord;
@@ -98,6 +100,7 @@ public class jOOQASETest extends jOOQAbstractTest<
         XUnusedRecord,
         VLibraryRecord,
         XUnusedRecord,
+        TDatesRecord,
         XUnusedRecord,
         TTriggersRecord,
         XUnusedRecord,
@@ -268,6 +271,11 @@ public class jOOQASETest extends jOOQAbstractTest<
         return null;
     }
 
+    @Override
+    protected Table<TDatesRecord> TDates() {
+        return T_DATES;
+    }
+
     @Override
     protected Table<T_639NumbersTableRecord> T639() {
         return T_639NumbersTable.T_639_NUMBERS_TABLE;
diff --git a/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java b/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java
index 5e08952c05..14684673e5 100644
--- a/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java
+++ b/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java
@@ -47,6 +47,8 @@ import java.sql.DriverManager;
 import java.sql.SQLException;
 import java.sql.SQLSyntaxErrorException;
 import java.sql.Statement;
+import java.sql.Time;
+import java.sql.Timestamp;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
@@ -137,9 +139,12 @@ public abstract class jOOQAbstractTest<
         // V_LIBRARY view
         L extends TableRecord<L>,
 
-        // X_UNUSED table
+        // T_ARRAYS table
         X extends TableRecord<X>,
 
+        // T_DATES table
+        DATE extends UpdatableRecord<DATE>,
+
         // T_DIRECTORY table
         D extends UpdatableRecord<D>,
 
@@ -490,6 +495,21 @@ public abstract class jOOQAbstractTest<
     protected abstract TableField<U, UInteger> TUnsigned_U_INT();
     protected abstract TableField<U, ULong> TUnsigned_U_LONG();
 
+    protected abstract Table<DATE> TDates();
+    protected final TableField<DATE, Integer> TDates_ID() {
+        return (TableField<DATE, Integer>) TDates().getField("ID");
+    }
+    protected final TableField<DATE, Date> TDates_D() {
+        return (TableField<DATE, Date>) TDates().getField("D");
+    }
+    protected final TableField<DATE, Time> TDates_T() {
+        return (TableField<DATE, Time>) TDates().getField("T");
+    }
+    protected final TableField<DATE, Timestamp> TDates_TS() {
+        return (TableField<DATE, Timestamp>) TDates().getField("TS");
+    }
+
+
     protected abstract Table<X> TArrays();
     protected abstract TableField<X, Integer> TArrays_ID();
     protected abstract TableField<X, String[]> TArrays_STRING();
diff --git a/jOOQ-test/src/org/jooq/test/jOOQDB2Test.java b/jOOQ-test/src/org/jooq/test/jOOQDB2Test.java
index 049c6612f3..37762aa26b 100644
--- a/jOOQ-test/src/org/jooq/test/jOOQDB2Test.java
+++ b/jOOQ-test/src/org/jooq/test/jOOQDB2Test.java
@@ -37,6 +37,7 @@
 package org.jooq.test;
 
 import static org.jooq.test.db2.generatedclasses.Tables.T_BOOK_TO_BOOK_STORE;
+import static org.jooq.test.db2.generatedclasses.Tables.T_DATES;
 import static org.jooq.test.db2.generatedclasses.Tables.T_IDENTITY;
 import static org.jooq.test.db2.generatedclasses.Tables.T_IDENTITY_PK;
 import static org.jooq.test.db2.generatedclasses.Tables.V_AUTHOR;
@@ -76,6 +77,7 @@ import org.jooq.test.db2.generatedclasses.tables.records.TAuthorRecord;
 import org.jooq.test.db2.generatedclasses.tables.records.TBookRecord;
 import org.jooq.test.db2.generatedclasses.tables.records.TBookStoreRecord;
 import org.jooq.test.db2.generatedclasses.tables.records.TBookToBookStoreRecord;
+import org.jooq.test.db2.generatedclasses.tables.records.TDatesRecord;
 import org.jooq.test.db2.generatedclasses.tables.records.TIdentityPkRecord;
 import org.jooq.test.db2.generatedclasses.tables.records.TIdentityRecord;
 import org.jooq.test.db2.generatedclasses.tables.records.TTriggersRecord;
@@ -105,6 +107,7 @@ public class jOOQDB2Test extends jOOQAbstractTest<
         XUnusedRecord,
         VLibraryRecord,
         XUnusedRecord,
+        TDatesRecord,
         XUnusedRecord,
         TTriggersRecord,
         XUnusedRecord,
@@ -350,6 +353,11 @@ public class jOOQDB2Test extends jOOQAbstractTest<
         return null;
     }
 
+    @Override
+    protected Table<TDatesRecord> TDates() {
+        return T_DATES;
+    }
+
     @Override
     protected Table<XUnusedRecord> TArrays() {
         return null;
diff --git a/jOOQ-test/src/org/jooq/test/jOOQDerbyTest.java b/jOOQ-test/src/org/jooq/test/jOOQDerbyTest.java
index e485e3d528..4350e26e28 100644
--- a/jOOQ-test/src/org/jooq/test/jOOQDerbyTest.java
+++ b/jOOQ-test/src/org/jooq/test/jOOQDerbyTest.java
@@ -37,6 +37,7 @@
 package org.jooq.test;
 
 import static org.jooq.test.derby.generatedclasses.Tables.T_BOOK_TO_BOOK_STORE;
+import static org.jooq.test.derby.generatedclasses.Tables.T_DATES;
 import static org.jooq.test.derby.generatedclasses.Tables.T_IDENTITY;
 import static org.jooq.test.derby.generatedclasses.Tables.T_IDENTITY_PK;
 import static org.jooq.test.derby.generatedclasses.Tables.V_AUTHOR;
@@ -75,6 +76,7 @@ import org.jooq.test.derby.generatedclasses.tables.records.TAuthorRecord;
 import org.jooq.test.derby.generatedclasses.tables.records.TBookRecord;
 import org.jooq.test.derby.generatedclasses.tables.records.TBookStoreRecord;
 import org.jooq.test.derby.generatedclasses.tables.records.TBookToBookStoreRecord;
+import org.jooq.test.derby.generatedclasses.tables.records.TDatesRecord;
 import org.jooq.test.derby.generatedclasses.tables.records.TIdentityPkRecord;
 import org.jooq.test.derby.generatedclasses.tables.records.TIdentityRecord;
 import org.jooq.test.derby.generatedclasses.tables.records.TTriggersRecord;
@@ -101,6 +103,7 @@ public class jOOQDerbyTest extends jOOQAbstractTest<
         XUnusedRecord,
         VLibraryRecord,
         XUnusedRecord,
+        TDatesRecord,
         XUnusedRecord,
         TTriggersRecord,
         XUnusedRecord,
@@ -341,6 +344,11 @@ public class jOOQDerbyTest extends jOOQAbstractTest<
         return null;
     }
 
+    @Override
+    protected Table<TDatesRecord> TDates() {
+        return T_DATES;
+    }
+
     @Override
     protected Table<XUnusedRecord> TArrays() {
         return null;
diff --git a/jOOQ-test/src/org/jooq/test/jOOQH2Test.java b/jOOQ-test/src/org/jooq/test/jOOQH2Test.java
index 9fd06ab045..541de79f1e 100644
--- a/jOOQ-test/src/org/jooq/test/jOOQH2Test.java
+++ b/jOOQ-test/src/org/jooq/test/jOOQH2Test.java
@@ -37,6 +37,7 @@
 package org.jooq.test;
 
 import static org.jooq.test.h2.generatedclasses.Tables.T_BOOK_TO_BOOK_STORE;
+import static org.jooq.test.h2.generatedclasses.Tables.T_DATES;
 import static org.jooq.test.h2.generatedclasses.Tables.T_IDENTITY;
 import static org.jooq.test.h2.generatedclasses.Tables.T_IDENTITY_PK;
 import static org.jooq.test.h2.generatedclasses.Tables.V_AUTHOR;
@@ -78,6 +79,7 @@ import org.jooq.test.h2.generatedclasses.tables.records.TAuthorRecord;
 import org.jooq.test.h2.generatedclasses.tables.records.TBookRecord;
 import org.jooq.test.h2.generatedclasses.tables.records.TBookStoreRecord;
 import org.jooq.test.h2.generatedclasses.tables.records.TBookToBookStoreRecord;
+import org.jooq.test.h2.generatedclasses.tables.records.TDatesRecord;
 import org.jooq.test.h2.generatedclasses.tables.records.TIdentityPkRecord;
 import org.jooq.test.h2.generatedclasses.tables.records.TIdentityRecord;
 import org.jooq.test.h2.generatedclasses.tables.records.TTriggersRecord;
@@ -106,6 +108,7 @@ public class jOOQH2Test extends jOOQAbstractTest<
         XUnusedRecord,
         VLibraryRecord,
         TArraysRecord,
+        TDatesRecord,
         XUnusedRecord,
         TTriggersRecord,
         XUnusedRecord,
@@ -346,6 +349,11 @@ public class jOOQH2Test extends jOOQAbstractTest<
         return null;
     }
 
+    @Override
+    protected Table<TDatesRecord> TDates() {
+        return T_DATES;
+    }
+
     @Override
     protected Table<TArraysRecord> TArrays() {
         return TArrays.T_ARRAYS;
diff --git a/jOOQ-test/src/org/jooq/test/jOOQHSQLDBTest.java b/jOOQ-test/src/org/jooq/test/jOOQHSQLDBTest.java
index ef433270de..1328563c95 100644
--- a/jOOQ-test/src/org/jooq/test/jOOQHSQLDBTest.java
+++ b/jOOQ-test/src/org/jooq/test/jOOQHSQLDBTest.java
@@ -45,6 +45,7 @@ import static org.jooq.test.hsqldb.generatedclasses.Tables.T_AUTHOR;
 import static org.jooq.test.hsqldb.generatedclasses.Tables.T_BOOK;
 import static org.jooq.test.hsqldb.generatedclasses.Tables.T_BOOK_STORE;
 import static org.jooq.test.hsqldb.generatedclasses.Tables.T_BOOK_TO_BOOK_STORE;
+import static org.jooq.test.hsqldb.generatedclasses.Tables.T_DATES;
 import static org.jooq.test.hsqldb.generatedclasses.Tables.T_IDENTITY;
 import static org.jooq.test.hsqldb.generatedclasses.Tables.T_IDENTITY_PK;
 import static org.jooq.test.hsqldb.generatedclasses.Tables.T_TRIGGERS;
@@ -75,6 +76,7 @@ import org.jooq.test.hsqldb.generatedclasses.tables.records.TAuthorRecord;
 import org.jooq.test.hsqldb.generatedclasses.tables.records.TBookRecord;
 import org.jooq.test.hsqldb.generatedclasses.tables.records.TBookStoreRecord;
 import org.jooq.test.hsqldb.generatedclasses.tables.records.TBookToBookStoreRecord;
+import org.jooq.test.hsqldb.generatedclasses.tables.records.TDatesRecord;
 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;
@@ -101,6 +103,7 @@ public class jOOQHSQLDBTest extends jOOQAbstractTest<
         XUnusedRecord,
         VLibraryRecord,
         TArraysRecord,
+        TDatesRecord,
         XUnusedRecord,
         TTriggersRecord,
         XUnusedRecord,
@@ -341,6 +344,11 @@ public class jOOQHSQLDBTest extends jOOQAbstractTest<
         return null;
     }
 
+    @Override
+    protected Table<TDatesRecord> TDates() {
+        return T_DATES;
+    }
+
     @Override
     protected Table<TArraysRecord> TArrays() {
         return T_ARRAYS;
diff --git a/jOOQ-test/src/org/jooq/test/jOOQHSQLDBTest2.java b/jOOQ-test/src/org/jooq/test/jOOQHSQLDBTest2.java
index d28b23d162..28d5c375c7 100644
--- a/jOOQ-test/src/org/jooq/test/jOOQHSQLDBTest2.java
+++ b/jOOQ-test/src/org/jooq/test/jOOQHSQLDBTest2.java
@@ -44,6 +44,7 @@ import static org.jooq.test.oracle.generatedclasses.test.Tables.T_AUTHOR;
 import static org.jooq.test.oracle.generatedclasses.test.Tables.T_BOOK;
 import static org.jooq.test.oracle.generatedclasses.test.Tables.T_BOOK_STORE;
 import static org.jooq.test.oracle.generatedclasses.test.Tables.T_BOOK_TO_BOOK_STORE;
+import static org.jooq.test.oracle.generatedclasses.test.Tables.T_DATES;
 import static org.jooq.test.oracle.generatedclasses.test.Tables.T_DIRECTORY;
 import static org.jooq.test.oracle.generatedclasses.test.Tables.T_TRIGGERS;
 import static org.jooq.test.oracle.generatedclasses.test.Tables.V_AUTHOR;
@@ -77,6 +78,7 @@ import org.jooq.test.oracle.generatedclasses.test.tables.records.TAuthorRecord;
 import org.jooq.test.oracle.generatedclasses.test.tables.records.TBookRecord;
 import org.jooq.test.oracle.generatedclasses.test.tables.records.TBookStoreRecord;
 import org.jooq.test.oracle.generatedclasses.test.tables.records.TBookToBookStoreRecord;
+import org.jooq.test.oracle.generatedclasses.test.tables.records.TDatesRecord;
 import org.jooq.test.oracle.generatedclasses.test.tables.records.TDirectoryRecord;
 import org.jooq.test.oracle.generatedclasses.test.tables.records.TTriggersRecord;
 import org.jooq.test.oracle.generatedclasses.test.tables.records.T_639NumbersTableRecord;
@@ -101,6 +103,7 @@ public class jOOQHSQLDBTest2 extends jOOQAbstractTest<
         XUnusedRecord,
         VLibraryRecord,
         TArraysRecord,
+        TDatesRecord,
         TDirectoryRecord,
         TTriggersRecord,
         XUnusedRecord,
@@ -347,6 +350,11 @@ public class jOOQHSQLDBTest2 extends jOOQAbstractTest<
         return null;
     }
 
+    @Override
+    protected Table<TDatesRecord> TDates() {
+        return T_DATES;
+    }
+
     @Override
     protected Table<TArraysRecord> TArrays() {
         return null;
diff --git a/jOOQ-test/src/org/jooq/test/jOOQIngresTest.java b/jOOQ-test/src/org/jooq/test/jOOQIngresTest.java
index 2caf5d7a0c..78c94b4670 100644
--- a/jOOQ-test/src/org/jooq/test/jOOQIngresTest.java
+++ b/jOOQ-test/src/org/jooq/test/jOOQIngresTest.java
@@ -37,6 +37,7 @@
 package org.jooq.test;
 
 import static org.jooq.test.ingres.generatedclasses.Tables.T_BOOK_TO_BOOK_STORE;
+import static org.jooq.test.ingres.generatedclasses.Tables.T_DATES;
 import static org.jooq.test.ingres.generatedclasses.Tables.T_IDENTITY;
 import static org.jooq.test.ingres.generatedclasses.Tables.T_IDENTITY_PK;
 import static org.jooq.test.ingres.generatedclasses.Tables.V_AUTHOR;
@@ -75,6 +76,7 @@ import org.jooq.test.ingres.generatedclasses.tables.records.TAuthorRecord;
 import org.jooq.test.ingres.generatedclasses.tables.records.TBookRecord;
 import org.jooq.test.ingres.generatedclasses.tables.records.TBookStoreRecord;
 import org.jooq.test.ingres.generatedclasses.tables.records.TBookToBookStoreRecord;
+import org.jooq.test.ingres.generatedclasses.tables.records.TDatesRecord;
 import org.jooq.test.ingres.generatedclasses.tables.records.TIdentityPkRecord;
 import org.jooq.test.ingres.generatedclasses.tables.records.TIdentityRecord;
 import org.jooq.test.ingres.generatedclasses.tables.records.TTriggersRecord;
@@ -102,6 +104,7 @@ public class jOOQIngresTest extends jOOQAbstractTest<
         XUnusedRecord,
         VLibraryRecord,
         XUnusedRecord,
+        TDatesRecord,
         XUnusedRecord,
         TTriggersRecord,
         XUnusedRecord,
@@ -342,6 +345,11 @@ public class jOOQIngresTest extends jOOQAbstractTest<
         return null;
     }
 
+    @Override
+    protected Table<TDatesRecord> TDates() {
+        return T_DATES;
+    }
+
     @Override
     protected Table<XUnusedRecord> TArrays() {
         return null;
diff --git a/jOOQ-test/src/org/jooq/test/jOOQMySQLTest.java b/jOOQ-test/src/org/jooq/test/jOOQMySQLTest.java
index caba42e7fe..9862d98efa 100644
--- a/jOOQ-test/src/org/jooq/test/jOOQMySQLTest.java
+++ b/jOOQ-test/src/org/jooq/test/jOOQMySQLTest.java
@@ -39,6 +39,7 @@ package org.jooq.test;
 import static junit.framework.Assert.assertNull;
 import static org.jooq.impl.Factory.val;
 import static org.jooq.test.mysql.generatedclasses.Tables.T_BOOK_TO_BOOK_STORE;
+import static org.jooq.test.mysql.generatedclasses.Tables.T_DATES;
 import static org.jooq.test.mysql.generatedclasses.Tables.T_IDENTITY_PK;
 import static org.jooq.test.mysql.generatedclasses.Tables.T_UNSIGNED;
 import static org.jooq.test.mysql.generatedclasses.Tables.V_AUTHOR;
@@ -95,6 +96,7 @@ import org.jooq.test.mysql.generatedclasses.tables.records.TAuthorRecord;
 import org.jooq.test.mysql.generatedclasses.tables.records.TBookRecord;
 import org.jooq.test.mysql.generatedclasses.tables.records.TBookStoreRecord;
 import org.jooq.test.mysql.generatedclasses.tables.records.TBookToBookStoreRecord;
+import org.jooq.test.mysql.generatedclasses.tables.records.TDatesRecord;
 import org.jooq.test.mysql.generatedclasses.tables.records.TIdentityPkRecord;
 import org.jooq.test.mysql.generatedclasses.tables.records.TTriggersRecord;
 import org.jooq.test.mysql.generatedclasses.tables.records.TUnsignedRecord;
@@ -125,6 +127,7 @@ public class jOOQMySQLTest extends jOOQAbstractTest<
         XUnusedRecord,
         VLibraryRecord,
         XUnusedRecord,
+        TDatesRecord,
         XUnusedRecord,
         TTriggersRecord,
         TUnsignedRecord,
@@ -365,6 +368,11 @@ public class jOOQMySQLTest extends jOOQAbstractTest<
         return TUnsigned.U_LONG;
     }
 
+    @Override
+    protected Table<TDatesRecord> TDates() {
+        return T_DATES;
+    }
+
     @Override
     protected Table<XUnusedRecord> TArrays() {
         return null;
diff --git a/jOOQ-test/src/org/jooq/test/jOOQMySQLTestSchemaRewrite.java b/jOOQ-test/src/org/jooq/test/jOOQMySQLTestSchemaRewrite.java
index 3bb4428aac..6f3554faeb 100644
--- a/jOOQ-test/src/org/jooq/test/jOOQMySQLTestSchemaRewrite.java
+++ b/jOOQ-test/src/org/jooq/test/jOOQMySQLTestSchemaRewrite.java
@@ -44,6 +44,7 @@ import static org.jooq.test.mysql2.generatedclasses.Tables.T_AUTHOR;
 import static org.jooq.test.mysql2.generatedclasses.Tables.T_BOOK;
 import static org.jooq.test.mysql2.generatedclasses.Tables.T_BOOK_STORE;
 import static org.jooq.test.mysql2.generatedclasses.Tables.T_BOOK_TO_BOOK_STORE;
+import static org.jooq.test.mysql2.generatedclasses.Tables.T_DATES;
 import static org.jooq.test.mysql2.generatedclasses.Tables.T_IDENTITY_PK;
 import static org.jooq.test.mysql2.generatedclasses.Tables.T_TRIGGERS;
 import static org.jooq.test.mysql2.generatedclasses.Tables.T_UNSIGNED;
@@ -71,6 +72,7 @@ import org.jooq.test.mysql2.generatedclasses.tables.records.TAuthorRecord;
 import org.jooq.test.mysql2.generatedclasses.tables.records.TBookRecord;
 import org.jooq.test.mysql2.generatedclasses.tables.records.TBookStoreRecord;
 import org.jooq.test.mysql2.generatedclasses.tables.records.TBookToBookStoreRecord;
+import org.jooq.test.mysql2.generatedclasses.tables.records.TDatesRecord;
 import org.jooq.test.mysql2.generatedclasses.tables.records.TIdentityPkRecord;
 import org.jooq.test.mysql2.generatedclasses.tables.records.TTriggersRecord;
 import org.jooq.test.mysql2.generatedclasses.tables.records.TUnsignedRecord;
@@ -98,6 +100,7 @@ public class jOOQMySQLTestSchemaRewrite extends jOOQAbstractTest<
         XUnusedRecord,
         VLibraryRecord,
         XUnusedRecord,
+        TDatesRecord,
         XUnusedRecord,
         TTriggersRecord,
         TUnsignedRecord,
@@ -343,6 +346,11 @@ public class jOOQMySQLTestSchemaRewrite extends jOOQAbstractTest<
         return T_UNSIGNED.U_LONG;
     }
 
+    @Override
+    protected Table<TDatesRecord> TDates() {
+        return T_DATES;
+    }
+
     @Override
     protected Table<XUnusedRecord> TArrays() {
         return null;
diff --git a/jOOQ-test/src/org/jooq/test/jOOQOracleTest.java b/jOOQ-test/src/org/jooq/test/jOOQOracleTest.java
index 330891e194..a1a5fe6a29 100644
--- a/jOOQ-test/src/org/jooq/test/jOOQOracleTest.java
+++ b/jOOQ-test/src/org/jooq/test/jOOQOracleTest.java
@@ -65,6 +65,7 @@ import static org.jooq.test.oracle.generatedclasses.test.Tables.T_AUTHOR;
 import static org.jooq.test.oracle.generatedclasses.test.Tables.T_BOOK;
 import static org.jooq.test.oracle.generatedclasses.test.Tables.T_BOOK_STORE;
 import static org.jooq.test.oracle.generatedclasses.test.Tables.T_BOOK_TO_BOOK_STORE;
+import static org.jooq.test.oracle.generatedclasses.test.Tables.T_DATES;
 import static org.jooq.test.oracle.generatedclasses.test.Tables.T_DIRECTORY;
 import static org.jooq.test.oracle.generatedclasses.test.Tables.T_TRIGGERS;
 import static org.jooq.test.oracle.generatedclasses.test.Tables.V_AUTHOR;
@@ -116,6 +117,7 @@ import org.jooq.test.oracle.generatedclasses.test.tables.records.TAuthorRecord;
 import org.jooq.test.oracle.generatedclasses.test.tables.records.TBookRecord;
 import org.jooq.test.oracle.generatedclasses.test.tables.records.TBookStoreRecord;
 import org.jooq.test.oracle.generatedclasses.test.tables.records.TBookToBookStoreRecord;
+import org.jooq.test.oracle.generatedclasses.test.tables.records.TDatesRecord;
 import org.jooq.test.oracle.generatedclasses.test.tables.records.TDirectoryRecord;
 import org.jooq.test.oracle.generatedclasses.test.tables.records.TTriggersRecord;
 import org.jooq.test.oracle.generatedclasses.test.tables.records.T_639NumbersTableRecord;
@@ -166,6 +168,7 @@ public class jOOQOracleTest extends jOOQAbstractTest<
         TBookSaleRecord,
         VLibraryRecord,
         TArraysRecord,
+        TDatesRecord,
         TDirectoryRecord,
         TTriggersRecord,
         XUnusedRecord,
@@ -352,6 +355,11 @@ public class jOOQOracleTest extends jOOQAbstractTest<
         return null;
     }
 
+    @Override
+    protected Table<TDatesRecord> TDates() {
+        return T_DATES;
+    }
+
     @Override
     protected Table<T_658RefRecord> T658() {
         return T_658_REF;
diff --git a/jOOQ-test/src/org/jooq/test/jOOQPostgresTest.java b/jOOQ-test/src/org/jooq/test/jOOQPostgresTest.java
index 75a0ab641e..743526d954 100644
--- a/jOOQ-test/src/org/jooq/test/jOOQPostgresTest.java
+++ b/jOOQ-test/src/org/jooq/test/jOOQPostgresTest.java
@@ -46,6 +46,7 @@ import static org.jooq.test.postgres.generatedclasses.Tables.T_AUTHOR;
 import static org.jooq.test.postgres.generatedclasses.Tables.T_BOOK;
 import static org.jooq.test.postgres.generatedclasses.Tables.T_BOOK_STORE;
 import static org.jooq.test.postgres.generatedclasses.Tables.T_BOOK_TO_BOOK_STORE;
+import static org.jooq.test.postgres.generatedclasses.Tables.T_DATES;
 import static org.jooq.test.postgres.generatedclasses.Tables.T_IDENTITY;
 import static org.jooq.test.postgres.generatedclasses.Tables.T_IDENTITY_PK;
 import static org.jooq.test.postgres.generatedclasses.Tables.T_TRIGGERS;
@@ -79,6 +80,7 @@ import org.jooq.test.postgres.generatedclasses.tables.records.TAuthorRecord;
 import org.jooq.test.postgres.generatedclasses.tables.records.TBookRecord;
 import org.jooq.test.postgres.generatedclasses.tables.records.TBookStoreRecord;
 import org.jooq.test.postgres.generatedclasses.tables.records.TBookToBookStoreRecord;
+import org.jooq.test.postgres.generatedclasses.tables.records.TDatesRecord;
 import org.jooq.test.postgres.generatedclasses.tables.records.TIdentityPkRecord;
 import org.jooq.test.postgres.generatedclasses.tables.records.TIdentityRecord;
 import org.jooq.test.postgres.generatedclasses.tables.records.TTriggersRecord;
@@ -110,6 +112,7 @@ public class jOOQPostgresTest extends jOOQAbstractTest<
         XUnusedRecord,
         VLibraryRecord,
         TArraysRecord,
+        TDatesRecord,
         XUnusedRecord,
         TTriggersRecord,
         XUnusedRecord,
@@ -275,6 +278,11 @@ public class jOOQPostgresTest extends jOOQAbstractTest<
         return null;
     }
 
+    @Override
+    protected Table<TDatesRecord> TDates() {
+        return T_DATES;
+    }
+
     @Override
     protected Table<T_658RefRecord> T658() {
         return T_658_REF;
diff --git a/jOOQ-test/src/org/jooq/test/jOOQSQLServerTest.java b/jOOQ-test/src/org/jooq/test/jOOQSQLServerTest.java
index ab4474d220..c0a2b54c26 100644
--- a/jOOQ-test/src/org/jooq/test/jOOQSQLServerTest.java
+++ b/jOOQ-test/src/org/jooq/test/jOOQSQLServerTest.java
@@ -43,6 +43,7 @@ import static org.jooq.test.sqlserver.generatedclasses.Tables.T_AUTHOR;
 import static org.jooq.test.sqlserver.generatedclasses.Tables.T_BOOK;
 import static org.jooq.test.sqlserver.generatedclasses.Tables.T_BOOK_STORE;
 import static org.jooq.test.sqlserver.generatedclasses.Tables.T_BOOK_TO_BOOK_STORE;
+import static org.jooq.test.sqlserver.generatedclasses.Tables.T_DATES;
 import static org.jooq.test.sqlserver.generatedclasses.Tables.T_IDENTITY;
 import static org.jooq.test.sqlserver.generatedclasses.Tables.T_IDENTITY_PK;
 import static org.jooq.test.sqlserver.generatedclasses.Tables.T_TRIGGERS;
@@ -72,6 +73,7 @@ import org.jooq.test.sqlserver.generatedclasses.tables.records.TAuthorRecord;
 import org.jooq.test.sqlserver.generatedclasses.tables.records.TBookRecord;
 import org.jooq.test.sqlserver.generatedclasses.tables.records.TBookStoreRecord;
 import org.jooq.test.sqlserver.generatedclasses.tables.records.TBookToBookStoreRecord;
+import org.jooq.test.sqlserver.generatedclasses.tables.records.TDatesRecord;
 import org.jooq.test.sqlserver.generatedclasses.tables.records.TIdentityPkRecord;
 import org.jooq.test.sqlserver.generatedclasses.tables.records.TIdentityRecord;
 import org.jooq.test.sqlserver.generatedclasses.tables.records.TTriggersRecord;
@@ -98,6 +100,7 @@ public class jOOQSQLServerTest extends jOOQAbstractTest<
         XUnusedRecord,
         VLibraryRecord,
         XUnusedRecord,
+        TDatesRecord,
         XUnusedRecord,
         TTriggersRecord,
         XUnusedRecord,
@@ -338,6 +341,11 @@ public class jOOQSQLServerTest extends jOOQAbstractTest<
         return null;
     }
 
+    @Override
+    protected Table<TDatesRecord> TDates() {
+        return T_DATES;
+    }
+
     @Override
     protected Table<XUnusedRecord> TArrays() {
         return null;
diff --git a/jOOQ-test/src/org/jooq/test/jOOQSQLiteTest.java b/jOOQ-test/src/org/jooq/test/jOOQSQLiteTest.java
index b523c259b3..52f2dcf808 100644
--- a/jOOQ-test/src/org/jooq/test/jOOQSQLiteTest.java
+++ b/jOOQ-test/src/org/jooq/test/jOOQSQLiteTest.java
@@ -37,6 +37,7 @@
 package org.jooq.test;
 
 import static org.jooq.test.sqlite.generatedclasses.Tables.T_BOOK_TO_BOOK_STORE;
+import static org.jooq.test.sqlite.generatedclasses.Tables.T_DATES;
 import static org.jooq.test.sqlite.generatedclasses.Tables.V_AUTHOR;
 import static org.jooq.test.sqlite.generatedclasses.Tables.V_BOOK;
 
@@ -69,6 +70,7 @@ import org.jooq.test.sqlite.generatedclasses.tables.records.TAuthorRecord;
 import org.jooq.test.sqlite.generatedclasses.tables.records.TBookRecord;
 import org.jooq.test.sqlite.generatedclasses.tables.records.TBookStoreRecord;
 import org.jooq.test.sqlite.generatedclasses.tables.records.TBookToBookStoreRecord;
+import org.jooq.test.sqlite.generatedclasses.tables.records.TDatesRecord;
 import org.jooq.test.sqlite.generatedclasses.tables.records.TTriggersRecord;
 import org.jooq.test.sqlite.generatedclasses.tables.records.T_639NumbersTableRecord;
 import org.jooq.test.sqlite.generatedclasses.tables.records.T_658RefRecord;
@@ -96,6 +98,7 @@ public class jOOQSQLiteTest extends jOOQAbstractTest<
         XUnusedRecord,
         VLibraryRecord,
         XUnusedRecord,
+        TDatesRecord,
         XUnusedRecord,
         TTriggersRecord,
         XUnusedRecord,
@@ -336,6 +339,11 @@ public class jOOQSQLiteTest extends jOOQAbstractTest<
         return null;
     }
 
+    @Override
+    protected Table<TDatesRecord> TDates() {
+        return T_DATES;
+    }
+
     @Override
     protected Table<XUnusedRecord> TArrays() {
         return null;
diff --git a/jOOQ-test/src/org/jooq/test/jOOQSybaseTest.java b/jOOQ-test/src/org/jooq/test/jOOQSybaseTest.java
index a1fb89d462..a338daf760 100644
--- a/jOOQ-test/src/org/jooq/test/jOOQSybaseTest.java
+++ b/jOOQ-test/src/org/jooq/test/jOOQSybaseTest.java
@@ -39,6 +39,7 @@ import static org.jooq.test.sybase.generatedclasses.Tables.T_AUTHOR;
 import static org.jooq.test.sybase.generatedclasses.Tables.T_BOOK;
 import static org.jooq.test.sybase.generatedclasses.Tables.T_BOOK_STORE;
 import static org.jooq.test.sybase.generatedclasses.Tables.T_BOOK_TO_BOOK_STORE;
+import static org.jooq.test.sybase.generatedclasses.Tables.T_DATES;
 import static org.jooq.test.sybase.generatedclasses.Tables.T_IDENTITY;
 import static org.jooq.test.sybase.generatedclasses.Tables.T_IDENTITY_PK;
 import static org.jooq.test.sybase.generatedclasses.Tables.T_TRIGGERS;
@@ -68,6 +69,7 @@ import org.jooq.test.sybase.generatedclasses.tables.records.TAuthorRecord;
 import org.jooq.test.sybase.generatedclasses.tables.records.TBookRecord;
 import org.jooq.test.sybase.generatedclasses.tables.records.TBookStoreRecord;
 import org.jooq.test.sybase.generatedclasses.tables.records.TBookToBookStoreRecord;
+import org.jooq.test.sybase.generatedclasses.tables.records.TDatesRecord;
 import org.jooq.test.sybase.generatedclasses.tables.records.TIdentityPkRecord;
 import org.jooq.test.sybase.generatedclasses.tables.records.TIdentityRecord;
 import org.jooq.test.sybase.generatedclasses.tables.records.TTriggersRecord;
@@ -97,6 +99,7 @@ public class jOOQSybaseTest extends jOOQAbstractTest<
         XUnusedRecord,
         VLibraryRecord,
         XUnusedRecord,
+        TDatesRecord,
         XUnusedRecord,
         TTriggersRecord,
         XUnusedRecord,
@@ -268,6 +271,11 @@ public class jOOQSybaseTest extends jOOQAbstractTest<
         return null;
     }
 
+    @Override
+    protected Table<TDatesRecord> TDates() {
+        return T_DATES;
+    }
+
     @Override
     protected Table<T_639NumbersTableRecord> T639() {
         return T_639_NUMBERS_TABLE;