diff --git a/jOOQ/src/main/java/org/jooq/impl/Abs.java b/jOOQ/src/main/java/org/jooq/impl/Abs.java
index 147bc46cdf..7a0bd80997 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Abs.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Abs.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>ABS</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/Acos.java b/jOOQ/src/main/java/org/jooq/impl/Acos.java
index 629e2b20f1..8e4b0a3c25 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Acos.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Acos.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -61,6 +61,7 @@ import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
+
 import java.math.BigDecimal;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Acosh.java b/jOOQ/src/main/java/org/jooq/impl/Acosh.java
index 5837b20d85..006f1329f0 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Acosh.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Acosh.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -61,6 +61,7 @@ import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
+
 import java.math.BigDecimal;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Acoth.java b/jOOQ/src/main/java/org/jooq/impl/Acoth.java
index e3c14df302..fe93d243e1 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Acoth.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Acoth.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -61,6 +61,7 @@ import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
+
 import java.math.BigDecimal;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Add.java b/jOOQ/src/main/java/org/jooq/impl/Add.java
index 95ff2d2837..29a31f228b 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Add.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Add.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -62,6 +62,8 @@ import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
 
+import org.jooq.conf.TransformUnneededArithmeticExpressions;
+
 
 /**
  * The <code>ADD</code> statement.
diff --git a/jOOQ/src/main/java/org/jooq/impl/AlterDatabaseImpl.java b/jOOQ/src/main/java/org/jooq/impl/AlterDatabaseImpl.java
index eb85e5bfde..b38bc8cd27 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AlterDatabaseImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AlterDatabaseImpl.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>ALTER DATABASE</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/AlterDomainImpl.java b/jOOQ/src/main/java/org/jooq/impl/AlterDomainImpl.java
index f09e29a21f..4ef5fda13b 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AlterDomainImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AlterDomainImpl.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.impl.QOM.Cascade;
 import org.jooq.tools.StringUtils;
 
@@ -64,6 +64,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>ALTER DOMAIN</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/AlterIndexImpl.java b/jOOQ/src/main/java/org/jooq/impl/AlterIndexImpl.java
index eecb50ecc7..1443dfeb9f 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AlterIndexImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AlterIndexImpl.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>ALTER INDEX</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/AlterSchemaImpl.java b/jOOQ/src/main/java/org/jooq/impl/AlterSchemaImpl.java
index 3f53dacfb7..ea3c8e5d1a 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AlterSchemaImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AlterSchemaImpl.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>ALTER SCHEMA</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/AlterSequenceImpl.java b/jOOQ/src/main/java/org/jooq/impl/AlterSequenceImpl.java
index 6f134d6cf4..ba2cbd678d 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AlterSequenceImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AlterSequenceImpl.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.impl.QOM.CycleOption;
 import org.jooq.tools.StringUtils;
 
@@ -64,6 +64,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>ALTER SEQUENCE</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/AlterTypeImpl.java b/jOOQ/src/main/java/org/jooq/impl/AlterTypeImpl.java
index bbd9f1ec4d..8b3a42a0f8 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AlterTypeImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AlterTypeImpl.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>ALTER TYPE</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/AlterViewImpl.java b/jOOQ/src/main/java/org/jooq/impl/AlterViewImpl.java
index 1edb465241..e6e4705d9d 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AlterViewImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AlterViewImpl.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>ALTER VIEW</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/And.java b/jOOQ/src/main/java/org/jooq/impl/And.java
index 899a424936..5b7d28e21f 100644
--- a/jOOQ/src/main/java/org/jooq/impl/And.java
+++ b/jOOQ/src/main/java/org/jooq/impl/And.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>AND</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/AnyValue.java b/jOOQ/src/main/java/org/jooq/impl/AnyValue.java
index 756ecc64e2..d3ab994c37 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AnyValue.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AnyValue.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>ANY VALUE</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/ArrayAllMatch.java b/jOOQ/src/main/java/org/jooq/impl/ArrayAllMatch.java
index 1874b0f764..281dfb52e0 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ArrayAllMatch.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ArrayAllMatch.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>ARRAY ALL MATCH</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/ArrayAnyMatch.java b/jOOQ/src/main/java/org/jooq/impl/ArrayAnyMatch.java
index 15c6d3a7f8..fd68d96e38 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ArrayAnyMatch.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ArrayAnyMatch.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>ARRAY ANY MATCH</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/ArrayAppend.java b/jOOQ/src/main/java/org/jooq/impl/ArrayAppend.java
index a705045fe7..292ad75a5e 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ArrayAppend.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ArrayAppend.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>ARRAY APPEND</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/ArrayConcat.java b/jOOQ/src/main/java/org/jooq/impl/ArrayConcat.java
index a263bb9571..199ca54348 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ArrayConcat.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ArrayConcat.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>ARRAY CONCAT</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/ArrayFilter.java b/jOOQ/src/main/java/org/jooq/impl/ArrayFilter.java
index 18e405abea..893ccb3d30 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ArrayFilter.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ArrayFilter.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>ARRAY FILTER</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/ArrayGet.java b/jOOQ/src/main/java/org/jooq/impl/ArrayGet.java
index c22947bd31..e7f5f39c36 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ArrayGet.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ArrayGet.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>ARRAY GET</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/ArrayMap.java b/jOOQ/src/main/java/org/jooq/impl/ArrayMap.java
index 82486e6702..5760616349 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ArrayMap.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ArrayMap.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>ARRAY MAP</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/ArrayNoneMatch.java b/jOOQ/src/main/java/org/jooq/impl/ArrayNoneMatch.java
index b44c0725c8..7fa3d6abce 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ArrayNoneMatch.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ArrayNoneMatch.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>ARRAY NONE MATCH</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/ArrayOverlap.java b/jOOQ/src/main/java/org/jooq/impl/ArrayOverlap.java
index 1d7fdb8ac7..784d21ba02 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ArrayOverlap.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ArrayOverlap.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>ARRAY OVERLAP</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/ArrayPrepend.java b/jOOQ/src/main/java/org/jooq/impl/ArrayPrepend.java
index 30d6a30054..654e8cebf6 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ArrayPrepend.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ArrayPrepend.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>ARRAY PREPEND</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/ArrayRemove.java b/jOOQ/src/main/java/org/jooq/impl/ArrayRemove.java
index 50ab416395..e809c28209 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ArrayRemove.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ArrayRemove.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>ARRAY REMOVE</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/ArrayReplace.java b/jOOQ/src/main/java/org/jooq/impl/ArrayReplace.java
index 1ee38be8a6..495d9e7df5 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ArrayReplace.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ArrayReplace.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>ARRAY REPLACE</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/Ascii.java b/jOOQ/src/main/java/org/jooq/impl/Ascii.java
index e99d95f927..85b518e4de 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Ascii.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Ascii.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>ASCII</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/Asin.java b/jOOQ/src/main/java/org/jooq/impl/Asin.java
index 22c15354ff..14aef429a5 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Asin.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Asin.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -61,6 +61,7 @@ import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
+
 import java.math.BigDecimal;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Asinh.java b/jOOQ/src/main/java/org/jooq/impl/Asinh.java
index b0e2797f59..5d190875c3 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Asinh.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Asinh.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -61,6 +61,7 @@ import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
+
 import java.math.BigDecimal;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Atan.java b/jOOQ/src/main/java/org/jooq/impl/Atan.java
index d97fce7d6f..4f0f7d225c 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Atan.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Atan.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -61,6 +61,7 @@ import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
+
 import java.math.BigDecimal;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Atan2.java b/jOOQ/src/main/java/org/jooq/impl/Atan2.java
index 263ae10c8e..6ae39c99e5 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Atan2.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Atan2.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -61,6 +61,7 @@ import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
+
 import java.math.BigDecimal;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Atanh.java b/jOOQ/src/main/java/org/jooq/impl/Atanh.java
index 6976ba8ae1..32e4794bd6 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Atanh.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Atanh.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -61,6 +61,7 @@ import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
+
 import java.math.BigDecimal;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Avg.java b/jOOQ/src/main/java/org/jooq/impl/Avg.java
index 75c389eba9..ad887dd4a4 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Avg.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Avg.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -61,6 +61,7 @@ import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
+
 import java.math.BigDecimal;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/BinToUuid.java b/jOOQ/src/main/java/org/jooq/impl/BinToUuid.java
index 1cf6e2f790..9f753b0887 100644
--- a/jOOQ/src/main/java/org/jooq/impl/BinToUuid.java
+++ b/jOOQ/src/main/java/org/jooq/impl/BinToUuid.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -61,6 +61,7 @@ import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
+
 import java.util.UUID;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/BinaryBitLength.java b/jOOQ/src/main/java/org/jooq/impl/BinaryBitLength.java
index 81b6317185..ad97c0989a 100644
--- a/jOOQ/src/main/java/org/jooq/impl/BinaryBitLength.java
+++ b/jOOQ/src/main/java/org/jooq/impl/BinaryBitLength.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>BINARY BIT LENGTH</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/BinaryConcat.java b/jOOQ/src/main/java/org/jooq/impl/BinaryConcat.java
index b260addc43..d440095090 100644
--- a/jOOQ/src/main/java/org/jooq/impl/BinaryConcat.java
+++ b/jOOQ/src/main/java/org/jooq/impl/BinaryConcat.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>BINARY CONCAT</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/BinaryLength.java b/jOOQ/src/main/java/org/jooq/impl/BinaryLength.java
index 9cdbcbfd18..5ac217e1ea 100644
--- a/jOOQ/src/main/java/org/jooq/impl/BinaryLength.java
+++ b/jOOQ/src/main/java/org/jooq/impl/BinaryLength.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>BINARY LENGTH</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/BinaryLtrim.java b/jOOQ/src/main/java/org/jooq/impl/BinaryLtrim.java
index faf8e0c130..dcd332eeb7 100644
--- a/jOOQ/src/main/java/org/jooq/impl/BinaryLtrim.java
+++ b/jOOQ/src/main/java/org/jooq/impl/BinaryLtrim.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>BINARY LTRIM</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/BinaryMd5.java b/jOOQ/src/main/java/org/jooq/impl/BinaryMd5.java
index 5341cf4de6..841196729d 100644
--- a/jOOQ/src/main/java/org/jooq/impl/BinaryMd5.java
+++ b/jOOQ/src/main/java/org/jooq/impl/BinaryMd5.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>BINARY MD5</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/BinaryOctetLength.java b/jOOQ/src/main/java/org/jooq/impl/BinaryOctetLength.java
index b503b2d9ff..fd3747ffa4 100644
--- a/jOOQ/src/main/java/org/jooq/impl/BinaryOctetLength.java
+++ b/jOOQ/src/main/java/org/jooq/impl/BinaryOctetLength.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>BINARY OCTET LENGTH</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/BinaryOverlay.java b/jOOQ/src/main/java/org/jooq/impl/BinaryOverlay.java
index 62ee2af099..3591f1dcdb 100644
--- a/jOOQ/src/main/java/org/jooq/impl/BinaryOverlay.java
+++ b/jOOQ/src/main/java/org/jooq/impl/BinaryOverlay.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>BINARY OVERLAY</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/BinaryPosition.java b/jOOQ/src/main/java/org/jooq/impl/BinaryPosition.java
index 9306928719..efd1f063bd 100644
--- a/jOOQ/src/main/java/org/jooq/impl/BinaryPosition.java
+++ b/jOOQ/src/main/java/org/jooq/impl/BinaryPosition.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>BINARY POSITION</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/BinaryRtrim.java b/jOOQ/src/main/java/org/jooq/impl/BinaryRtrim.java
index 54891af358..3fe04df2d7 100644
--- a/jOOQ/src/main/java/org/jooq/impl/BinaryRtrim.java
+++ b/jOOQ/src/main/java/org/jooq/impl/BinaryRtrim.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>BINARY RTRIM</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/BinarySubstring.java b/jOOQ/src/main/java/org/jooq/impl/BinarySubstring.java
index 1a77927469..7f00038171 100644
--- a/jOOQ/src/main/java/org/jooq/impl/BinarySubstring.java
+++ b/jOOQ/src/main/java/org/jooq/impl/BinarySubstring.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>BINARY SUBSTRING</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/BinaryTrim.java b/jOOQ/src/main/java/org/jooq/impl/BinaryTrim.java
index fdee1c40bc..2d6d81421d 100644
--- a/jOOQ/src/main/java/org/jooq/impl/BinaryTrim.java
+++ b/jOOQ/src/main/java/org/jooq/impl/BinaryTrim.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>BINARY TRIM</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/BitAnd.java b/jOOQ/src/main/java/org/jooq/impl/BitAnd.java
index 4b3789e2bd..fc1d674744 100644
--- a/jOOQ/src/main/java/org/jooq/impl/BitAnd.java
+++ b/jOOQ/src/main/java/org/jooq/impl/BitAnd.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>BIT AND</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/BitAndAgg.java b/jOOQ/src/main/java/org/jooq/impl/BitAndAgg.java
index 0b5392f610..9e0b214a48 100644
--- a/jOOQ/src/main/java/org/jooq/impl/BitAndAgg.java
+++ b/jOOQ/src/main/java/org/jooq/impl/BitAndAgg.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>BIT AND AGG</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/BitCount.java b/jOOQ/src/main/java/org/jooq/impl/BitCount.java
index face328379..6139f4668e 100644
--- a/jOOQ/src/main/java/org/jooq/impl/BitCount.java
+++ b/jOOQ/src/main/java/org/jooq/impl/BitCount.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>BIT COUNT</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/BitGet.java b/jOOQ/src/main/java/org/jooq/impl/BitGet.java
index f7bc1abf6a..4a4bf38122 100644
--- a/jOOQ/src/main/java/org/jooq/impl/BitGet.java
+++ b/jOOQ/src/main/java/org/jooq/impl/BitGet.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>BIT GET</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/BitLength.java b/jOOQ/src/main/java/org/jooq/impl/BitLength.java
index 19736d0e81..0369eb223f 100644
--- a/jOOQ/src/main/java/org/jooq/impl/BitLength.java
+++ b/jOOQ/src/main/java/org/jooq/impl/BitLength.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>BIT LENGTH</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/BitNand.java b/jOOQ/src/main/java/org/jooq/impl/BitNand.java
index 869973cab6..3da523c130 100644
--- a/jOOQ/src/main/java/org/jooq/impl/BitNand.java
+++ b/jOOQ/src/main/java/org/jooq/impl/BitNand.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>BIT NAND</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/BitNandAgg.java b/jOOQ/src/main/java/org/jooq/impl/BitNandAgg.java
index 24d01519e0..27647a4077 100644
--- a/jOOQ/src/main/java/org/jooq/impl/BitNandAgg.java
+++ b/jOOQ/src/main/java/org/jooq/impl/BitNandAgg.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>BIT NAND AGG</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/BitNor.java b/jOOQ/src/main/java/org/jooq/impl/BitNor.java
index 9b6e403b1f..0b249cab62 100644
--- a/jOOQ/src/main/java/org/jooq/impl/BitNor.java
+++ b/jOOQ/src/main/java/org/jooq/impl/BitNor.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>BIT NOR</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/BitNorAgg.java b/jOOQ/src/main/java/org/jooq/impl/BitNorAgg.java
index dae9331453..57ad5ce61e 100644
--- a/jOOQ/src/main/java/org/jooq/impl/BitNorAgg.java
+++ b/jOOQ/src/main/java/org/jooq/impl/BitNorAgg.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>BIT NOR AGG</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/BitNot.java b/jOOQ/src/main/java/org/jooq/impl/BitNot.java
index 177cc630a7..90273c50f8 100644
--- a/jOOQ/src/main/java/org/jooq/impl/BitNot.java
+++ b/jOOQ/src/main/java/org/jooq/impl/BitNot.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>BIT NOT</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/BitOr.java b/jOOQ/src/main/java/org/jooq/impl/BitOr.java
index e10aaa2907..ef17c53aca 100644
--- a/jOOQ/src/main/java/org/jooq/impl/BitOr.java
+++ b/jOOQ/src/main/java/org/jooq/impl/BitOr.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>BIT OR</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/BitOrAgg.java b/jOOQ/src/main/java/org/jooq/impl/BitOrAgg.java
index f1ced92868..62e72059bf 100644
--- a/jOOQ/src/main/java/org/jooq/impl/BitOrAgg.java
+++ b/jOOQ/src/main/java/org/jooq/impl/BitOrAgg.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>BIT OR AGG</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/BitSet.java b/jOOQ/src/main/java/org/jooq/impl/BitSet.java
index a780e6bf06..0f0721512f 100644
--- a/jOOQ/src/main/java/org/jooq/impl/BitSet.java
+++ b/jOOQ/src/main/java/org/jooq/impl/BitSet.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>BIT SET</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/BitXNor.java b/jOOQ/src/main/java/org/jooq/impl/BitXNor.java
index 5efb7679a6..226db19723 100644
--- a/jOOQ/src/main/java/org/jooq/impl/BitXNor.java
+++ b/jOOQ/src/main/java/org/jooq/impl/BitXNor.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>BIT X NOR</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/BitXNorAgg.java b/jOOQ/src/main/java/org/jooq/impl/BitXNorAgg.java
index 2b99246e34..55b164a012 100644
--- a/jOOQ/src/main/java/org/jooq/impl/BitXNorAgg.java
+++ b/jOOQ/src/main/java/org/jooq/impl/BitXNorAgg.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>BIT X NOR AGG</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/BitXor.java b/jOOQ/src/main/java/org/jooq/impl/BitXor.java
index 71bde23b92..0bd3a4a224 100644
--- a/jOOQ/src/main/java/org/jooq/impl/BitXor.java
+++ b/jOOQ/src/main/java/org/jooq/impl/BitXor.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>BIT XOR</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/BitXorAgg.java b/jOOQ/src/main/java/org/jooq/impl/BitXorAgg.java
index f083543d5e..6ab1e49177 100644
--- a/jOOQ/src/main/java/org/jooq/impl/BitXorAgg.java
+++ b/jOOQ/src/main/java/org/jooq/impl/BitXorAgg.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>BIT XOR AGG</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/BoolAnd.java b/jOOQ/src/main/java/org/jooq/impl/BoolAnd.java
index 350fb1929f..3c98b69e89 100644
--- a/jOOQ/src/main/java/org/jooq/impl/BoolAnd.java
+++ b/jOOQ/src/main/java/org/jooq/impl/BoolAnd.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>BOOL AND</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/BoolOr.java b/jOOQ/src/main/java/org/jooq/impl/BoolOr.java
index d34f907e58..14a2550849 100644
--- a/jOOQ/src/main/java/org/jooq/impl/BoolOr.java
+++ b/jOOQ/src/main/java/org/jooq/impl/BoolOr.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>BOOL OR</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/Call.java b/jOOQ/src/main/java/org/jooq/impl/Call.java
index 5d6f8bbf0c..69a85c61ba 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Call.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Call.java
@@ -207,5 +207,6 @@ package org.jooq.impl;
 
 
 
+
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Cardinality.java b/jOOQ/src/main/java/org/jooq/impl/Cardinality.java
index d7b458b70e..f4aaa36784 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Cardinality.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Cardinality.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>CARDINALITY</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/Cbrt.java b/jOOQ/src/main/java/org/jooq/impl/Cbrt.java
index 8e6b8255f5..6404028ac1 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Cbrt.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Cbrt.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -61,6 +61,7 @@ import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
+
 import java.math.BigDecimal;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Ceil.java b/jOOQ/src/main/java/org/jooq/impl/Ceil.java
index c3f97f7c15..01a4f3eb3f 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Ceil.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Ceil.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>CEIL</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/CharLength.java b/jOOQ/src/main/java/org/jooq/impl/CharLength.java
index f19f9ac1f6..79d13f6c58 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CharLength.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CharLength.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>CHAR LENGTH</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/Chr.java b/jOOQ/src/main/java/org/jooq/impl/Chr.java
index a6f659a701..64c05d922d 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Chr.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Chr.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>CHR</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/CommentOnImpl.java b/jOOQ/src/main/java/org/jooq/impl/CommentOnImpl.java
index ca191315a2..c5d8986b1b 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CommentOnImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CommentOnImpl.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>COMMENT ON TABLE</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/Commit.java b/jOOQ/src/main/java/org/jooq/impl/Commit.java
index 0b8502405f..bcd27e50bc 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Commit.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Commit.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>COMMIT</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/ConditionAsField.java b/jOOQ/src/main/java/org/jooq/impl/ConditionAsField.java
index 6a5c1159ea..33f77610a1 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ConditionAsField.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ConditionAsField.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>FIELD</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/ConnectByIsCycle.java b/jOOQ/src/main/java/org/jooq/impl/ConnectByIsCycle.java
index ca09275fe3..34a7b19df4 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ConnectByIsCycle.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ConnectByIsCycle.java
@@ -132,5 +132,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 ca09275fe3..34a7b19df4 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ConnectByIsLeaf.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ConnectByIsLeaf.java
@@ -132,5 +132,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 6a045a21a1..4550772092 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ConnectByRoot.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ConnectByRoot.java
@@ -147,5 +147,6 @@ package org.jooq.impl;
 
 
 
+
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Contains.java b/jOOQ/src/main/java/org/jooq/impl/Contains.java
index 3257280fc0..1c812ddba3 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Contains.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Contains.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>CONTAINS</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/ContainsIgnoreCase.java b/jOOQ/src/main/java/org/jooq/impl/ContainsIgnoreCase.java
index 685791c52a..1dd47391df 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ContainsIgnoreCase.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ContainsIgnoreCase.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>CONTAINS IGNORE CASE</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/Corr.java b/jOOQ/src/main/java/org/jooq/impl/Corr.java
index f37b4f1f0a..4bb76294b1 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Corr.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Corr.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -61,6 +61,7 @@ import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
+
 import java.math.BigDecimal;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Cos.java b/jOOQ/src/main/java/org/jooq/impl/Cos.java
index bcdcbf054f..31ca39599a 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Cos.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Cos.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -61,6 +61,7 @@ import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
+
 import java.math.BigDecimal;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Cosh.java b/jOOQ/src/main/java/org/jooq/impl/Cosh.java
index 44e9a7e253..80576199ac 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Cosh.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Cosh.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -61,6 +61,7 @@ import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
+
 import java.math.BigDecimal;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Cot.java b/jOOQ/src/main/java/org/jooq/impl/Cot.java
index 7f6a009612..8477e439cf 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Cot.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Cot.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -61,6 +61,7 @@ import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
+
 import java.math.BigDecimal;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Coth.java b/jOOQ/src/main/java/org/jooq/impl/Coth.java
index 0af84d3c36..25e51559fe 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Coth.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Coth.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -61,6 +61,7 @@ import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
+
 import java.math.BigDecimal;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Count.java b/jOOQ/src/main/java/org/jooq/impl/Count.java
index ee357661f5..1b04baeb0a 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Count.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Count.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>COUNT</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/CovarPop.java b/jOOQ/src/main/java/org/jooq/impl/CovarPop.java
index 686a6be1d5..f1eab037b4 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CovarPop.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CovarPop.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -61,6 +61,7 @@ import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
+
 import java.math.BigDecimal;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/CovarSamp.java b/jOOQ/src/main/java/org/jooq/impl/CovarSamp.java
index 5fe932c118..2d493a6874 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CovarSamp.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CovarSamp.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -61,6 +61,7 @@ import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
+
 import java.math.BigDecimal;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateDatabaseImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateDatabaseImpl.java
index 67d565c54e..18335e5466 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CreateDatabaseImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CreateDatabaseImpl.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>CREATE DATABASE</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateDomainImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateDomainImpl.java
index bd04e9add9..fed847d1c4 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CreateDomainImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CreateDomainImpl.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>CREATE DOMAIN</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateFunctionImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateFunctionImpl.java
index 48ceba1eff..efb72d218d 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CreateFunctionImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CreateFunctionImpl.java
@@ -449,5 +449,6 @@ 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 f5fb6c4197..af71542233 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CreateIndexImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CreateIndexImpl.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>CREATE INDEX</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateProcedureImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateProcedureImpl.java
index 92cd80952e..9351019388 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CreateProcedureImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CreateProcedureImpl.java
@@ -401,5 +401,6 @@ 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 61ac511381..ed2a932805 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CreateSchemaImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CreateSchemaImpl.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>CREATE SCHEMA</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateSequenceImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateSequenceImpl.java
index 3602b953c7..bf017359d1 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CreateSequenceImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CreateSequenceImpl.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.impl.QOM.CycleOption;
 import org.jooq.tools.StringUtils;
 
@@ -64,6 +64,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>CREATE SEQUENCE</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateTableImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateTableImpl.java
index 32b7e5888e..f07d01a6a0 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CreateTableImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CreateTableImpl.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.impl.QOM.WithOrWithoutData;
 import org.jooq.impl.QOM.TableCommitAction;
 import org.jooq.tools.StringUtils;
@@ -65,6 +65,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>CREATE TABLE</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateTriggerImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateTriggerImpl.java
index e7d56076a1..3446d207b0 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CreateTriggerImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CreateTriggerImpl.java
@@ -928,5 +928,6 @@ package org.jooq.impl;
 
 
 
+
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateTypeImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateTypeImpl.java
index 94eed9bdff..a799532a71 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CreateTypeImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CreateTypeImpl.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>CREATE TYPE</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateViewImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateViewImpl.java
index 782f5e5614..5403a093c5 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CreateViewImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CreateViewImpl.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>CREATE VIEW</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/CurrentCatalog.java b/jOOQ/src/main/java/org/jooq/impl/CurrentCatalog.java
index ca3334f0a8..4381878a00 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CurrentCatalog.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CurrentCatalog.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>CURRENT CATALOG</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/CurrentSchema.java b/jOOQ/src/main/java/org/jooq/impl/CurrentSchema.java
index aaac731ec7..7d18e8f643 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CurrentSchema.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CurrentSchema.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>CURRENT SCHEMA</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/CurrentUser.java b/jOOQ/src/main/java/org/jooq/impl/CurrentUser.java
index 635b64f840..f492bebac3 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CurrentUser.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CurrentUser.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>CURRENT USER</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/DateAdd.java b/jOOQ/src/main/java/org/jooq/impl/DateAdd.java
index 59dda7c795..e37204eb7f 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DateAdd.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DateAdd.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>DATE ADD</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/Degrees.java b/jOOQ/src/main/java/org/jooq/impl/Degrees.java
index 9291b48359..d78e60bdb6 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Degrees.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Degrees.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -61,6 +61,7 @@ import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
+
 import java.math.BigDecimal;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Deleting.java b/jOOQ/src/main/java/org/jooq/impl/Deleting.java
index 715928ec4a..da143244c4 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Deleting.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Deleting.java
@@ -139,5 +139,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 18ba9b1fe8..7201965d3e 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Digits.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Digits.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>DIGITS</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/Div.java b/jOOQ/src/main/java/org/jooq/impl/Div.java
index 755476c8b0..c6f868a0e4 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Div.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Div.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -62,6 +62,8 @@ import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
 
+import org.jooq.conf.TransformUnneededArithmeticExpressions;
+
 
 /**
  * The <code>DIV</code> statement.
diff --git a/jOOQ/src/main/java/org/jooq/impl/DropDatabaseImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropDatabaseImpl.java
index 25bf43a34c..6cdd53ef60 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DropDatabaseImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DropDatabaseImpl.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>DROP DATABASE</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/DropDomainImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropDomainImpl.java
index 8de385f516..1e84265521 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DropDomainImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DropDomainImpl.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.impl.QOM.Cascade;
 import org.jooq.tools.StringUtils;
 
@@ -64,6 +64,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>DROP DOMAIN</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/DropFunctionImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropFunctionImpl.java
index bb21ab5421..ddad09dc8e 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DropFunctionImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DropFunctionImpl.java
@@ -168,5 +168,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 bb8fb475e7..bb706c4fb1 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DropIndexImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DropIndexImpl.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.impl.QOM.Cascade;
 import org.jooq.tools.StringUtils;
 
@@ -64,6 +64,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>DROP INDEX</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/DropProcedureImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropProcedureImpl.java
index bb21ab5421..ddad09dc8e 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DropProcedureImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DropProcedureImpl.java
@@ -168,5 +168,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 e55075bdb9..2f7d1b381f 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DropSchemaImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DropSchemaImpl.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.impl.QOM.Cascade;
 import org.jooq.tools.StringUtils;
 
@@ -64,6 +64,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>DROP SCHEMA</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/DropSequenceImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropSequenceImpl.java
index 70c2a388de..baac024e78 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DropSequenceImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DropSequenceImpl.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>DROP SEQUENCE</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/DropTableImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropTableImpl.java
index b53c19bf61..b1660ed078 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DropTableImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DropTableImpl.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.impl.QOM.Cascade;
 import org.jooq.tools.StringUtils;
 
@@ -64,6 +64,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>DROP TABLE</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/DropTriggerImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropTriggerImpl.java
index bd11e99be4..33cd800ad9 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DropTriggerImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DropTriggerImpl.java
@@ -235,5 +235,6 @@ package org.jooq.impl;
 
 
 
+
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/DropTypeImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropTypeImpl.java
index bcdf548065..d19509cf8a 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DropTypeImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DropTypeImpl.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.impl.QOM.Cascade;
 import org.jooq.tools.StringUtils;
 
@@ -64,6 +64,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>DROP TYPE</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/DropViewImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropViewImpl.java
index 2c2ac8be19..26493cef75 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DropViewImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DropViewImpl.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>DROP VIEW</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/EndsWith.java b/jOOQ/src/main/java/org/jooq/impl/EndsWith.java
index b0c4bb7af0..bd62ad86fe 100644
--- a/jOOQ/src/main/java/org/jooq/impl/EndsWith.java
+++ b/jOOQ/src/main/java/org/jooq/impl/EndsWith.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>ENDS WITH</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/EndsWithIgnoreCase.java b/jOOQ/src/main/java/org/jooq/impl/EndsWithIgnoreCase.java
index aa979aba20..47425d0d30 100644
--- a/jOOQ/src/main/java/org/jooq/impl/EndsWithIgnoreCase.java
+++ b/jOOQ/src/main/java/org/jooq/impl/EndsWithIgnoreCase.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>ENDS WITH IGNORE CASE</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/Eq.java b/jOOQ/src/main/java/org/jooq/impl/Eq.java
index 2d7a20b3bf..baebd4cdea 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Eq.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Eq.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>EQ</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/EqQuantified.java b/jOOQ/src/main/java/org/jooq/impl/EqQuantified.java
index ffe1dd15fd..cc08903821 100644
--- a/jOOQ/src/main/java/org/jooq/impl/EqQuantified.java
+++ b/jOOQ/src/main/java/org/jooq/impl/EqQuantified.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>EQ</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/Euler.java b/jOOQ/src/main/java/org/jooq/impl/Euler.java
index d91502892c..032ac02d13 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Euler.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Euler.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -61,6 +61,7 @@ import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
+
 import java.math.BigDecimal;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Excluded.java b/jOOQ/src/main/java/org/jooq/impl/Excluded.java
index de148de3f0..c5b3a92306 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Excluded.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Excluded.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>EXCLUDED</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/Execute.java b/jOOQ/src/main/java/org/jooq/impl/Execute.java
index 6318a30e1e..824ac46c2c 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Execute.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Execute.java
@@ -171,5 +171,6 @@ package org.jooq.impl;
 
 
 
+
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Exists.java b/jOOQ/src/main/java/org/jooq/impl/Exists.java
index a847436e14..6aec7259fd 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Exists.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Exists.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>EXISTS</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/Exp.java b/jOOQ/src/main/java/org/jooq/impl/Exp.java
index 9543ab090a..812b70da9c 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Exp.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Exp.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -61,6 +61,7 @@ import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
+
 import java.math.BigDecimal;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/FieldCondition.java b/jOOQ/src/main/java/org/jooq/impl/FieldCondition.java
index a2a5c3123c..92fdd9c1b8 100644
--- a/jOOQ/src/main/java/org/jooq/impl/FieldCondition.java
+++ b/jOOQ/src/main/java/org/jooq/impl/FieldCondition.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>CONDITION</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/Floor.java b/jOOQ/src/main/java/org/jooq/impl/Floor.java
index 3bb6c6e4e6..eac4087f34 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Floor.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Floor.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>FLOOR</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/Ge.java b/jOOQ/src/main/java/org/jooq/impl/Ge.java
index 513c990797..e7fa5209e9 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Ge.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Ge.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>GE</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/GeQuantified.java b/jOOQ/src/main/java/org/jooq/impl/GeQuantified.java
index 020a044800..8fba4b9e39 100644
--- a/jOOQ/src/main/java/org/jooq/impl/GeQuantified.java
+++ b/jOOQ/src/main/java/org/jooq/impl/GeQuantified.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>GE</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/Goto.java b/jOOQ/src/main/java/org/jooq/impl/Goto.java
index 6c095a3526..032ae68b2b 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Goto.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Goto.java
@@ -143,5 +143,6 @@ package org.jooq.impl;
 
 
 
+
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/GrantImpl.java b/jOOQ/src/main/java/org/jooq/impl/GrantImpl.java
index c62eb6757e..f8f824e317 100644
--- a/jOOQ/src/main/java/org/jooq/impl/GrantImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/GrantImpl.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>GRANT</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/Gt.java b/jOOQ/src/main/java/org/jooq/impl/Gt.java
index 0de376b89e..bdebb043ae 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Gt.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Gt.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>GT</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/GtQuantified.java b/jOOQ/src/main/java/org/jooq/impl/GtQuantified.java
index 3e7a98d975..e3d24e7829 100644
--- a/jOOQ/src/main/java/org/jooq/impl/GtQuantified.java
+++ b/jOOQ/src/main/java/org/jooq/impl/GtQuantified.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>GT</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/IAdd.java b/jOOQ/src/main/java/org/jooq/impl/IAdd.java
index b4dd6db37d..cf88dbae6a 100644
--- a/jOOQ/src/main/java/org/jooq/impl/IAdd.java
+++ b/jOOQ/src/main/java/org/jooq/impl/IAdd.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -62,6 +62,8 @@ import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
 
+import org.jooq.conf.TransformUnneededArithmeticExpressions;
+
 
 /**
  * The <code>ADD</code> statement.
diff --git a/jOOQ/src/main/java/org/jooq/impl/IDiv.java b/jOOQ/src/main/java/org/jooq/impl/IDiv.java
index 1e09a71ba6..01ffe3f780 100644
--- a/jOOQ/src/main/java/org/jooq/impl/IDiv.java
+++ b/jOOQ/src/main/java/org/jooq/impl/IDiv.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -62,6 +62,8 @@ import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
 
+import org.jooq.conf.TransformUnneededArithmeticExpressions;
+
 
 /**
  * The <code>DIV</code> statement.
diff --git a/jOOQ/src/main/java/org/jooq/impl/IMul.java b/jOOQ/src/main/java/org/jooq/impl/IMul.java
index c6455e4bb0..829e2021c6 100644
--- a/jOOQ/src/main/java/org/jooq/impl/IMul.java
+++ b/jOOQ/src/main/java/org/jooq/impl/IMul.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -62,6 +62,8 @@ import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
 
+import org.jooq.conf.TransformUnneededArithmeticExpressions;
+
 
 /**
  * The <code>MUL</code> statement.
diff --git a/jOOQ/src/main/java/org/jooq/impl/ISub.java b/jOOQ/src/main/java/org/jooq/impl/ISub.java
index 7b65047d85..e7af007ee1 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ISub.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ISub.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -62,6 +62,8 @@ import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
 
+import org.jooq.conf.TransformUnneededArithmeticExpressions;
+
 
 /**
  * The <code>SUB</code> statement.
diff --git a/jOOQ/src/main/java/org/jooq/impl/In.java b/jOOQ/src/main/java/org/jooq/impl/In.java
index 441c2f5c58..fd514dd680 100644
--- a/jOOQ/src/main/java/org/jooq/impl/In.java
+++ b/jOOQ/src/main/java/org/jooq/impl/In.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>IN</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/Inserting.java b/jOOQ/src/main/java/org/jooq/impl/Inserting.java
index 3240503c8c..50233115c2 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Inserting.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Inserting.java
@@ -141,5 +141,6 @@ package org.jooq.impl;
 
 
 
+
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/IsDistinctFrom.java b/jOOQ/src/main/java/org/jooq/impl/IsDistinctFrom.java
index c41afd0f38..4107c41551 100644
--- a/jOOQ/src/main/java/org/jooq/impl/IsDistinctFrom.java
+++ b/jOOQ/src/main/java/org/jooq/impl/IsDistinctFrom.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>IS DISTINCT FROM</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/IsDocument.java b/jOOQ/src/main/java/org/jooq/impl/IsDocument.java
index 813bf24895..a0724e206a 100644
--- a/jOOQ/src/main/java/org/jooq/impl/IsDocument.java
+++ b/jOOQ/src/main/java/org/jooq/impl/IsDocument.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>IS DOCUMENT</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/IsJson.java b/jOOQ/src/main/java/org/jooq/impl/IsJson.java
index 98b6177d4e..8f8494ff34 100644
--- a/jOOQ/src/main/java/org/jooq/impl/IsJson.java
+++ b/jOOQ/src/main/java/org/jooq/impl/IsJson.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>IS JSON</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/IsNotDistinctFrom.java b/jOOQ/src/main/java/org/jooq/impl/IsNotDistinctFrom.java
index 2b308e918c..3325d94b75 100644
--- a/jOOQ/src/main/java/org/jooq/impl/IsNotDistinctFrom.java
+++ b/jOOQ/src/main/java/org/jooq/impl/IsNotDistinctFrom.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>IS NOT DISTINCT FROM</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/IsNotDocument.java b/jOOQ/src/main/java/org/jooq/impl/IsNotDocument.java
index 0bff9bdb92..d8b35cc448 100644
--- a/jOOQ/src/main/java/org/jooq/impl/IsNotDocument.java
+++ b/jOOQ/src/main/java/org/jooq/impl/IsNotDocument.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>IS NOT DOCUMENT</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/IsNotJson.java b/jOOQ/src/main/java/org/jooq/impl/IsNotJson.java
index 3620c05e8f..730f661e1a 100644
--- a/jOOQ/src/main/java/org/jooq/impl/IsNotJson.java
+++ b/jOOQ/src/main/java/org/jooq/impl/IsNotJson.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>IS NOT JSON</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/IsNotNull.java b/jOOQ/src/main/java/org/jooq/impl/IsNotNull.java
index b8fbff18f5..d9e924bb19 100644
--- a/jOOQ/src/main/java/org/jooq/impl/IsNotNull.java
+++ b/jOOQ/src/main/java/org/jooq/impl/IsNotNull.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>IS NOT NULL</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/IsNull.java b/jOOQ/src/main/java/org/jooq/impl/IsNull.java
index 0758fd63f7..6c31d1d4a9 100644
--- a/jOOQ/src/main/java/org/jooq/impl/IsNull.java
+++ b/jOOQ/src/main/java/org/jooq/impl/IsNull.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>IS NULL</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/JSONArray.java b/jOOQ/src/main/java/org/jooq/impl/JSONArray.java
index c64dd46c51..53434b1046 100644
--- a/jOOQ/src/main/java/org/jooq/impl/JSONArray.java
+++ b/jOOQ/src/main/java/org/jooq/impl/JSONArray.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.impl.QOM.JSONOnNull;
 import org.jooq.tools.StringUtils;
 
@@ -64,6 +64,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>JSON ARRAY</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/JSONArrayLength.java b/jOOQ/src/main/java/org/jooq/impl/JSONArrayLength.java
index 1084aeebaa..94f17109d0 100644
--- a/jOOQ/src/main/java/org/jooq/impl/JSONArrayLength.java
+++ b/jOOQ/src/main/java/org/jooq/impl/JSONArrayLength.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>JSON ARRAY LENGTH</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/JSONBArrayLength.java b/jOOQ/src/main/java/org/jooq/impl/JSONBArrayLength.java
index a2f4676a93..9712da19fc 100644
--- a/jOOQ/src/main/java/org/jooq/impl/JSONBArrayLength.java
+++ b/jOOQ/src/main/java/org/jooq/impl/JSONBArrayLength.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>JSONB ARRAY LENGTH</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/JSONBGetAttribute.java b/jOOQ/src/main/java/org/jooq/impl/JSONBGetAttribute.java
index 6e2792f9a5..2c394bc794 100644
--- a/jOOQ/src/main/java/org/jooq/impl/JSONBGetAttribute.java
+++ b/jOOQ/src/main/java/org/jooq/impl/JSONBGetAttribute.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>JSONB GET ATTRIBUTE</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/JSONBGetAttributeAsText.java b/jOOQ/src/main/java/org/jooq/impl/JSONBGetAttributeAsText.java
index da9e1383df..847e6ee639 100644
--- a/jOOQ/src/main/java/org/jooq/impl/JSONBGetAttributeAsText.java
+++ b/jOOQ/src/main/java/org/jooq/impl/JSONBGetAttributeAsText.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>JSONB GET ATTRIBUTE AS TEXT</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/JSONBGetElement.java b/jOOQ/src/main/java/org/jooq/impl/JSONBGetElement.java
index d32e93b1b1..b2e39f3619 100644
--- a/jOOQ/src/main/java/org/jooq/impl/JSONBGetElement.java
+++ b/jOOQ/src/main/java/org/jooq/impl/JSONBGetElement.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>JSONB GET ELEMENT</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/JSONBGetElementAsText.java b/jOOQ/src/main/java/org/jooq/impl/JSONBGetElementAsText.java
index 04179c153b..35878468f0 100644
--- a/jOOQ/src/main/java/org/jooq/impl/JSONBGetElementAsText.java
+++ b/jOOQ/src/main/java/org/jooq/impl/JSONBGetElementAsText.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>JSONB GET ELEMENT AS TEXT</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/JSONBInsert.java b/jOOQ/src/main/java/org/jooq/impl/JSONBInsert.java
index 4ef4184aa5..88b3e4d5f6 100644
--- a/jOOQ/src/main/java/org/jooq/impl/JSONBInsert.java
+++ b/jOOQ/src/main/java/org/jooq/impl/JSONBInsert.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>JSONB INSERT</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/JSONBKeys.java b/jOOQ/src/main/java/org/jooq/impl/JSONBKeys.java
index 0be2dd5fef..522150a59b 100644
--- a/jOOQ/src/main/java/org/jooq/impl/JSONBKeys.java
+++ b/jOOQ/src/main/java/org/jooq/impl/JSONBKeys.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>JSONB KEYS</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/JSONBRemove.java b/jOOQ/src/main/java/org/jooq/impl/JSONBRemove.java
index d849a72650..c3fe613720 100644
--- a/jOOQ/src/main/java/org/jooq/impl/JSONBRemove.java
+++ b/jOOQ/src/main/java/org/jooq/impl/JSONBRemove.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>JSONB REMOVE</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/JSONBReplace.java b/jOOQ/src/main/java/org/jooq/impl/JSONBReplace.java
index c9dfa6cbd8..2e7c866fb0 100644
--- a/jOOQ/src/main/java/org/jooq/impl/JSONBReplace.java
+++ b/jOOQ/src/main/java/org/jooq/impl/JSONBReplace.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>JSONB REPLACE</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/JSONBSet.java b/jOOQ/src/main/java/org/jooq/impl/JSONBSet.java
index b6830c3a9d..97e69490a1 100644
--- a/jOOQ/src/main/java/org/jooq/impl/JSONBSet.java
+++ b/jOOQ/src/main/java/org/jooq/impl/JSONBSet.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>JSONB SET</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/JSONGetAttribute.java b/jOOQ/src/main/java/org/jooq/impl/JSONGetAttribute.java
index a1e037f98a..3a894985ec 100644
--- a/jOOQ/src/main/java/org/jooq/impl/JSONGetAttribute.java
+++ b/jOOQ/src/main/java/org/jooq/impl/JSONGetAttribute.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>JSON GET ATTRIBUTE</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/JSONGetAttributeAsText.java b/jOOQ/src/main/java/org/jooq/impl/JSONGetAttributeAsText.java
index cae21cc752..d8c15d807e 100644
--- a/jOOQ/src/main/java/org/jooq/impl/JSONGetAttributeAsText.java
+++ b/jOOQ/src/main/java/org/jooq/impl/JSONGetAttributeAsText.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>JSON GET ATTRIBUTE AS TEXT</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/JSONGetElement.java b/jOOQ/src/main/java/org/jooq/impl/JSONGetElement.java
index 7e82aab366..af4148432e 100644
--- a/jOOQ/src/main/java/org/jooq/impl/JSONGetElement.java
+++ b/jOOQ/src/main/java/org/jooq/impl/JSONGetElement.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>JSON GET ELEMENT</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/JSONGetElementAsText.java b/jOOQ/src/main/java/org/jooq/impl/JSONGetElementAsText.java
index 17944a8a7e..cf4967d319 100644
--- a/jOOQ/src/main/java/org/jooq/impl/JSONGetElementAsText.java
+++ b/jOOQ/src/main/java/org/jooq/impl/JSONGetElementAsText.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>JSON GET ELEMENT AS TEXT</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/JSONInsert.java b/jOOQ/src/main/java/org/jooq/impl/JSONInsert.java
index 43fe49e761..4c60d4f3ce 100644
--- a/jOOQ/src/main/java/org/jooq/impl/JSONInsert.java
+++ b/jOOQ/src/main/java/org/jooq/impl/JSONInsert.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>JSON INSERT</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/JSONKeys.java b/jOOQ/src/main/java/org/jooq/impl/JSONKeys.java
index fe357ece38..ee7d4393ec 100644
--- a/jOOQ/src/main/java/org/jooq/impl/JSONKeys.java
+++ b/jOOQ/src/main/java/org/jooq/impl/JSONKeys.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>JSON KEYS</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/JSONObject.java b/jOOQ/src/main/java/org/jooq/impl/JSONObject.java
index b63af0b128..fcb80a0ff1 100644
--- a/jOOQ/src/main/java/org/jooq/impl/JSONObject.java
+++ b/jOOQ/src/main/java/org/jooq/impl/JSONObject.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.impl.QOM.JSONOnNull;
 import org.jooq.tools.StringUtils;
 
@@ -64,6 +64,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>JSON OBJECT</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/JSONRemove.java b/jOOQ/src/main/java/org/jooq/impl/JSONRemove.java
index 6f4f5bf91a..0a3f889632 100644
--- a/jOOQ/src/main/java/org/jooq/impl/JSONRemove.java
+++ b/jOOQ/src/main/java/org/jooq/impl/JSONRemove.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>JSON REMOVE</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/JSONReplace.java b/jOOQ/src/main/java/org/jooq/impl/JSONReplace.java
index 6a46e943f8..b741c8e0a4 100644
--- a/jOOQ/src/main/java/org/jooq/impl/JSONReplace.java
+++ b/jOOQ/src/main/java/org/jooq/impl/JSONReplace.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>JSON REPLACE</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/JSONSet.java b/jOOQ/src/main/java/org/jooq/impl/JSONSet.java
index cf542ca89e..57c6668a5e 100644
--- a/jOOQ/src/main/java/org/jooq/impl/JSONSet.java
+++ b/jOOQ/src/main/java/org/jooq/impl/JSONSet.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>JSON SET</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/LTrim.java b/jOOQ/src/main/java/org/jooq/impl/LTrim.java
index 97f2fff65b..5747bbad50 100644
--- a/jOOQ/src/main/java/org/jooq/impl/LTrim.java
+++ b/jOOQ/src/main/java/org/jooq/impl/LTrim.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>LTRIM</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/Le.java b/jOOQ/src/main/java/org/jooq/impl/Le.java
index afcba5e358..948e246291 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Le.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Le.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>LE</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/LeQuantified.java b/jOOQ/src/main/java/org/jooq/impl/LeQuantified.java
index 0970a7b1b3..2385b5e033 100644
--- a/jOOQ/src/main/java/org/jooq/impl/LeQuantified.java
+++ b/jOOQ/src/main/java/org/jooq/impl/LeQuantified.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>LE</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/Left.java b/jOOQ/src/main/java/org/jooq/impl/Left.java
index e9209fc2f4..f5c6d2fe34 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Left.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Left.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>LEFT</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/Level.java b/jOOQ/src/main/java/org/jooq/impl/Level.java
index b1c7bdbf26..53ebc9ac16 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Level.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Level.java
@@ -128,5 +128,6 @@ package org.jooq.impl;
 
 
 
+
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Like.java b/jOOQ/src/main/java/org/jooq/impl/Like.java
index e1f5a7bc86..595b60a036 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Like.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Like.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>LIKE</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/LikeIgnoreCase.java b/jOOQ/src/main/java/org/jooq/impl/LikeIgnoreCase.java
index 78b17529b7..ad3e60a5bd 100644
--- a/jOOQ/src/main/java/org/jooq/impl/LikeIgnoreCase.java
+++ b/jOOQ/src/main/java/org/jooq/impl/LikeIgnoreCase.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>LIKE IGNORE CASE</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/LikeQuantified.java b/jOOQ/src/main/java/org/jooq/impl/LikeQuantified.java
index 29ad380bf8..e0c6f1ab2a 100644
--- a/jOOQ/src/main/java/org/jooq/impl/LikeQuantified.java
+++ b/jOOQ/src/main/java/org/jooq/impl/LikeQuantified.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>LIKE</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/Ln.java b/jOOQ/src/main/java/org/jooq/impl/Ln.java
index a386591f6c..96c491fb21 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Ln.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Ln.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -61,6 +61,7 @@ import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
+
 import java.math.BigDecimal;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Log.java b/jOOQ/src/main/java/org/jooq/impl/Log.java
index c55e70df7b..c0aaaebb23 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Log.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Log.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -61,6 +61,7 @@ import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
+
 import java.math.BigDecimal;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Log10.java b/jOOQ/src/main/java/org/jooq/impl/Log10.java
index f7b154b68b..95a7dd45da 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Log10.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Log10.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -61,6 +61,7 @@ import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
+
 import java.math.BigDecimal;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Lower.java b/jOOQ/src/main/java/org/jooq/impl/Lower.java
index 9f3f48aae2..e16b05b868 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Lower.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Lower.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>LOWER</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/Lpad.java b/jOOQ/src/main/java/org/jooq/impl/Lpad.java
index 1ddb150e16..52f85f0fc4 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Lpad.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Lpad.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>LPAD</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/Lt.java b/jOOQ/src/main/java/org/jooq/impl/Lt.java
index 9585baaff8..5801008fe5 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Lt.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Lt.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>LT</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/LtQuantified.java b/jOOQ/src/main/java/org/jooq/impl/LtQuantified.java
index 7220d34834..352a3ada1d 100644
--- a/jOOQ/src/main/java/org/jooq/impl/LtQuantified.java
+++ b/jOOQ/src/main/java/org/jooq/impl/LtQuantified.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>LT</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/MD5.java b/jOOQ/src/main/java/org/jooq/impl/MD5.java
index 583c94012c..0fc372f64b 100644
--- a/jOOQ/src/main/java/org/jooq/impl/MD5.java
+++ b/jOOQ/src/main/java/org/jooq/impl/MD5.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>MD5</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/Max.java b/jOOQ/src/main/java/org/jooq/impl/Max.java
index 6c37efd12f..cffa3c87ef 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Max.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Max.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>MAX</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/MaxBy.java b/jOOQ/src/main/java/org/jooq/impl/MaxBy.java
index 70b996ed7c..e3a73f9e35 100644
--- a/jOOQ/src/main/java/org/jooq/impl/MaxBy.java
+++ b/jOOQ/src/main/java/org/jooq/impl/MaxBy.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>MAX BY</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/Median.java b/jOOQ/src/main/java/org/jooq/impl/Median.java
index 36fa35c609..255db7b5ee 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Median.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Median.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -61,6 +61,7 @@ import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
+
 import java.math.BigDecimal;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Min.java b/jOOQ/src/main/java/org/jooq/impl/Min.java
index 5b0efcbc58..5c15e738ff 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Min.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Min.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>MIN</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/MinBy.java b/jOOQ/src/main/java/org/jooq/impl/MinBy.java
index e00a28ba69..80aefa621c 100644
--- a/jOOQ/src/main/java/org/jooq/impl/MinBy.java
+++ b/jOOQ/src/main/java/org/jooq/impl/MinBy.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>MIN BY</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/Mod.java b/jOOQ/src/main/java/org/jooq/impl/Mod.java
index ef509847a4..0d0bfbc405 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Mod.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Mod.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>MOD</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/Mul.java b/jOOQ/src/main/java/org/jooq/impl/Mul.java
index cd4c8b9ede..35beec2cdc 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Mul.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Mul.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -62,6 +62,8 @@ import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
 
+import org.jooq.conf.TransformUnneededArithmeticExpressions;
+
 
 /**
  * The <code>MUL</code> statement.
diff --git a/jOOQ/src/main/java/org/jooq/impl/Ne.java b/jOOQ/src/main/java/org/jooq/impl/Ne.java
index 1139bc47d1..dc482ebe59 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Ne.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Ne.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>NE</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/NeQuantified.java b/jOOQ/src/main/java/org/jooq/impl/NeQuantified.java
index a3c42dfc0c..f8e9d3cc6a 100644
--- a/jOOQ/src/main/java/org/jooq/impl/NeQuantified.java
+++ b/jOOQ/src/main/java/org/jooq/impl/NeQuantified.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>NE</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/Not.java b/jOOQ/src/main/java/org/jooq/impl/Not.java
index f96e6af102..d362025ef1 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Not.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Not.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>NOT</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/NotField.java b/jOOQ/src/main/java/org/jooq/impl/NotField.java
index 3f36fdae01..90eb547d8e 100644
--- a/jOOQ/src/main/java/org/jooq/impl/NotField.java
+++ b/jOOQ/src/main/java/org/jooq/impl/NotField.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>NOT</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/NotIn.java b/jOOQ/src/main/java/org/jooq/impl/NotIn.java
index f940276892..9c4b17efce 100644
--- a/jOOQ/src/main/java/org/jooq/impl/NotIn.java
+++ b/jOOQ/src/main/java/org/jooq/impl/NotIn.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>NOT IN</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/NotLike.java b/jOOQ/src/main/java/org/jooq/impl/NotLike.java
index 1a681a10f8..bbfda051e2 100644
--- a/jOOQ/src/main/java/org/jooq/impl/NotLike.java
+++ b/jOOQ/src/main/java/org/jooq/impl/NotLike.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>NOT LIKE</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/NotLikeIgnoreCase.java b/jOOQ/src/main/java/org/jooq/impl/NotLikeIgnoreCase.java
index 9fd039e325..8cd4e504cc 100644
--- a/jOOQ/src/main/java/org/jooq/impl/NotLikeIgnoreCase.java
+++ b/jOOQ/src/main/java/org/jooq/impl/NotLikeIgnoreCase.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>NOT LIKE IGNORE CASE</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/NotLikeQuantified.java b/jOOQ/src/main/java/org/jooq/impl/NotLikeQuantified.java
index 4036da8b78..16346a3e24 100644
--- a/jOOQ/src/main/java/org/jooq/impl/NotLikeQuantified.java
+++ b/jOOQ/src/main/java/org/jooq/impl/NotLikeQuantified.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>NOT LIKE</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/NotSimilarTo.java b/jOOQ/src/main/java/org/jooq/impl/NotSimilarTo.java
index ef8f55204b..dacf578a98 100644
--- a/jOOQ/src/main/java/org/jooq/impl/NotSimilarTo.java
+++ b/jOOQ/src/main/java/org/jooq/impl/NotSimilarTo.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>NOT SIMILAR TO</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/NotSimilarToQuantified.java b/jOOQ/src/main/java/org/jooq/impl/NotSimilarToQuantified.java
index 57df2e8eb5..30225354ee 100644
--- a/jOOQ/src/main/java/org/jooq/impl/NotSimilarToQuantified.java
+++ b/jOOQ/src/main/java/org/jooq/impl/NotSimilarToQuantified.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>NOT SIMILAR TO</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/Nullif.java b/jOOQ/src/main/java/org/jooq/impl/Nullif.java
index e9443654b0..0721870806 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Nullif.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Nullif.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>NULLIF</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/Nvl.java b/jOOQ/src/main/java/org/jooq/impl/Nvl.java
index 71dced107b..468cc5faf3 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Nvl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Nvl.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>NVL</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/OctetLength.java b/jOOQ/src/main/java/org/jooq/impl/OctetLength.java
index cd39179352..070eb92d3d 100644
--- a/jOOQ/src/main/java/org/jooq/impl/OctetLength.java
+++ b/jOOQ/src/main/java/org/jooq/impl/OctetLength.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>OCTET LENGTH</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/Or.java b/jOOQ/src/main/java/org/jooq/impl/Or.java
index 19e1fe6e7d..534e0539dd 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Or.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Or.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>OR</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/Overlay.java b/jOOQ/src/main/java/org/jooq/impl/Overlay.java
index f8adf89546..f28467aeb9 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Overlay.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Overlay.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>OVERLAY</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/Pi.java b/jOOQ/src/main/java/org/jooq/impl/Pi.java
index 1aa8bfffa6..ef3f02c7d0 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Pi.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Pi.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -61,6 +61,7 @@ import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
+
 import java.math.BigDecimal;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/PlusJoin.java b/jOOQ/src/main/java/org/jooq/impl/PlusJoin.java
index 858a6f2c96..7885ab87d7 100644
--- a/jOOQ/src/main/java/org/jooq/impl/PlusJoin.java
+++ b/jOOQ/src/main/java/org/jooq/impl/PlusJoin.java
@@ -145,5 +145,6 @@ package org.jooq.impl;
 
 
 
+
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Position.java b/jOOQ/src/main/java/org/jooq/impl/Position.java
index de8c7e05f8..22cb433f27 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Position.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Position.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>POSITION</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/Power.java b/jOOQ/src/main/java/org/jooq/impl/Power.java
index 3d58ae7eec..457d90f90c 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Power.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Power.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -61,6 +61,7 @@ import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
+
 import java.math.BigDecimal;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Prior.java b/jOOQ/src/main/java/org/jooq/impl/Prior.java
index 14148384ef..a023565f20 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Prior.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Prior.java
@@ -166,5 +166,6 @@ package org.jooq.impl;
 
 
 
+
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Product.java b/jOOQ/src/main/java/org/jooq/impl/Product.java
index de2ae50bae..d9bf22e1dd 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Product.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Product.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -61,6 +61,7 @@ import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
+
 import java.math.BigDecimal;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/QualifiedRowid.java b/jOOQ/src/main/java/org/jooq/impl/QualifiedRowid.java
index 0c86d167ab..32f2acfa40 100644
--- a/jOOQ/src/main/java/org/jooq/impl/QualifiedRowid.java
+++ b/jOOQ/src/main/java/org/jooq/impl/QualifiedRowid.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>ROWID</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/RTrim.java b/jOOQ/src/main/java/org/jooq/impl/RTrim.java
index ab8320cc5f..25cf6ae8b7 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RTrim.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RTrim.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>RTRIM</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/Radians.java b/jOOQ/src/main/java/org/jooq/impl/Radians.java
index e096a42fc5..7b34d461f0 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Radians.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Radians.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -61,6 +61,7 @@ import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
+
 import java.math.BigDecimal;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Rand.java b/jOOQ/src/main/java/org/jooq/impl/Rand.java
index cbe7575870..a99605f358 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Rand.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Rand.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -61,6 +61,7 @@ import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
+
 import java.math.BigDecimal;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/RegrAvgX.java b/jOOQ/src/main/java/org/jooq/impl/RegrAvgX.java
index 263b6de225..f53b58f5cb 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RegrAvgX.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RegrAvgX.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -61,6 +61,7 @@ import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
+
 import java.math.BigDecimal;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/RegrAvgY.java b/jOOQ/src/main/java/org/jooq/impl/RegrAvgY.java
index 73cf4ce08c..213042d2a4 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RegrAvgY.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RegrAvgY.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -61,6 +61,7 @@ import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
+
 import java.math.BigDecimal;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/RegrCount.java b/jOOQ/src/main/java/org/jooq/impl/RegrCount.java
index 01fa075cc1..5ba9e93a25 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RegrCount.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RegrCount.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -61,6 +61,7 @@ import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
+
 import java.math.BigDecimal;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/RegrIntercept.java b/jOOQ/src/main/java/org/jooq/impl/RegrIntercept.java
index a8970babfa..b66642b8b1 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RegrIntercept.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RegrIntercept.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -61,6 +61,7 @@ import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
+
 import java.math.BigDecimal;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/RegrR2.java b/jOOQ/src/main/java/org/jooq/impl/RegrR2.java
index e5b6a40be7..c0f667bece 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RegrR2.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RegrR2.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -61,6 +61,7 @@ import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
+
 import java.math.BigDecimal;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/RegrSlope.java b/jOOQ/src/main/java/org/jooq/impl/RegrSlope.java
index 39f6b348c4..b1bee51fcf 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RegrSlope.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RegrSlope.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -61,6 +61,7 @@ import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
+
 import java.math.BigDecimal;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/RegrSxx.java b/jOOQ/src/main/java/org/jooq/impl/RegrSxx.java
index db4e6fb244..796deb4a8c 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RegrSxx.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RegrSxx.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -61,6 +61,7 @@ import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
+
 import java.math.BigDecimal;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/RegrSxy.java b/jOOQ/src/main/java/org/jooq/impl/RegrSxy.java
index 93a657cdba..256b0cbad2 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RegrSxy.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RegrSxy.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -61,6 +61,7 @@ import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
+
 import java.math.BigDecimal;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/RegrSyy.java b/jOOQ/src/main/java/org/jooq/impl/RegrSyy.java
index c7e41b8cdb..ab10f4ac44 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RegrSyy.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RegrSyy.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -61,6 +61,7 @@ import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
+
 import java.math.BigDecimal;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/ReleaseSavepoint.java b/jOOQ/src/main/java/org/jooq/impl/ReleaseSavepoint.java
index 4320774f17..f184c5c660 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ReleaseSavepoint.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ReleaseSavepoint.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>RELEASE SAVEPOINT</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/Repeat.java b/jOOQ/src/main/java/org/jooq/impl/Repeat.java
index a9436d64bc..8d315865ef 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Repeat.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Repeat.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>REPEAT</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/Replace.java b/jOOQ/src/main/java/org/jooq/impl/Replace.java
index b8034ffb8a..058abaf9d2 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Replace.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Replace.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>REPLACE</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/Return.java b/jOOQ/src/main/java/org/jooq/impl/Return.java
index 4781ae7911..c04ae75906 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Return.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Return.java
@@ -178,5 +178,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 c2b309661a..d8b4c9a159 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Reverse.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Reverse.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>REVERSE</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/RevokeImpl.java b/jOOQ/src/main/java/org/jooq/impl/RevokeImpl.java
index 5d5ab8f60f..d1d81ac789 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RevokeImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RevokeImpl.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>REVOKE</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/Right.java b/jOOQ/src/main/java/org/jooq/impl/Right.java
index 756d4f3549..1963861686 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Right.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Right.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>RIGHT</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/Rollback.java b/jOOQ/src/main/java/org/jooq/impl/Rollback.java
index 00c9fec1f1..0155b696ad 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Rollback.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Rollback.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>ROLLBACK</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/Root.java b/jOOQ/src/main/java/org/jooq/impl/Root.java
index 7a1d4aa7bb..ab76c20887 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Root.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Root.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -61,6 +61,7 @@ import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
+
 import java.math.BigDecimal;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Round.java b/jOOQ/src/main/java/org/jooq/impl/Round.java
index 8949bd35b4..94838998f8 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Round.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Round.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>ROUND</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/RowEq.java b/jOOQ/src/main/java/org/jooq/impl/RowEq.java
index 6cb7d277b5..b4035f43e0 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RowEq.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RowEq.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>ROW EQ</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/RowGe.java b/jOOQ/src/main/java/org/jooq/impl/RowGe.java
index 39056aad42..dcbe0359b7 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RowGe.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RowGe.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>ROW GE</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/RowGt.java b/jOOQ/src/main/java/org/jooq/impl/RowGt.java
index 52d385e30f..ef9a5e5931 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RowGt.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RowGt.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>ROW GT</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/RowLe.java b/jOOQ/src/main/java/org/jooq/impl/RowLe.java
index 6cd0accc22..12f1db0edb 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RowLe.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RowLe.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>ROW LE</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/RowLt.java b/jOOQ/src/main/java/org/jooq/impl/RowLt.java
index bba81fd894..3c0dbdc254 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RowLt.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RowLt.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>ROW LT</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/RowNe.java b/jOOQ/src/main/java/org/jooq/impl/RowNe.java
index 241441e072..1cf440712b 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RowNe.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RowNe.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>ROW NE</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/Rownum.java b/jOOQ/src/main/java/org/jooq/impl/Rownum.java
index ca09275fe3..34a7b19df4 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Rownum.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Rownum.java
@@ -132,5 +132,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 bf0810eb91..6e56395190 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Rpad.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Rpad.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>RPAD</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/Savepoint.java b/jOOQ/src/main/java/org/jooq/impl/Savepoint.java
index 3bfc682070..b344003144 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Savepoint.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Savepoint.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>SAVEPOINT</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/SetCatalog.java b/jOOQ/src/main/java/org/jooq/impl/SetCatalog.java
index 08e3e8e911..171e07b3d1 100644
--- a/jOOQ/src/main/java/org/jooq/impl/SetCatalog.java
+++ b/jOOQ/src/main/java/org/jooq/impl/SetCatalog.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>SET CATALOG</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/SetCommand.java b/jOOQ/src/main/java/org/jooq/impl/SetCommand.java
index 7feec43ca6..03b5c428b1 100644
--- a/jOOQ/src/main/java/org/jooq/impl/SetCommand.java
+++ b/jOOQ/src/main/java/org/jooq/impl/SetCommand.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>SET</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/SetSchema.java b/jOOQ/src/main/java/org/jooq/impl/SetSchema.java
index 260594578b..0925940d35 100644
--- a/jOOQ/src/main/java/org/jooq/impl/SetSchema.java
+++ b/jOOQ/src/main/java/org/jooq/impl/SetSchema.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>SET SCHEMA</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/Shl.java b/jOOQ/src/main/java/org/jooq/impl/Shl.java
index 372c0c7061..1fcb7482b8 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Shl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Shl.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>SHL</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/Shr.java b/jOOQ/src/main/java/org/jooq/impl/Shr.java
index 4fbe448424..921d840a6b 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Shr.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Shr.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>SHR</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/Sign.java b/jOOQ/src/main/java/org/jooq/impl/Sign.java
index ca1c2c9e70..ef2df3eb51 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Sign.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Sign.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>SIGN</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/Signal.java b/jOOQ/src/main/java/org/jooq/impl/Signal.java
index 436a2e7ddf..4f13a80c8c 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Signal.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Signal.java
@@ -238,5 +238,6 @@ package org.jooq.impl;
 
 
 
+
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/SimilarTo.java b/jOOQ/src/main/java/org/jooq/impl/SimilarTo.java
index d1d42cc84a..a9440bc495 100644
--- a/jOOQ/src/main/java/org/jooq/impl/SimilarTo.java
+++ b/jOOQ/src/main/java/org/jooq/impl/SimilarTo.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>SIMILAR TO</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/SimilarToQuantified.java b/jOOQ/src/main/java/org/jooq/impl/SimilarToQuantified.java
index dad3ab30d3..1db8d9e320 100644
--- a/jOOQ/src/main/java/org/jooq/impl/SimilarToQuantified.java
+++ b/jOOQ/src/main/java/org/jooq/impl/SimilarToQuantified.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>SIMILAR TO</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/Sin.java b/jOOQ/src/main/java/org/jooq/impl/Sin.java
index e651018b62..7ebd72a76c 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Sin.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Sin.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -61,6 +61,7 @@ import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
+
 import java.math.BigDecimal;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Sinh.java b/jOOQ/src/main/java/org/jooq/impl/Sinh.java
index 8443e01e2c..317e1d6bf6 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Sinh.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Sinh.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -61,6 +61,7 @@ import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
+
 import java.math.BigDecimal;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Space.java b/jOOQ/src/main/java/org/jooq/impl/Space.java
index 1bff37bc31..dc54c59112 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Space.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Space.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>SPACE</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/SplitPart.java b/jOOQ/src/main/java/org/jooq/impl/SplitPart.java
index 175fa4ccd5..94f32dff44 100644
--- a/jOOQ/src/main/java/org/jooq/impl/SplitPart.java
+++ b/jOOQ/src/main/java/org/jooq/impl/SplitPart.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>SPLIT PART</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/Sqrt.java b/jOOQ/src/main/java/org/jooq/impl/Sqrt.java
index 96e5b2affb..ab15d2350c 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Sqrt.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Sqrt.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -61,6 +61,7 @@ import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
+
 import java.math.BigDecimal;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Square.java b/jOOQ/src/main/java/org/jooq/impl/Square.java
index 2a55a19711..333f030d0d 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Square.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Square.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>SQUARE</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/StArea.java b/jOOQ/src/main/java/org/jooq/impl/StArea.java
index ddad09dc8e..fa30737d3b 100644
--- a/jOOQ/src/main/java/org/jooq/impl/StArea.java
+++ b/jOOQ/src/main/java/org/jooq/impl/StArea.java
@@ -169,5 +169,6 @@ package org.jooq.impl;
 
 
 
+
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/StAsBinary.java b/jOOQ/src/main/java/org/jooq/impl/StAsBinary.java
index ddad09dc8e..fa30737d3b 100644
--- a/jOOQ/src/main/java/org/jooq/impl/StAsBinary.java
+++ b/jOOQ/src/main/java/org/jooq/impl/StAsBinary.java
@@ -169,5 +169,6 @@ package org.jooq.impl;
 
 
 
+
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/StAstext.java b/jOOQ/src/main/java/org/jooq/impl/StAstext.java
index ddad09dc8e..fa30737d3b 100644
--- a/jOOQ/src/main/java/org/jooq/impl/StAstext.java
+++ b/jOOQ/src/main/java/org/jooq/impl/StAstext.java
@@ -169,5 +169,6 @@ package org.jooq.impl;
 
 
 
+
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/StCentroid.java b/jOOQ/src/main/java/org/jooq/impl/StCentroid.java
index ddad09dc8e..fa30737d3b 100644
--- a/jOOQ/src/main/java/org/jooq/impl/StCentroid.java
+++ b/jOOQ/src/main/java/org/jooq/impl/StCentroid.java
@@ -169,5 +169,6 @@ package org.jooq.impl;
 
 
 
+
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/StContains.java b/jOOQ/src/main/java/org/jooq/impl/StContains.java
index 44460b2cc0..7ca316e578 100644
--- a/jOOQ/src/main/java/org/jooq/impl/StContains.java
+++ b/jOOQ/src/main/java/org/jooq/impl/StContains.java
@@ -181,5 +181,6 @@ package org.jooq.impl;
 
 
 
+
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/StCrosses.java b/jOOQ/src/main/java/org/jooq/impl/StCrosses.java
index d4b9b45ca7..0b331f3eba 100644
--- a/jOOQ/src/main/java/org/jooq/impl/StCrosses.java
+++ b/jOOQ/src/main/java/org/jooq/impl/StCrosses.java
@@ -174,5 +174,6 @@ package org.jooq.impl;
 
 
 
+
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/StDifference.java b/jOOQ/src/main/java/org/jooq/impl/StDifference.java
index 2a029311f6..736306be77 100644
--- a/jOOQ/src/main/java/org/jooq/impl/StDifference.java
+++ b/jOOQ/src/main/java/org/jooq/impl/StDifference.java
@@ -185,5 +185,6 @@ package org.jooq.impl;
 
 
 
+
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/StDisjoint.java b/jOOQ/src/main/java/org/jooq/impl/StDisjoint.java
index d4b9b45ca7..0b331f3eba 100644
--- a/jOOQ/src/main/java/org/jooq/impl/StDisjoint.java
+++ b/jOOQ/src/main/java/org/jooq/impl/StDisjoint.java
@@ -174,5 +174,6 @@ package org.jooq.impl;
 
 
 
+
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/StDistance.java b/jOOQ/src/main/java/org/jooq/impl/StDistance.java
index 2a029311f6..736306be77 100644
--- a/jOOQ/src/main/java/org/jooq/impl/StDistance.java
+++ b/jOOQ/src/main/java/org/jooq/impl/StDistance.java
@@ -185,5 +185,6 @@ package org.jooq.impl;
 
 
 
+
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/StEndPoint.java b/jOOQ/src/main/java/org/jooq/impl/StEndPoint.java
index 6588e99c36..0ff7a3c538 100644
--- a/jOOQ/src/main/java/org/jooq/impl/StEndPoint.java
+++ b/jOOQ/src/main/java/org/jooq/impl/StEndPoint.java
@@ -162,5 +162,6 @@ package org.jooq.impl;
 
 
 
+
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/StEquals.java b/jOOQ/src/main/java/org/jooq/impl/StEquals.java
index 44460b2cc0..7ca316e578 100644
--- a/jOOQ/src/main/java/org/jooq/impl/StEquals.java
+++ b/jOOQ/src/main/java/org/jooq/impl/StEquals.java
@@ -181,5 +181,6 @@ package org.jooq.impl;
 
 
 
+
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/StExteriorRing.java b/jOOQ/src/main/java/org/jooq/impl/StExteriorRing.java
index ddad09dc8e..fa30737d3b 100644
--- a/jOOQ/src/main/java/org/jooq/impl/StExteriorRing.java
+++ b/jOOQ/src/main/java/org/jooq/impl/StExteriorRing.java
@@ -169,5 +169,6 @@ package org.jooq.impl;
 
 
 
+
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/StGeomFromWKB.java b/jOOQ/src/main/java/org/jooq/impl/StGeomFromWKB.java
index 23f622f410..0aa1bf05f2 100644
--- a/jOOQ/src/main/java/org/jooq/impl/StGeomFromWKB.java
+++ b/jOOQ/src/main/java/org/jooq/impl/StGeomFromWKB.java
@@ -197,5 +197,6 @@ package org.jooq.impl;
 
 
 
+
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/StGeometryN.java b/jOOQ/src/main/java/org/jooq/impl/StGeometryN.java
index 4781ae7911..c04ae75906 100644
--- a/jOOQ/src/main/java/org/jooq/impl/StGeometryN.java
+++ b/jOOQ/src/main/java/org/jooq/impl/StGeometryN.java
@@ -178,5 +178,6 @@ package org.jooq.impl;
 
 
 
+
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/StGeometryType.java b/jOOQ/src/main/java/org/jooq/impl/StGeometryType.java
index 603cfe20b9..44460b2cc0 100644
--- a/jOOQ/src/main/java/org/jooq/impl/StGeometryType.java
+++ b/jOOQ/src/main/java/org/jooq/impl/StGeometryType.java
@@ -180,5 +180,6 @@ package org.jooq.impl;
 
 
 
+
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/StGeomfromtext.java b/jOOQ/src/main/java/org/jooq/impl/StGeomfromtext.java
index 23f622f410..0aa1bf05f2 100644
--- a/jOOQ/src/main/java/org/jooq/impl/StGeomfromtext.java
+++ b/jOOQ/src/main/java/org/jooq/impl/StGeomfromtext.java
@@ -197,5 +197,6 @@ package org.jooq.impl;
 
 
 
+
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/StInteriorRingN.java b/jOOQ/src/main/java/org/jooq/impl/StInteriorRingN.java
index 2a029311f6..736306be77 100644
--- a/jOOQ/src/main/java/org/jooq/impl/StInteriorRingN.java
+++ b/jOOQ/src/main/java/org/jooq/impl/StInteriorRingN.java
@@ -185,5 +185,6 @@ package org.jooq.impl;
 
 
 
+
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/StIntersection.java b/jOOQ/src/main/java/org/jooq/impl/StIntersection.java
index 2a029311f6..736306be77 100644
--- a/jOOQ/src/main/java/org/jooq/impl/StIntersection.java
+++ b/jOOQ/src/main/java/org/jooq/impl/StIntersection.java
@@ -185,5 +185,6 @@ package org.jooq.impl;
 
 
 
+
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/StIntersects.java b/jOOQ/src/main/java/org/jooq/impl/StIntersects.java
index 44460b2cc0..7ca316e578 100644
--- a/jOOQ/src/main/java/org/jooq/impl/StIntersects.java
+++ b/jOOQ/src/main/java/org/jooq/impl/StIntersects.java
@@ -181,5 +181,6 @@ package org.jooq.impl;
 
 
 
+
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/StIsClosed.java b/jOOQ/src/main/java/org/jooq/impl/StIsClosed.java
index 36a54c45d1..e6d7520c1a 100644
--- a/jOOQ/src/main/java/org/jooq/impl/StIsClosed.java
+++ b/jOOQ/src/main/java/org/jooq/impl/StIsClosed.java
@@ -158,5 +158,6 @@ package org.jooq.impl;
 
 
 
+
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/StIsEmpty.java b/jOOQ/src/main/java/org/jooq/impl/StIsEmpty.java
index 36a54c45d1..e6d7520c1a 100644
--- a/jOOQ/src/main/java/org/jooq/impl/StIsEmpty.java
+++ b/jOOQ/src/main/java/org/jooq/impl/StIsEmpty.java
@@ -158,5 +158,6 @@ package org.jooq.impl;
 
 
 
+
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/StLength.java b/jOOQ/src/main/java/org/jooq/impl/StLength.java
index ddad09dc8e..fa30737d3b 100644
--- a/jOOQ/src/main/java/org/jooq/impl/StLength.java
+++ b/jOOQ/src/main/java/org/jooq/impl/StLength.java
@@ -169,5 +169,6 @@ package org.jooq.impl;
 
 
 
+
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/StNumGeometries.java b/jOOQ/src/main/java/org/jooq/impl/StNumGeometries.java
index ddad09dc8e..fa30737d3b 100644
--- a/jOOQ/src/main/java/org/jooq/impl/StNumGeometries.java
+++ b/jOOQ/src/main/java/org/jooq/impl/StNumGeometries.java
@@ -169,5 +169,6 @@ package org.jooq.impl;
 
 
 
+
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/StNumInteriorRings.java b/jOOQ/src/main/java/org/jooq/impl/StNumInteriorRings.java
index d87369c1d8..afcff95425 100644
--- a/jOOQ/src/main/java/org/jooq/impl/StNumInteriorRings.java
+++ b/jOOQ/src/main/java/org/jooq/impl/StNumInteriorRings.java
@@ -176,5 +176,6 @@ package org.jooq.impl;
 
 
 
+
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/StNumPoints.java b/jOOQ/src/main/java/org/jooq/impl/StNumPoints.java
index 6588e99c36..0ff7a3c538 100644
--- a/jOOQ/src/main/java/org/jooq/impl/StNumPoints.java
+++ b/jOOQ/src/main/java/org/jooq/impl/StNumPoints.java
@@ -162,5 +162,6 @@ package org.jooq.impl;
 
 
 
+
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/StOverlaps.java b/jOOQ/src/main/java/org/jooq/impl/StOverlaps.java
index 44460b2cc0..7ca316e578 100644
--- a/jOOQ/src/main/java/org/jooq/impl/StOverlaps.java
+++ b/jOOQ/src/main/java/org/jooq/impl/StOverlaps.java
@@ -181,5 +181,6 @@ package org.jooq.impl;
 
 
 
+
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/StPointN.java b/jOOQ/src/main/java/org/jooq/impl/StPointN.java
index 4781ae7911..c04ae75906 100644
--- a/jOOQ/src/main/java/org/jooq/impl/StPointN.java
+++ b/jOOQ/src/main/java/org/jooq/impl/StPointN.java
@@ -178,5 +178,6 @@ package org.jooq.impl;
 
 
 
+
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/StSrid.java b/jOOQ/src/main/java/org/jooq/impl/StSrid.java
index ddad09dc8e..fa30737d3b 100644
--- a/jOOQ/src/main/java/org/jooq/impl/StSrid.java
+++ b/jOOQ/src/main/java/org/jooq/impl/StSrid.java
@@ -169,5 +169,6 @@ package org.jooq.impl;
 
 
 
+
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/StStartPoint.java b/jOOQ/src/main/java/org/jooq/impl/StStartPoint.java
index 6588e99c36..0ff7a3c538 100644
--- a/jOOQ/src/main/java/org/jooq/impl/StStartPoint.java
+++ b/jOOQ/src/main/java/org/jooq/impl/StStartPoint.java
@@ -162,5 +162,6 @@ package org.jooq.impl;
 
 
 
+
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/StTouches.java b/jOOQ/src/main/java/org/jooq/impl/StTouches.java
index 44460b2cc0..7ca316e578 100644
--- a/jOOQ/src/main/java/org/jooq/impl/StTouches.java
+++ b/jOOQ/src/main/java/org/jooq/impl/StTouches.java
@@ -181,5 +181,6 @@ package org.jooq.impl;
 
 
 
+
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/StUnion.java b/jOOQ/src/main/java/org/jooq/impl/StUnion.java
index 9e83cf1cb4..5e66a6a109 100644
--- a/jOOQ/src/main/java/org/jooq/impl/StUnion.java
+++ b/jOOQ/src/main/java/org/jooq/impl/StUnion.java
@@ -195,5 +195,6 @@ package org.jooq.impl;
 
 
 
+
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/StWithin.java b/jOOQ/src/main/java/org/jooq/impl/StWithin.java
index 44460b2cc0..7ca316e578 100644
--- a/jOOQ/src/main/java/org/jooq/impl/StWithin.java
+++ b/jOOQ/src/main/java/org/jooq/impl/StWithin.java
@@ -181,5 +181,6 @@ package org.jooq.impl;
 
 
 
+
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/StX.java b/jOOQ/src/main/java/org/jooq/impl/StX.java
index ddad09dc8e..fa30737d3b 100644
--- a/jOOQ/src/main/java/org/jooq/impl/StX.java
+++ b/jOOQ/src/main/java/org/jooq/impl/StX.java
@@ -169,5 +169,6 @@ package org.jooq.impl;
 
 
 
+
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/StY.java b/jOOQ/src/main/java/org/jooq/impl/StY.java
index ddad09dc8e..fa30737d3b 100644
--- a/jOOQ/src/main/java/org/jooq/impl/StY.java
+++ b/jOOQ/src/main/java/org/jooq/impl/StY.java
@@ -169,5 +169,6 @@ package org.jooq.impl;
 
 
 
+
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/StZ.java b/jOOQ/src/main/java/org/jooq/impl/StZ.java
index ddad09dc8e..fa30737d3b 100644
--- a/jOOQ/src/main/java/org/jooq/impl/StZ.java
+++ b/jOOQ/src/main/java/org/jooq/impl/StZ.java
@@ -169,5 +169,6 @@ package org.jooq.impl;
 
 
 
+
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/StartTransaction.java b/jOOQ/src/main/java/org/jooq/impl/StartTransaction.java
index 91dc034ad0..ad07fcd971 100644
--- a/jOOQ/src/main/java/org/jooq/impl/StartTransaction.java
+++ b/jOOQ/src/main/java/org/jooq/impl/StartTransaction.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>START TRANSACTION</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/StartsWith.java b/jOOQ/src/main/java/org/jooq/impl/StartsWith.java
index 6cff833f79..31e5040deb 100644
--- a/jOOQ/src/main/java/org/jooq/impl/StartsWith.java
+++ b/jOOQ/src/main/java/org/jooq/impl/StartsWith.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>STARTS WITH</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/StartsWithIgnoreCase.java b/jOOQ/src/main/java/org/jooq/impl/StartsWithIgnoreCase.java
index 011704e8f3..c90bfa1a50 100644
--- a/jOOQ/src/main/java/org/jooq/impl/StartsWithIgnoreCase.java
+++ b/jOOQ/src/main/java/org/jooq/impl/StartsWithIgnoreCase.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>STARTS WITH IGNORE CASE</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/StddevPop.java b/jOOQ/src/main/java/org/jooq/impl/StddevPop.java
index 929eb6c638..1de9a4994f 100644
--- a/jOOQ/src/main/java/org/jooq/impl/StddevPop.java
+++ b/jOOQ/src/main/java/org/jooq/impl/StddevPop.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -61,6 +61,7 @@ import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
+
 import java.math.BigDecimal;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/StddevSamp.java b/jOOQ/src/main/java/org/jooq/impl/StddevSamp.java
index 9f624912a4..d624bdb8a6 100644
--- a/jOOQ/src/main/java/org/jooq/impl/StddevSamp.java
+++ b/jOOQ/src/main/java/org/jooq/impl/StddevSamp.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -61,6 +61,7 @@ import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
+
 import java.math.BigDecimal;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Sub.java b/jOOQ/src/main/java/org/jooq/impl/Sub.java
index 51d4a10320..3578143d45 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Sub.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Sub.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -62,6 +62,8 @@ import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
 
+import org.jooq.conf.TransformUnneededArithmeticExpressions;
+
 
 /**
  * The <code>SUB</code> statement.
diff --git a/jOOQ/src/main/java/org/jooq/impl/Substring.java b/jOOQ/src/main/java/org/jooq/impl/Substring.java
index b5f51b324e..2ac4666aa5 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Substring.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Substring.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>SUBSTRING</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/SubstringIndex.java b/jOOQ/src/main/java/org/jooq/impl/SubstringIndex.java
index 1ed619faf1..97d3361df9 100644
--- a/jOOQ/src/main/java/org/jooq/impl/SubstringIndex.java
+++ b/jOOQ/src/main/java/org/jooq/impl/SubstringIndex.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>SUBSTRING INDEX</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/Sum.java b/jOOQ/src/main/java/org/jooq/impl/Sum.java
index e00a257e12..1dc483bae8 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Sum.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Sum.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -61,6 +61,7 @@ import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
+
 import java.math.BigDecimal;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/SysConnectByPath.java b/jOOQ/src/main/java/org/jooq/impl/SysConnectByPath.java
index bb21ab5421..ddad09dc8e 100644
--- a/jOOQ/src/main/java/org/jooq/impl/SysConnectByPath.java
+++ b/jOOQ/src/main/java/org/jooq/impl/SysConnectByPath.java
@@ -168,5 +168,6 @@ package org.jooq.impl;
 
 
 
+
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/TableEq.java b/jOOQ/src/main/java/org/jooq/impl/TableEq.java
index 9512a24063..4d65812ed8 100644
--- a/jOOQ/src/main/java/org/jooq/impl/TableEq.java
+++ b/jOOQ/src/main/java/org/jooq/impl/TableEq.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>EQ</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/TableNe.java b/jOOQ/src/main/java/org/jooq/impl/TableNe.java
index fc7654e4dc..7cd5ef06fd 100644
--- a/jOOQ/src/main/java/org/jooq/impl/TableNe.java
+++ b/jOOQ/src/main/java/org/jooq/impl/TableNe.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>NE</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/Tan.java b/jOOQ/src/main/java/org/jooq/impl/Tan.java
index f5a09badbf..872856888f 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Tan.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Tan.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -61,6 +61,7 @@ import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
+
 import java.math.BigDecimal;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Tanh.java b/jOOQ/src/main/java/org/jooq/impl/Tanh.java
index b96736c7f2..cb61335c21 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Tanh.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Tanh.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -61,6 +61,7 @@ import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
+
 import java.math.BigDecimal;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Tau.java b/jOOQ/src/main/java/org/jooq/impl/Tau.java
index 76b4086290..66c9e497ff 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Tau.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Tau.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -61,6 +61,7 @@ import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
+
 import java.math.BigDecimal;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/ToChar.java b/jOOQ/src/main/java/org/jooq/impl/ToChar.java
index 2f42330cd3..8cd3f06d32 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ToChar.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ToChar.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>TO CHAR</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/ToDate.java b/jOOQ/src/main/java/org/jooq/impl/ToDate.java
index 2acd62c653..469b5ff84d 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ToDate.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ToDate.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -61,6 +61,7 @@ import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
+
 import java.sql.Date;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/ToHex.java b/jOOQ/src/main/java/org/jooq/impl/ToHex.java
index f5fe38b409..bf09109db6 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ToHex.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ToHex.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>TO HEX</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/ToTimestamp.java b/jOOQ/src/main/java/org/jooq/impl/ToTimestamp.java
index c2a174dea4..d40caba273 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ToTimestamp.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ToTimestamp.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -61,6 +61,7 @@ import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
+
 import java.sql.Timestamp;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Translate.java b/jOOQ/src/main/java/org/jooq/impl/Translate.java
index 5ad8b7014f..ebc5f8c898 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Translate.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Translate.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>TRANSLATE</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/Trim.java b/jOOQ/src/main/java/org/jooq/impl/Trim.java
index b611552d13..5f9971da8c 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Trim.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Trim.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>TRIM</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/Trunc.java b/jOOQ/src/main/java/org/jooq/impl/Trunc.java
index 4c99105af5..6f8f4dd684 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Trunc.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Trunc.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>TRUNC</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/TruncateImpl.java b/jOOQ/src/main/java/org/jooq/impl/TruncateImpl.java
index 23b58fd815..39ba95c766 100644
--- a/jOOQ/src/main/java/org/jooq/impl/TruncateImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/TruncateImpl.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.impl.QOM.IdentityRestartOption;
 import org.jooq.impl.QOM.Cascade;
 import org.jooq.tools.StringUtils;
@@ -65,6 +65,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>TRUNCATE</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/TryCast.java b/jOOQ/src/main/java/org/jooq/impl/TryCast.java
index d118c1e227..b75ae250af 100644
--- a/jOOQ/src/main/java/org/jooq/impl/TryCast.java
+++ b/jOOQ/src/main/java/org/jooq/impl/TryCast.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>TRY CAST</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/Unique.java b/jOOQ/src/main/java/org/jooq/impl/Unique.java
index a42b3f8a2f..40ff0c9ce0 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Unique.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Unique.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>UNIQUE</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/Updating.java b/jOOQ/src/main/java/org/jooq/impl/Updating.java
index 715928ec4a..da143244c4 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Updating.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Updating.java
@@ -139,5 +139,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 878c291664..2a3a219580 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Upper.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Upper.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>UPPER</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/Uuid.java b/jOOQ/src/main/java/org/jooq/impl/Uuid.java
index ef66b9d305..ec67e49f7d 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Uuid.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Uuid.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -61,6 +61,7 @@ import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
+
 import java.util.UUID;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/UuidToBin.java b/jOOQ/src/main/java/org/jooq/impl/UuidToBin.java
index c415557179..ee820f7db3 100644
--- a/jOOQ/src/main/java/org/jooq/impl/UuidToBin.java
+++ b/jOOQ/src/main/java/org/jooq/impl/UuidToBin.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -61,6 +61,7 @@ import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
+
 import java.util.UUID;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/VarPop.java b/jOOQ/src/main/java/org/jooq/impl/VarPop.java
index 9d5d859d0a..ab7e880fdb 100644
--- a/jOOQ/src/main/java/org/jooq/impl/VarPop.java
+++ b/jOOQ/src/main/java/org/jooq/impl/VarPop.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -61,6 +61,7 @@ import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
+
 import java.math.BigDecimal;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/VarSamp.java b/jOOQ/src/main/java/org/jooq/impl/VarSamp.java
index eb36fa14f0..d9c62b9f92 100644
--- a/jOOQ/src/main/java/org/jooq/impl/VarSamp.java
+++ b/jOOQ/src/main/java/org/jooq/impl/VarSamp.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -61,6 +61,7 @@ import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
+
 import java.math.BigDecimal;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/WidthBucket.java b/jOOQ/src/main/java/org/jooq/impl/WidthBucket.java
index 4328f0e825..5d07766be4 100644
--- a/jOOQ/src/main/java/org/jooq/impl/WidthBucket.java
+++ b/jOOQ/src/main/java/org/jooq/impl/WidthBucket.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>WIDTH BUCKET</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/XMLComment.java b/jOOQ/src/main/java/org/jooq/impl/XMLComment.java
index b5baa897bb..fdfd99dd0a 100644
--- a/jOOQ/src/main/java/org/jooq/impl/XMLComment.java
+++ b/jOOQ/src/main/java/org/jooq/impl/XMLComment.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>XMLCOMMENT</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/XMLForest.java b/jOOQ/src/main/java/org/jooq/impl/XMLForest.java
index 113ad1eeba..259c03558f 100644
--- a/jOOQ/src/main/java/org/jooq/impl/XMLForest.java
+++ b/jOOQ/src/main/java/org/jooq/impl/XMLForest.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>XMLFOREST</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/Xmlconcat.java b/jOOQ/src/main/java/org/jooq/impl/Xmlconcat.java
index 27945fb9e0..e45beea1f6 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Xmlconcat.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Xmlconcat.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>XMLCONCAT</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/Xmldocument.java b/jOOQ/src/main/java/org/jooq/impl/Xmldocument.java
index 6cf2ed86be..6586d5d942 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Xmldocument.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Xmldocument.java
@@ -149,5 +149,6 @@ package org.jooq.impl;
 
 
 
+
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Xmlpi.java b/jOOQ/src/main/java/org/jooq/impl/Xmlpi.java
index a4fdff3179..f9a37d9b05 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Xmlpi.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Xmlpi.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>XMLPI</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/Xmlserialize.java b/jOOQ/src/main/java/org/jooq/impl/Xmlserialize.java
index 8f58144122..b90bde9c02 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Xmlserialize.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Xmlserialize.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>XMLSERIALIZE</code> statement.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/Xor.java b/jOOQ/src/main/java/org/jooq/impl/Xor.java
index 3a2cb4def3..9317d07527 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Xor.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Xor.java
@@ -51,7 +51,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.Function1;
 import org.jooq.Record;
-import org.jooq.conf.*;
+import org.jooq.conf.ParamType;
 import org.jooq.tools.StringUtils;
 
 import java.util.ArrayList;
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 /**
  * The <code>XOR</code> statement.
  */