diff --git a/jOOQ/src/main/java/org/jooq/impl/Abs.java b/jOOQ/src/main/java/org/jooq/impl/Abs.java
index 1dea61ee09..895393aa68 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Abs.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Abs.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/Acos.java b/jOOQ/src/main/java/org/jooq/impl/Acos.java
index f9c8fae2ac..638f415ba0 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Acos.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Acos.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/AlterDatabaseImpl.java b/jOOQ/src/main/java/org/jooq/impl/AlterDatabaseImpl.java
index 0c0f9affe2..bee00d6313 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AlterDatabaseImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AlterDatabaseImpl.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/AlterDomainImpl.java b/jOOQ/src/main/java/org/jooq/impl/AlterDomainImpl.java
index 59ab876025..7238e9d30c 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AlterDomainImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AlterDomainImpl.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/AlterIndexImpl.java b/jOOQ/src/main/java/org/jooq/impl/AlterIndexImpl.java
index 2d4393c611..bf695ebf8d 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AlterIndexImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AlterIndexImpl.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/AlterSchemaImpl.java b/jOOQ/src/main/java/org/jooq/impl/AlterSchemaImpl.java
index 0059fe33d9..d1c535fa96 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AlterSchemaImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AlterSchemaImpl.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/AlterSequenceImpl.java b/jOOQ/src/main/java/org/jooq/impl/AlterSequenceImpl.java
index 18f3ccc8dd..c013adfde8 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AlterSequenceImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AlterSequenceImpl.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/AlterTypeImpl.java b/jOOQ/src/main/java/org/jooq/impl/AlterTypeImpl.java
index 37183003d8..747a6b5b00 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AlterTypeImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AlterTypeImpl.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/AlterViewImpl.java b/jOOQ/src/main/java/org/jooq/impl/AlterViewImpl.java
index 1812039311..665d9045e5 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AlterViewImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AlterViewImpl.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/Ascii.java b/jOOQ/src/main/java/org/jooq/impl/Ascii.java
index 934e12fb55..0ec52ab8b1 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Ascii.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Ascii.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/Asin.java b/jOOQ/src/main/java/org/jooq/impl/Asin.java
index c16bfcb494..aa3a053ee9 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Asin.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Asin.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/Atan.java b/jOOQ/src/main/java/org/jooq/impl/Atan.java
index 4b177bc056..86b1ec0978 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Atan.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Atan.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/Atan2.java b/jOOQ/src/main/java/org/jooq/impl/Atan2.java
index e224a938f5..59dc511804 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Atan2.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Atan2.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/BitLength.java b/jOOQ/src/main/java/org/jooq/impl/BitLength.java
index a24d3cb356..fdf3e3d435 100644
--- a/jOOQ/src/main/java/org/jooq/impl/BitLength.java
+++ b/jOOQ/src/main/java/org/jooq/impl/BitLength.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/Ceil.java b/jOOQ/src/main/java/org/jooq/impl/Ceil.java
index a3b86a18f6..731c40ee9b 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Ceil.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Ceil.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/CharLength.java b/jOOQ/src/main/java/org/jooq/impl/CharLength.java
index 2e43898806..ee7d15278f 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CharLength.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CharLength.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/Chr.java b/jOOQ/src/main/java/org/jooq/impl/Chr.java
index d0b6885628..4c1fdc1e5b 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Chr.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Chr.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/CommentOnImpl.java b/jOOQ/src/main/java/org/jooq/impl/CommentOnImpl.java
index c75e668df7..a60e6a625e 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CommentOnImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CommentOnImpl.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/ConnectByIsCycle.java b/jOOQ/src/main/java/org/jooq/impl/ConnectByIsCycle.java
index 2dbfe77f7e..cc1cb0edc3 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ConnectByIsCycle.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ConnectByIsCycle.java
@@ -101,5 +101,6 @@ package org.jooq.impl;
 
 
 
+
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/ConnectByIsLeaf.java b/jOOQ/src/main/java/org/jooq/impl/ConnectByIsLeaf.java
index 2dbfe77f7e..cc1cb0edc3 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ConnectByIsLeaf.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ConnectByIsLeaf.java
@@ -101,5 +101,6 @@ package org.jooq.impl;
 
 
 
+
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/ConnectByRoot.java b/jOOQ/src/main/java/org/jooq/impl/ConnectByRoot.java
index af6fca581a..9fd03cbd74 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ConnectByRoot.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ConnectByRoot.java
@@ -109,5 +109,6 @@ package org.jooq.impl;
 
 
 
+
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Cos.java b/jOOQ/src/main/java/org/jooq/impl/Cos.java
index b6980bddc6..67fd6f05f9 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Cos.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Cos.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/Cosh.java b/jOOQ/src/main/java/org/jooq/impl/Cosh.java
index dda6a4d524..f82ad67161 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Cosh.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Cosh.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/Cot.java b/jOOQ/src/main/java/org/jooq/impl/Cot.java
index 3e31e26815..913f5a56b3 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Cot.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Cot.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/Coth.java b/jOOQ/src/main/java/org/jooq/impl/Coth.java
index 58b5075763..c8e2a24a6e 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Coth.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Coth.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/CovarPop.java b/jOOQ/src/main/java/org/jooq/impl/CovarPop.java
index fa8cf790ea..0b0bbe012b 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CovarPop.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CovarPop.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/CovarSamp.java b/jOOQ/src/main/java/org/jooq/impl/CovarSamp.java
index 2958514472..d1096b08ba 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CovarSamp.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CovarSamp.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateDatabaseImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateDatabaseImpl.java
index 8faebf1c32..361c2d80a9 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CreateDatabaseImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CreateDatabaseImpl.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateDomainImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateDomainImpl.java
index f3afa1a6be..ee3d8922f5 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CreateDomainImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CreateDomainImpl.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateFunctionImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateFunctionImpl.java
index 4bdfd4cd54..accf43220d 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CreateFunctionImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CreateFunctionImpl.java
@@ -221,6 +221,12 @@ package org.jooq.impl;
 
 
 
+
+
+
+
+
+
 
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateIndexImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateIndexImpl.java
index 9576878c0f..127d3df84b 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CreateIndexImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CreateIndexImpl.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateProcedureImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateProcedureImpl.java
index c9bdd7fa76..ac9aa2a52e 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CreateProcedureImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CreateProcedureImpl.java
@@ -235,6 +235,14 @@ package org.jooq.impl;
 
 
 
+
+
+
+
+
+
+
+
 
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateSchemaImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateSchemaImpl.java
index 1cf897a614..baeaff75bc 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CreateSchemaImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CreateSchemaImpl.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateSequenceImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateSequenceImpl.java
index 212a3860a5..3345ee6eb0 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CreateSequenceImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CreateSequenceImpl.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateTriggerImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateTriggerImpl.java
index 71cc2d7f86..4f38e887aa 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CreateTriggerImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CreateTriggerImpl.java
@@ -528,5 +528,6 @@ package org.jooq.impl;
 
 
 
+
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/CurrentCatalog.java b/jOOQ/src/main/java/org/jooq/impl/CurrentCatalog.java
index 29830984d9..03d6d3ac10 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CurrentCatalog.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CurrentCatalog.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/CurrentSchema.java b/jOOQ/src/main/java/org/jooq/impl/CurrentSchema.java
index fc9c0492b2..4c064edc5e 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CurrentSchema.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CurrentSchema.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/CurrentUser.java b/jOOQ/src/main/java/org/jooq/impl/CurrentUser.java
index b35bab325e..4a4bc2db2d 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CurrentUser.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CurrentUser.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/Degrees.java b/jOOQ/src/main/java/org/jooq/impl/Degrees.java
index 87d787951e..bf01233668 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Degrees.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Degrees.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/Deleting.java b/jOOQ/src/main/java/org/jooq/impl/Deleting.java
index 5773848222..e55bd2407b 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Deleting.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Deleting.java
@@ -97,5 +97,6 @@ package org.jooq.impl;
 
 
 
+
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Digits.java b/jOOQ/src/main/java/org/jooq/impl/Digits.java
index 862e9ba640..42a0766b4a 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Digits.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Digits.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/DropDatabaseImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropDatabaseImpl.java
index 3ff681af78..32ae62d3ab 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DropDatabaseImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DropDatabaseImpl.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/DropDomainImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropDomainImpl.java
index 77e57d5dcb..839d69aa44 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DropDomainImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DropDomainImpl.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/DropFunctionImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropFunctionImpl.java
index 7b0dded612..d55cfe01d1 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DropFunctionImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DropFunctionImpl.java
@@ -105,5 +105,6 @@ package org.jooq.impl;
 
 
 
+
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/DropIndexImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropIndexImpl.java
index 95b1e209be..272a381935 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DropIndexImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DropIndexImpl.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/DropProcedureImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropProcedureImpl.java
index 7b0dded612..d55cfe01d1 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DropProcedureImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DropProcedureImpl.java
@@ -105,5 +105,6 @@ package org.jooq.impl;
 
 
 
+
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/DropSchemaImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropSchemaImpl.java
index 3cc495e83e..89e60923c3 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DropSchemaImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DropSchemaImpl.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/DropSequenceImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropSequenceImpl.java
index 85cd206ec7..add0dc6135 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DropSequenceImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DropSequenceImpl.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/DropTableImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropTableImpl.java
index 178bdc2ecc..7a62130cc6 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DropTableImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DropTableImpl.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/DropTriggerImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropTriggerImpl.java
index 2d870d65b2..b9aa59cabe 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DropTriggerImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DropTriggerImpl.java
@@ -119,5 +119,6 @@ package org.jooq.impl;
 
 
 
+
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/DropViewImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropViewImpl.java
index e2950820d5..322af54879 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DropViewImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DropViewImpl.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/Euler.java b/jOOQ/src/main/java/org/jooq/impl/Euler.java
index be30a64a8a..c21aec9404 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Euler.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Euler.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/Exp.java b/jOOQ/src/main/java/org/jooq/impl/Exp.java
index cd0ba7bf81..202488e485 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Exp.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Exp.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/Floor.java b/jOOQ/src/main/java/org/jooq/impl/Floor.java
index 724873ea6e..bb2942322c 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Floor.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Floor.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/GrantImpl.java b/jOOQ/src/main/java/org/jooq/impl/GrantImpl.java
index 1c83f3db57..59def92ac6 100644
--- a/jOOQ/src/main/java/org/jooq/impl/GrantImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/GrantImpl.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/Inserting.java b/jOOQ/src/main/java/org/jooq/impl/Inserting.java
index 5773848222..e55bd2407b 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Inserting.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Inserting.java
@@ -97,5 +97,6 @@ package org.jooq.impl;
 
 
 
+
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/LTrim.java b/jOOQ/src/main/java/org/jooq/impl/LTrim.java
index 27409b6d19..df6879a8d0 100644
--- a/jOOQ/src/main/java/org/jooq/impl/LTrim.java
+++ b/jOOQ/src/main/java/org/jooq/impl/LTrim.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/Left.java b/jOOQ/src/main/java/org/jooq/impl/Left.java
index 180d8960c3..db1bc71d8f 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Left.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Left.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/Level.java b/jOOQ/src/main/java/org/jooq/impl/Level.java
index 2dbfe77f7e..cc1cb0edc3 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Level.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Level.java
@@ -101,5 +101,6 @@ package org.jooq.impl;
 
 
 
+
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Log.java b/jOOQ/src/main/java/org/jooq/impl/Log.java
index 04527c9b20..8b8fe17287 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Log.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Log.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/Log10.java b/jOOQ/src/main/java/org/jooq/impl/Log10.java
index cb7dcd2b4c..3ddef7fed8 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Log10.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Log10.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/Lower.java b/jOOQ/src/main/java/org/jooq/impl/Lower.java
index fdf64a93f0..a332a590b7 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Lower.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Lower.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/Lpad.java b/jOOQ/src/main/java/org/jooq/impl/Lpad.java
index 0f2fc22cc6..773357af21 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Lpad.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Lpad.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/MD5.java b/jOOQ/src/main/java/org/jooq/impl/MD5.java
index 4c1dfd1f0f..0e611262db 100644
--- a/jOOQ/src/main/java/org/jooq/impl/MD5.java
+++ b/jOOQ/src/main/java/org/jooq/impl/MD5.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/Median.java b/jOOQ/src/main/java/org/jooq/impl/Median.java
index 80de98d484..424792fcbe 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Median.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Median.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/OctetLength.java b/jOOQ/src/main/java/org/jooq/impl/OctetLength.java
index 7c00973bc3..98207b6578 100644
--- a/jOOQ/src/main/java/org/jooq/impl/OctetLength.java
+++ b/jOOQ/src/main/java/org/jooq/impl/OctetLength.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/Overlay.java b/jOOQ/src/main/java/org/jooq/impl/Overlay.java
index 53fda874e9..4e751e7e58 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Overlay.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Overlay.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/Pi.java b/jOOQ/src/main/java/org/jooq/impl/Pi.java
index 6b59346bc8..d6898a4f6e 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Pi.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Pi.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/Position.java b/jOOQ/src/main/java/org/jooq/impl/Position.java
index b0058e9e58..041c720b54 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Position.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Position.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/Power.java b/jOOQ/src/main/java/org/jooq/impl/Power.java
index 85e3560313..5362e52aa3 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Power.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Power.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/Prior.java b/jOOQ/src/main/java/org/jooq/impl/Prior.java
index 342f217166..01c6eb9677 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Prior.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Prior.java
@@ -131,5 +131,6 @@ package org.jooq.impl;
 
 
 
+
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/RTrim.java b/jOOQ/src/main/java/org/jooq/impl/RTrim.java
index 47aba646b4..d71cf264be 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RTrim.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RTrim.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/Radians.java b/jOOQ/src/main/java/org/jooq/impl/Radians.java
index f5bf410d83..790a4f72d6 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Radians.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Radians.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/Rand.java b/jOOQ/src/main/java/org/jooq/impl/Rand.java
index efe0b4ad98..d2e30700e6 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Rand.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Rand.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/RegrAvgx.java b/jOOQ/src/main/java/org/jooq/impl/RegrAvgx.java
index d1954d2d2a..9a89b91d97 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RegrAvgx.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RegrAvgx.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/RegrAvgy.java b/jOOQ/src/main/java/org/jooq/impl/RegrAvgy.java
index 4cde718016..373df1d44e 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RegrAvgy.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RegrAvgy.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/RegrCount.java b/jOOQ/src/main/java/org/jooq/impl/RegrCount.java
index 0aaf94dd5a..16dc9c307f 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RegrCount.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RegrCount.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/RegrIntercept.java b/jOOQ/src/main/java/org/jooq/impl/RegrIntercept.java
index 1a8aff62e4..44aff90dbd 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RegrIntercept.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RegrIntercept.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/RegrR2.java b/jOOQ/src/main/java/org/jooq/impl/RegrR2.java
index aa359dbf39..d5b575f6e9 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RegrR2.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RegrR2.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/RegrSlope.java b/jOOQ/src/main/java/org/jooq/impl/RegrSlope.java
index 9fec8c4fe1..136d5849f2 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RegrSlope.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RegrSlope.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/RegrSxx.java b/jOOQ/src/main/java/org/jooq/impl/RegrSxx.java
index 1b84d40946..504838ea71 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RegrSxx.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RegrSxx.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/RegrSxy.java b/jOOQ/src/main/java/org/jooq/impl/RegrSxy.java
index a9fa19aed8..534d2a603e 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RegrSxy.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RegrSxy.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/RegrSyy.java b/jOOQ/src/main/java/org/jooq/impl/RegrSyy.java
index 7618f30446..8297ab5af2 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RegrSyy.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RegrSyy.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/Repeat.java b/jOOQ/src/main/java/org/jooq/impl/Repeat.java
index f2da003fce..cde6f9f058 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Repeat.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Repeat.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/Replace.java b/jOOQ/src/main/java/org/jooq/impl/Replace.java
index 4624b16604..7d3bee8db7 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Replace.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Replace.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/Return.java b/jOOQ/src/main/java/org/jooq/impl/Return.java
index 60dc5a3af4..ce86fab08e 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Return.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Return.java
@@ -122,5 +122,6 @@ package org.jooq.impl;
 
 
 
+
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Reverse.java b/jOOQ/src/main/java/org/jooq/impl/Reverse.java
index cbe14dd987..d1d0b41e67 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Reverse.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Reverse.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/RevokeImpl.java b/jOOQ/src/main/java/org/jooq/impl/RevokeImpl.java
index 9c96f95ce7..d539b5c0ae 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RevokeImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RevokeImpl.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/Right.java b/jOOQ/src/main/java/org/jooq/impl/Right.java
index 026584a8fb..fc4e1f257b 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Right.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Right.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/Round.java b/jOOQ/src/main/java/org/jooq/impl/Round.java
index 875ac16221..7977b0a223 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Round.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Round.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/Rownum.java b/jOOQ/src/main/java/org/jooq/impl/Rownum.java
index 676ad0d4e7..2f9021ae84 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Rownum.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Rownum.java
@@ -112,5 +112,6 @@ package org.jooq.impl;
 
 
 
+
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Rpad.java b/jOOQ/src/main/java/org/jooq/impl/Rpad.java
index 2e33b22a91..3c592f2e84 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Rpad.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Rpad.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/SetCatalog.java b/jOOQ/src/main/java/org/jooq/impl/SetCatalog.java
index e7c0c2733e..75a745bfe1 100644
--- a/jOOQ/src/main/java/org/jooq/impl/SetCatalog.java
+++ b/jOOQ/src/main/java/org/jooq/impl/SetCatalog.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/SetCommand.java b/jOOQ/src/main/java/org/jooq/impl/SetCommand.java
index caf20edcb8..8a12f1e46b 100644
--- a/jOOQ/src/main/java/org/jooq/impl/SetCommand.java
+++ b/jOOQ/src/main/java/org/jooq/impl/SetCommand.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/SetSchema.java b/jOOQ/src/main/java/org/jooq/impl/SetSchema.java
index 67fdd0b522..9f8eb2c045 100644
--- a/jOOQ/src/main/java/org/jooq/impl/SetSchema.java
+++ b/jOOQ/src/main/java/org/jooq/impl/SetSchema.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/Sign.java b/jOOQ/src/main/java/org/jooq/impl/Sign.java
index 41d112d904..d96dd10ada 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Sign.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Sign.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/Signal.java b/jOOQ/src/main/java/org/jooq/impl/Signal.java
index f8b34fa1f5..83cf23b4d9 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Signal.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Signal.java
@@ -157,5 +157,6 @@ package org.jooq.impl;
 
 
 
+
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Sin.java b/jOOQ/src/main/java/org/jooq/impl/Sin.java
index 254c9762bf..bb9687c47b 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Sin.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Sin.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/Sinh.java b/jOOQ/src/main/java/org/jooq/impl/Sinh.java
index 6426ce6db8..4233721399 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Sinh.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Sinh.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/Space.java b/jOOQ/src/main/java/org/jooq/impl/Space.java
index b9bc4a9513..7a983dc6e7 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Space.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Space.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/SplitPart.java b/jOOQ/src/main/java/org/jooq/impl/SplitPart.java
index 256df3c877..334256a904 100644
--- a/jOOQ/src/main/java/org/jooq/impl/SplitPart.java
+++ b/jOOQ/src/main/java/org/jooq/impl/SplitPart.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/Sqrt.java b/jOOQ/src/main/java/org/jooq/impl/Sqrt.java
index e87cb3b5da..d793d30894 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Sqrt.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Sqrt.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/Square.java b/jOOQ/src/main/java/org/jooq/impl/Square.java
index 3ed03146aa..0721d5809e 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Square.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Square.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/StddevPop.java b/jOOQ/src/main/java/org/jooq/impl/StddevPop.java
index e619f80449..95cc8aceb8 100644
--- a/jOOQ/src/main/java/org/jooq/impl/StddevPop.java
+++ b/jOOQ/src/main/java/org/jooq/impl/StddevPop.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/StddevSamp.java b/jOOQ/src/main/java/org/jooq/impl/StddevSamp.java
index 8b2556ccfd..db39f0ffa2 100644
--- a/jOOQ/src/main/java/org/jooq/impl/StddevSamp.java
+++ b/jOOQ/src/main/java/org/jooq/impl/StddevSamp.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/Substring.java b/jOOQ/src/main/java/org/jooq/impl/Substring.java
index 631f0d24b0..4ac0659650 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Substring.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Substring.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/SysConnectByPath.java b/jOOQ/src/main/java/org/jooq/impl/SysConnectByPath.java
index 2f9021ae84..f7bc570ad1 100644
--- a/jOOQ/src/main/java/org/jooq/impl/SysConnectByPath.java
+++ b/jOOQ/src/main/java/org/jooq/impl/SysConnectByPath.java
@@ -113,5 +113,6 @@ package org.jooq.impl;
 
 
 
+
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Tan.java b/jOOQ/src/main/java/org/jooq/impl/Tan.java
index 5872a22ac2..ff68b0419a 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Tan.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Tan.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/Tanh.java b/jOOQ/src/main/java/org/jooq/impl/Tanh.java
index 6ddc8b3cf0..6f12dd4a8e 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Tanh.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Tanh.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/Tau.java b/jOOQ/src/main/java/org/jooq/impl/Tau.java
index 0d898eecf5..cad52b7210 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Tau.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Tau.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/ToChar.java b/jOOQ/src/main/java/org/jooq/impl/ToChar.java
index e16c09ed34..6c137e06ff 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ToChar.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ToChar.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/ToDate.java b/jOOQ/src/main/java/org/jooq/impl/ToDate.java
index 8f224efb1e..cc848a35e9 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ToDate.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ToDate.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/ToTimestamp.java b/jOOQ/src/main/java/org/jooq/impl/ToTimestamp.java
index a14a1f079a..97dd77fb08 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ToTimestamp.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ToTimestamp.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/Translate.java b/jOOQ/src/main/java/org/jooq/impl/Translate.java
index 4f4adc0a87..a87fa51ec4 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Translate.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Translate.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/Trim.java b/jOOQ/src/main/java/org/jooq/impl/Trim.java
index bc12efd301..ea18fac761 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Trim.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Trim.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/Trunc.java b/jOOQ/src/main/java/org/jooq/impl/Trunc.java
index 0fde679535..1e9f7292fd 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Trunc.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Trunc.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/TruncateImpl.java b/jOOQ/src/main/java/org/jooq/impl/TruncateImpl.java
index 9cdc14de0d..1f796565ee 100644
--- a/jOOQ/src/main/java/org/jooq/impl/TruncateImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/TruncateImpl.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/Updating.java b/jOOQ/src/main/java/org/jooq/impl/Updating.java
index 5773848222..e55bd2407b 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Updating.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Updating.java
@@ -97,5 +97,6 @@ package org.jooq.impl;
 
 
 
+
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Upper.java b/jOOQ/src/main/java/org/jooq/impl/Upper.java
index 00e7a72488..c4c07bbbbe 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Upper.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Upper.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/VarPop.java b/jOOQ/src/main/java/org/jooq/impl/VarPop.java
index 09feace736..1f0b4c326f 100644
--- a/jOOQ/src/main/java/org/jooq/impl/VarPop.java
+++ b/jOOQ/src/main/java/org/jooq/impl/VarPop.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/VarSamp.java b/jOOQ/src/main/java/org/jooq/impl/VarSamp.java
index 861928d47a..acab75f007 100644
--- a/jOOQ/src/main/java/org/jooq/impl/VarSamp.java
+++ b/jOOQ/src/main/java/org/jooq/impl/VarSamp.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/WidthBucket.java b/jOOQ/src/main/java/org/jooq/impl/WidthBucket.java
index f19125ccf2..cb97c1a55b 100644
--- a/jOOQ/src/main/java/org/jooq/impl/WidthBucket.java
+++ b/jOOQ/src/main/java/org/jooq/impl/WidthBucket.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/XMLComment.java b/jOOQ/src/main/java/org/jooq/impl/XMLComment.java
index 76b52a7906..f868d174ca 100644
--- a/jOOQ/src/main/java/org/jooq/impl/XMLComment.java
+++ b/jOOQ/src/main/java/org/jooq/impl/XMLComment.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;
diff --git a/jOOQ/src/main/java/org/jooq/impl/XMLForest.java b/jOOQ/src/main/java/org/jooq/impl/XMLForest.java
index 9b45980e7e..be502b78f6 100644
--- a/jOOQ/src/main/java/org/jooq/impl/XMLForest.java
+++ b/jOOQ/src/main/java/org/jooq/impl/XMLForest.java
@@ -44,6 +44,7 @@ import static org.jooq.impl.Names.*;
 import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.impl.Tools.DataKey.*;
 import static org.jooq.SQLDialect.*;
 
 import org.jooq.*;