diff --git a/jOOQ/src/main/java/org/jooq/AlterDatabaseFinalStep.java b/jOOQ/src/main/java/org/jooq/AlterDatabaseFinalStep.java
index c11b7cccd8..484c19ca7f 100644
--- a/jOOQ/src/main/java/org/jooq/AlterDatabaseFinalStep.java
+++ b/jOOQ/src/main/java/org/jooq/AlterDatabaseFinalStep.java
@@ -38,9 +38,12 @@
 package org.jooq;
 
 import static org.jooq.SQLDialect.*;
+import static org.jooq.impl.DSL.*;
 
 import java.util.*;
 
+import org.jooq.impl.DSL;
+
 import org.jetbrains.annotations.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/AlterDatabaseStep.java b/jOOQ/src/main/java/org/jooq/AlterDatabaseStep.java
index fd3eefbeda..709bb7712c 100644
--- a/jOOQ/src/main/java/org/jooq/AlterDatabaseStep.java
+++ b/jOOQ/src/main/java/org/jooq/AlterDatabaseStep.java
@@ -38,9 +38,12 @@
 package org.jooq;
 
 import static org.jooq.SQLDialect.*;
+import static org.jooq.impl.DSL.*;
 
 import java.util.*;
 
+import org.jooq.impl.DSL;
+
 import org.jetbrains.annotations.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/AlterDomainDropConstraintCascadeStep.java b/jOOQ/src/main/java/org/jooq/AlterDomainDropConstraintCascadeStep.java
index 1070d19205..27be9f2043 100644
--- a/jOOQ/src/main/java/org/jooq/AlterDomainDropConstraintCascadeStep.java
+++ b/jOOQ/src/main/java/org/jooq/AlterDomainDropConstraintCascadeStep.java
@@ -38,9 +38,12 @@
 package org.jooq;
 
 import static org.jooq.SQLDialect.*;
+import static org.jooq.impl.DSL.*;
 
 import java.util.*;
 
+import org.jooq.impl.DSL;
+
 import org.jetbrains.annotations.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/AlterDomainFinalStep.java b/jOOQ/src/main/java/org/jooq/AlterDomainFinalStep.java
index 698cc0ba1e..7a4d3ef873 100644
--- a/jOOQ/src/main/java/org/jooq/AlterDomainFinalStep.java
+++ b/jOOQ/src/main/java/org/jooq/AlterDomainFinalStep.java
@@ -38,9 +38,12 @@
 package org.jooq;
 
 import static org.jooq.SQLDialect.*;
+import static org.jooq.impl.DSL.*;
 
 import java.util.*;
 
+import org.jooq.impl.DSL;
+
 import org.jetbrains.annotations.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/AlterDomainRenameConstraintStep.java b/jOOQ/src/main/java/org/jooq/AlterDomainRenameConstraintStep.java
index 9786774e12..9a4bfb5bde 100644
--- a/jOOQ/src/main/java/org/jooq/AlterDomainRenameConstraintStep.java
+++ b/jOOQ/src/main/java/org/jooq/AlterDomainRenameConstraintStep.java
@@ -38,9 +38,12 @@
 package org.jooq;
 
 import static org.jooq.SQLDialect.*;
+import static org.jooq.impl.DSL.*;
 
 import java.util.*;
 
+import org.jooq.impl.DSL;
+
 import org.jetbrains.annotations.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/AlterDomainStep.java b/jOOQ/src/main/java/org/jooq/AlterDomainStep.java
index c7e6944a21..ae2d049af3 100644
--- a/jOOQ/src/main/java/org/jooq/AlterDomainStep.java
+++ b/jOOQ/src/main/java/org/jooq/AlterDomainStep.java
@@ -38,9 +38,12 @@
 package org.jooq;
 
 import static org.jooq.SQLDialect.*;
+import static org.jooq.impl.DSL.*;
 
 import java.util.*;
 
+import org.jooq.impl.DSL;
+
 import org.jetbrains.annotations.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/AlterIndexFinalStep.java b/jOOQ/src/main/java/org/jooq/AlterIndexFinalStep.java
index d5e211f7e3..5586cbdb8e 100644
--- a/jOOQ/src/main/java/org/jooq/AlterIndexFinalStep.java
+++ b/jOOQ/src/main/java/org/jooq/AlterIndexFinalStep.java
@@ -38,9 +38,12 @@
 package org.jooq;
 
 import static org.jooq.SQLDialect.*;
+import static org.jooq.impl.DSL.*;
 
 import java.util.*;
 
+import org.jooq.impl.DSL;
+
 import org.jetbrains.annotations.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/AlterIndexOnStep.java b/jOOQ/src/main/java/org/jooq/AlterIndexOnStep.java
index db09853e9e..29009d7e76 100644
--- a/jOOQ/src/main/java/org/jooq/AlterIndexOnStep.java
+++ b/jOOQ/src/main/java/org/jooq/AlterIndexOnStep.java
@@ -38,9 +38,12 @@
 package org.jooq;
 
 import static org.jooq.SQLDialect.*;
+import static org.jooq.impl.DSL.*;
 
 import java.util.*;
 
+import org.jooq.impl.DSL;
+
 import org.jetbrains.annotations.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/AlterIndexStep.java b/jOOQ/src/main/java/org/jooq/AlterIndexStep.java
index e14b410f4d..45081c602b 100644
--- a/jOOQ/src/main/java/org/jooq/AlterIndexStep.java
+++ b/jOOQ/src/main/java/org/jooq/AlterIndexStep.java
@@ -38,9 +38,12 @@
 package org.jooq;
 
 import static org.jooq.SQLDialect.*;
+import static org.jooq.impl.DSL.*;
 
 import java.util.*;
 
+import org.jooq.impl.DSL;
+
 import org.jetbrains.annotations.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/AlterSchemaFinalStep.java b/jOOQ/src/main/java/org/jooq/AlterSchemaFinalStep.java
index 9205cc2fcd..962b5ae30e 100644
--- a/jOOQ/src/main/java/org/jooq/AlterSchemaFinalStep.java
+++ b/jOOQ/src/main/java/org/jooq/AlterSchemaFinalStep.java
@@ -38,9 +38,12 @@
 package org.jooq;
 
 import static org.jooq.SQLDialect.*;
+import static org.jooq.impl.DSL.*;
 
 import java.util.*;
 
+import org.jooq.impl.DSL;
+
 import org.jetbrains.annotations.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/AlterSchemaStep.java b/jOOQ/src/main/java/org/jooq/AlterSchemaStep.java
index ef0fc5e3b7..61460ae52e 100644
--- a/jOOQ/src/main/java/org/jooq/AlterSchemaStep.java
+++ b/jOOQ/src/main/java/org/jooq/AlterSchemaStep.java
@@ -38,9 +38,12 @@
 package org.jooq;
 
 import static org.jooq.SQLDialect.*;
+import static org.jooq.impl.DSL.*;
 
 import java.util.*;
 
+import org.jooq.impl.DSL;
+
 import org.jetbrains.annotations.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/AlterSequenceFinalStep.java b/jOOQ/src/main/java/org/jooq/AlterSequenceFinalStep.java
index 1d61b57b25..ed354c7ea6 100644
--- a/jOOQ/src/main/java/org/jooq/AlterSequenceFinalStep.java
+++ b/jOOQ/src/main/java/org/jooq/AlterSequenceFinalStep.java
@@ -38,9 +38,12 @@
 package org.jooq;
 
 import static org.jooq.SQLDialect.*;
+import static org.jooq.impl.DSL.*;
 
 import java.util.*;
 
+import org.jooq.impl.DSL;
+
 import org.jetbrains.annotations.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/AlterSequenceFlagsStep.java b/jOOQ/src/main/java/org/jooq/AlterSequenceFlagsStep.java
index ee4951499a..fe4bc41f0b 100644
--- a/jOOQ/src/main/java/org/jooq/AlterSequenceFlagsStep.java
+++ b/jOOQ/src/main/java/org/jooq/AlterSequenceFlagsStep.java
@@ -38,9 +38,12 @@
 package org.jooq;
 
 import static org.jooq.SQLDialect.*;
+import static org.jooq.impl.DSL.*;
 
 import java.util.*;
 
+import org.jooq.impl.DSL;
+
 import org.jetbrains.annotations.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/AlterSequenceStep.java b/jOOQ/src/main/java/org/jooq/AlterSequenceStep.java
index f5444cd5e7..2a80e0e0b7 100644
--- a/jOOQ/src/main/java/org/jooq/AlterSequenceStep.java
+++ b/jOOQ/src/main/java/org/jooq/AlterSequenceStep.java
@@ -38,9 +38,12 @@
 package org.jooq;
 
 import static org.jooq.SQLDialect.*;
+import static org.jooq.impl.DSL.*;
 
 import java.util.*;
 
+import org.jooq.impl.DSL;
+
 import org.jetbrains.annotations.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/AlterTypeFinalStep.java b/jOOQ/src/main/java/org/jooq/AlterTypeFinalStep.java
index 22965d6f55..2862fef745 100644
--- a/jOOQ/src/main/java/org/jooq/AlterTypeFinalStep.java
+++ b/jOOQ/src/main/java/org/jooq/AlterTypeFinalStep.java
@@ -38,9 +38,12 @@
 package org.jooq;
 
 import static org.jooq.SQLDialect.*;
+import static org.jooq.impl.DSL.*;
 
 import java.util.*;
 
+import org.jooq.impl.DSL;
+
 import org.jetbrains.annotations.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/AlterTypeRenameValueToStep.java b/jOOQ/src/main/java/org/jooq/AlterTypeRenameValueToStep.java
index 911cde30d9..23290e2a44 100644
--- a/jOOQ/src/main/java/org/jooq/AlterTypeRenameValueToStep.java
+++ b/jOOQ/src/main/java/org/jooq/AlterTypeRenameValueToStep.java
@@ -38,9 +38,12 @@
 package org.jooq;
 
 import static org.jooq.SQLDialect.*;
+import static org.jooq.impl.DSL.*;
 
 import java.util.*;
 
+import org.jooq.impl.DSL;
+
 import org.jetbrains.annotations.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/AlterTypeStep.java b/jOOQ/src/main/java/org/jooq/AlterTypeStep.java
index 3275cd1490..81fb9dac9f 100644
--- a/jOOQ/src/main/java/org/jooq/AlterTypeStep.java
+++ b/jOOQ/src/main/java/org/jooq/AlterTypeStep.java
@@ -38,9 +38,12 @@
 package org.jooq;
 
 import static org.jooq.SQLDialect.*;
+import static org.jooq.impl.DSL.*;
 
 import java.util.*;
 
+import org.jooq.impl.DSL;
+
 import org.jetbrains.annotations.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/AlterViewFinalStep.java b/jOOQ/src/main/java/org/jooq/AlterViewFinalStep.java
index 0f2b6e33d7..5a1d379c3a 100644
--- a/jOOQ/src/main/java/org/jooq/AlterViewFinalStep.java
+++ b/jOOQ/src/main/java/org/jooq/AlterViewFinalStep.java
@@ -38,9 +38,12 @@
 package org.jooq;
 
 import static org.jooq.SQLDialect.*;
+import static org.jooq.impl.DSL.*;
 
 import java.util.*;
 
+import org.jooq.impl.DSL;
+
 import org.jetbrains.annotations.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/AlterViewStep.java b/jOOQ/src/main/java/org/jooq/AlterViewStep.java
index 0bc817bcea..83ef351971 100644
--- a/jOOQ/src/main/java/org/jooq/AlterViewStep.java
+++ b/jOOQ/src/main/java/org/jooq/AlterViewStep.java
@@ -38,9 +38,12 @@
 package org.jooq;
 
 import static org.jooq.SQLDialect.*;
+import static org.jooq.impl.DSL.*;
 
 import java.util.*;
 
+import org.jooq.impl.DSL;
+
 import org.jetbrains.annotations.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/CallArgsStep.java b/jOOQ/src/main/java/org/jooq/CallArgsStep.java
index 33f3faa804..bc0d260d57 100644
--- a/jOOQ/src/main/java/org/jooq/CallArgsStep.java
+++ b/jOOQ/src/main/java/org/jooq/CallArgsStep.java
@@ -82,6 +82,9 @@ package org.jooq;
 
 
 
+
+
+
 
 
 
diff --git a/jOOQ/src/main/java/org/jooq/CommentOnFinalStep.java b/jOOQ/src/main/java/org/jooq/CommentOnFinalStep.java
index 578a16953c..817404d86b 100644
--- a/jOOQ/src/main/java/org/jooq/CommentOnFinalStep.java
+++ b/jOOQ/src/main/java/org/jooq/CommentOnFinalStep.java
@@ -38,9 +38,12 @@
 package org.jooq;
 
 import static org.jooq.SQLDialect.*;
+import static org.jooq.impl.DSL.*;
 
 import java.util.*;
 
+import org.jooq.impl.DSL;
+
 import org.jetbrains.annotations.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/CommentOnIsStep.java b/jOOQ/src/main/java/org/jooq/CommentOnIsStep.java
index 340862e0b4..875c94bab1 100644
--- a/jOOQ/src/main/java/org/jooq/CommentOnIsStep.java
+++ b/jOOQ/src/main/java/org/jooq/CommentOnIsStep.java
@@ -38,9 +38,12 @@
 package org.jooq;
 
 import static org.jooq.SQLDialect.*;
+import static org.jooq.impl.DSL.*;
 
 import java.util.*;
 
+import org.jooq.impl.DSL;
+
 import org.jetbrains.annotations.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/CreateDatabaseFinalStep.java b/jOOQ/src/main/java/org/jooq/CreateDatabaseFinalStep.java
index c565643b41..0f81ee6085 100644
--- a/jOOQ/src/main/java/org/jooq/CreateDatabaseFinalStep.java
+++ b/jOOQ/src/main/java/org/jooq/CreateDatabaseFinalStep.java
@@ -38,9 +38,12 @@
 package org.jooq;
 
 import static org.jooq.SQLDialect.*;
+import static org.jooq.impl.DSL.*;
 
 import java.util.*;
 
+import org.jooq.impl.DSL;
+
 import org.jetbrains.annotations.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/CreateDomainAsStep.java b/jOOQ/src/main/java/org/jooq/CreateDomainAsStep.java
index 5c491457dc..fd4ca728a2 100644
--- a/jOOQ/src/main/java/org/jooq/CreateDomainAsStep.java
+++ b/jOOQ/src/main/java/org/jooq/CreateDomainAsStep.java
@@ -38,9 +38,12 @@
 package org.jooq;
 
 import static org.jooq.SQLDialect.*;
+import static org.jooq.impl.DSL.*;
 
 import java.util.*;
 
+import org.jooq.impl.DSL;
+
 import org.jetbrains.annotations.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/CreateDomainConstraintStep.java b/jOOQ/src/main/java/org/jooq/CreateDomainConstraintStep.java
index 7f0f437b70..61338d53cf 100644
--- a/jOOQ/src/main/java/org/jooq/CreateDomainConstraintStep.java
+++ b/jOOQ/src/main/java/org/jooq/CreateDomainConstraintStep.java
@@ -38,9 +38,12 @@
 package org.jooq;
 
 import static org.jooq.SQLDialect.*;
+import static org.jooq.impl.DSL.*;
 
 import java.util.*;
 
+import org.jooq.impl.DSL;
+
 import org.jetbrains.annotations.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/CreateDomainDefaultStep.java b/jOOQ/src/main/java/org/jooq/CreateDomainDefaultStep.java
index 2d1252a577..ec3bbff697 100644
--- a/jOOQ/src/main/java/org/jooq/CreateDomainDefaultStep.java
+++ b/jOOQ/src/main/java/org/jooq/CreateDomainDefaultStep.java
@@ -38,9 +38,12 @@
 package org.jooq;
 
 import static org.jooq.SQLDialect.*;
+import static org.jooq.impl.DSL.*;
 
 import java.util.*;
 
+import org.jooq.impl.DSL;
+
 import org.jetbrains.annotations.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/CreateDomainFinalStep.java b/jOOQ/src/main/java/org/jooq/CreateDomainFinalStep.java
index 7c08acc671..20f7476b84 100644
--- a/jOOQ/src/main/java/org/jooq/CreateDomainFinalStep.java
+++ b/jOOQ/src/main/java/org/jooq/CreateDomainFinalStep.java
@@ -38,9 +38,12 @@
 package org.jooq;
 
 import static org.jooq.SQLDialect.*;
+import static org.jooq.impl.DSL.*;
 
 import java.util.*;
 
+import org.jooq.impl.DSL;
+
 import org.jetbrains.annotations.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/CreateFunctionAsStep.java b/jOOQ/src/main/java/org/jooq/CreateFunctionAsStep.java
index 4b85ea5bfe..7eb97e1b69 100644
--- a/jOOQ/src/main/java/org/jooq/CreateFunctionAsStep.java
+++ b/jOOQ/src/main/java/org/jooq/CreateFunctionAsStep.java
@@ -89,6 +89,9 @@ package org.jooq;
 
 
 
+
+
+
 
 
 
diff --git a/jOOQ/src/main/java/org/jooq/CreateFunctionCharacteristicsStep.java b/jOOQ/src/main/java/org/jooq/CreateFunctionCharacteristicsStep.java
index ab282119fa..7766498470 100644
--- a/jOOQ/src/main/java/org/jooq/CreateFunctionCharacteristicsStep.java
+++ b/jOOQ/src/main/java/org/jooq/CreateFunctionCharacteristicsStep.java
@@ -124,6 +124,9 @@ package org.jooq;
 
 
 
+
+
+
 
 
 
diff --git a/jOOQ/src/main/java/org/jooq/CreateFunctionParametersStep.java b/jOOQ/src/main/java/org/jooq/CreateFunctionParametersStep.java
index 33f3faa804..bc0d260d57 100644
--- a/jOOQ/src/main/java/org/jooq/CreateFunctionParametersStep.java
+++ b/jOOQ/src/main/java/org/jooq/CreateFunctionParametersStep.java
@@ -82,6 +82,9 @@ package org.jooq;
 
 
 
+
+
+
 
 
 
diff --git a/jOOQ/src/main/java/org/jooq/CreateFunctionReturnsStep.java b/jOOQ/src/main/java/org/jooq/CreateFunctionReturnsStep.java
index 4b85ea5bfe..7eb97e1b69 100644
--- a/jOOQ/src/main/java/org/jooq/CreateFunctionReturnsStep.java
+++ b/jOOQ/src/main/java/org/jooq/CreateFunctionReturnsStep.java
@@ -89,6 +89,9 @@ package org.jooq;
 
 
 
+
+
+
 
 
 
diff --git a/jOOQ/src/main/java/org/jooq/CreateIndexFinalStep.java b/jOOQ/src/main/java/org/jooq/CreateIndexFinalStep.java
index fc56cb5ba3..bdd6d1121e 100644
--- a/jOOQ/src/main/java/org/jooq/CreateIndexFinalStep.java
+++ b/jOOQ/src/main/java/org/jooq/CreateIndexFinalStep.java
@@ -38,9 +38,12 @@
 package org.jooq;
 
 import static org.jooq.SQLDialect.*;
+import static org.jooq.impl.DSL.*;
 
 import java.util.*;
 
+import org.jooq.impl.DSL;
+
 import org.jetbrains.annotations.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/CreateIndexIncludeStep.java b/jOOQ/src/main/java/org/jooq/CreateIndexIncludeStep.java
index 6f64af00c4..33682ea8d0 100644
--- a/jOOQ/src/main/java/org/jooq/CreateIndexIncludeStep.java
+++ b/jOOQ/src/main/java/org/jooq/CreateIndexIncludeStep.java
@@ -38,9 +38,12 @@
 package org.jooq;
 
 import static org.jooq.SQLDialect.*;
+import static org.jooq.impl.DSL.*;
 
 import java.util.*;
 
+import org.jooq.impl.DSL;
+
 import org.jetbrains.annotations.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/CreateIndexStep.java b/jOOQ/src/main/java/org/jooq/CreateIndexStep.java
index 9398939880..4a5724ac0e 100644
--- a/jOOQ/src/main/java/org/jooq/CreateIndexStep.java
+++ b/jOOQ/src/main/java/org/jooq/CreateIndexStep.java
@@ -38,9 +38,12 @@
 package org.jooq;
 
 import static org.jooq.SQLDialect.*;
+import static org.jooq.impl.DSL.*;
 
 import java.util.*;
 
+import org.jooq.impl.DSL;
+
 import org.jetbrains.annotations.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/CreateIndexWhereStep.java b/jOOQ/src/main/java/org/jooq/CreateIndexWhereStep.java
index 4defaf6fb8..ebb2c88365 100644
--- a/jOOQ/src/main/java/org/jooq/CreateIndexWhereStep.java
+++ b/jOOQ/src/main/java/org/jooq/CreateIndexWhereStep.java
@@ -38,9 +38,12 @@
 package org.jooq;
 
 import static org.jooq.SQLDialect.*;
+import static org.jooq.impl.DSL.*;
 
 import java.util.*;
 
+import org.jooq.impl.DSL;
+
 import org.jetbrains.annotations.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/CreateProcedureAsStep.java b/jOOQ/src/main/java/org/jooq/CreateProcedureAsStep.java
index 4b85ea5bfe..7eb97e1b69 100644
--- a/jOOQ/src/main/java/org/jooq/CreateProcedureAsStep.java
+++ b/jOOQ/src/main/java/org/jooq/CreateProcedureAsStep.java
@@ -89,6 +89,9 @@ package org.jooq;
 
 
 
+
+
+
 
 
 
diff --git a/jOOQ/src/main/java/org/jooq/CreateProcedureCharacteristicsStep.java b/jOOQ/src/main/java/org/jooq/CreateProcedureCharacteristicsStep.java
index 67156d36e4..c20abfbcf9 100644
--- a/jOOQ/src/main/java/org/jooq/CreateProcedureCharacteristicsStep.java
+++ b/jOOQ/src/main/java/org/jooq/CreateProcedureCharacteristicsStep.java
@@ -96,6 +96,9 @@ package org.jooq;
 
 
 
+
+
+
 
 
 
diff --git a/jOOQ/src/main/java/org/jooq/CreateProcedureParametersStep.java b/jOOQ/src/main/java/org/jooq/CreateProcedureParametersStep.java
index 33f3faa804..bc0d260d57 100644
--- a/jOOQ/src/main/java/org/jooq/CreateProcedureParametersStep.java
+++ b/jOOQ/src/main/java/org/jooq/CreateProcedureParametersStep.java
@@ -82,6 +82,9 @@ package org.jooq;
 
 
 
+
+
+
 
 
 
diff --git a/jOOQ/src/main/java/org/jooq/CreateSchemaFinalStep.java b/jOOQ/src/main/java/org/jooq/CreateSchemaFinalStep.java
index 4238ca994a..c0659035ed 100644
--- a/jOOQ/src/main/java/org/jooq/CreateSchemaFinalStep.java
+++ b/jOOQ/src/main/java/org/jooq/CreateSchemaFinalStep.java
@@ -38,9 +38,12 @@
 package org.jooq;
 
 import static org.jooq.SQLDialect.*;
+import static org.jooq.impl.DSL.*;
 
 import java.util.*;
 
+import org.jooq.impl.DSL;
+
 import org.jetbrains.annotations.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/CreateSequenceFinalStep.java b/jOOQ/src/main/java/org/jooq/CreateSequenceFinalStep.java
index 1706f824da..bf8a1e791c 100644
--- a/jOOQ/src/main/java/org/jooq/CreateSequenceFinalStep.java
+++ b/jOOQ/src/main/java/org/jooq/CreateSequenceFinalStep.java
@@ -38,9 +38,12 @@
 package org.jooq;
 
 import static org.jooq.SQLDialect.*;
+import static org.jooq.impl.DSL.*;
 
 import java.util.*;
 
+import org.jooq.impl.DSL;
+
 import org.jetbrains.annotations.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/CreateSequenceFlagsStep.java b/jOOQ/src/main/java/org/jooq/CreateSequenceFlagsStep.java
index 40683b3036..506eb1b19d 100644
--- a/jOOQ/src/main/java/org/jooq/CreateSequenceFlagsStep.java
+++ b/jOOQ/src/main/java/org/jooq/CreateSequenceFlagsStep.java
@@ -38,9 +38,12 @@
 package org.jooq;
 
 import static org.jooq.SQLDialect.*;
+import static org.jooq.impl.DSL.*;
 
 import java.util.*;
 
+import org.jooq.impl.DSL;
+
 import org.jetbrains.annotations.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/CreateTableAsStep.java b/jOOQ/src/main/java/org/jooq/CreateTableAsStep.java
index 94b5d4f7f9..9837cc2513 100644
--- a/jOOQ/src/main/java/org/jooq/CreateTableAsStep.java
+++ b/jOOQ/src/main/java/org/jooq/CreateTableAsStep.java
@@ -38,9 +38,12 @@
 package org.jooq;
 
 import static org.jooq.SQLDialect.*;
+import static org.jooq.impl.DSL.*;
 
 import java.util.*;
 
+import org.jooq.impl.DSL;
+
 import org.jetbrains.annotations.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/CreateTableCommentStep.java b/jOOQ/src/main/java/org/jooq/CreateTableCommentStep.java
index f3d7043707..06af0259e7 100644
--- a/jOOQ/src/main/java/org/jooq/CreateTableCommentStep.java
+++ b/jOOQ/src/main/java/org/jooq/CreateTableCommentStep.java
@@ -38,9 +38,12 @@
 package org.jooq;
 
 import static org.jooq.SQLDialect.*;
+import static org.jooq.impl.DSL.*;
 
 import java.util.*;
 
+import org.jooq.impl.DSL;
+
 import org.jetbrains.annotations.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/CreateTableElementListStep.java b/jOOQ/src/main/java/org/jooq/CreateTableElementListStep.java
index 42ea316ba2..6f86798053 100644
--- a/jOOQ/src/main/java/org/jooq/CreateTableElementListStep.java
+++ b/jOOQ/src/main/java/org/jooq/CreateTableElementListStep.java
@@ -38,9 +38,12 @@
 package org.jooq;
 
 import static org.jooq.SQLDialect.*;
+import static org.jooq.impl.DSL.*;
 
 import java.util.*;
 
+import org.jooq.impl.DSL;
+
 import org.jetbrains.annotations.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/CreateTableFinalStep.java b/jOOQ/src/main/java/org/jooq/CreateTableFinalStep.java
index a5c3d05da5..30f927758c 100644
--- a/jOOQ/src/main/java/org/jooq/CreateTableFinalStep.java
+++ b/jOOQ/src/main/java/org/jooq/CreateTableFinalStep.java
@@ -38,9 +38,12 @@
 package org.jooq;
 
 import static org.jooq.SQLDialect.*;
+import static org.jooq.impl.DSL.*;
 
 import java.util.*;
 
+import org.jooq.impl.DSL;
+
 import org.jetbrains.annotations.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/CreateTableOnCommitStep.java b/jOOQ/src/main/java/org/jooq/CreateTableOnCommitStep.java
index 21f41ea64d..4d0404d151 100644
--- a/jOOQ/src/main/java/org/jooq/CreateTableOnCommitStep.java
+++ b/jOOQ/src/main/java/org/jooq/CreateTableOnCommitStep.java
@@ -38,9 +38,12 @@
 package org.jooq;
 
 import static org.jooq.SQLDialect.*;
+import static org.jooq.impl.DSL.*;
 
 import java.util.*;
 
+import org.jooq.impl.DSL;
+
 import org.jetbrains.annotations.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/CreateTableStorageStep.java b/jOOQ/src/main/java/org/jooq/CreateTableStorageStep.java
index eae8547805..6568cb4715 100644
--- a/jOOQ/src/main/java/org/jooq/CreateTableStorageStep.java
+++ b/jOOQ/src/main/java/org/jooq/CreateTableStorageStep.java
@@ -38,9 +38,12 @@
 package org.jooq;
 
 import static org.jooq.SQLDialect.*;
+import static org.jooq.impl.DSL.*;
 
 import java.util.*;
 
+import org.jooq.impl.DSL;
+
 import org.jetbrains.annotations.*;
 
 /**
@@ -68,6 +71,36 @@ import org.jetbrains.annotations.*;
 public interface CreateTableStorageStep extends CreateTableFinalStep {
 
     /**
+     * Add the <code>STORAGE</code> clause to the <code>CREATE TABLE</code> statement.
+     * <p>
+     * Add vendor-specific storage clauses to the <code>CREATE TABLE</code>
+     * statement.
+     * <p>
+     * Storage clauses will always be appended to the <em>end</em> of everything
+     * else that jOOQ renders, including possibly other storage clauses, such as
+     * {@link CreateTableOnCommitStep#onCommitDeleteRows()} or similar clauses.
+     * If custom storage clauses should be mixed with jOOQ-provided storage
+     * clauses, it is recommended not to use the jOOQ API and use the custom
+     * clause API for all storage clauses instead.
+     * <p>
+     * Storage clauses will be separated from previous elements by a separator
+     * (whitespace or newline) to ensure syntactic integrity.
+     * <p>
+     * Example usage:
+     * <p>
+     * <code><pre>
+     * DSL.using(configuration)
+     *    .createTable("t")
+     *    .column(field("i", SQLDataType.INTEGER))
+     *    .storage("TABLESPACE my_tablespace")
+     *    .execute();
+     * </pre></code>
+     * <p>
+     * <b>NOTE</b>: When inserting plain SQL into jOOQ objects, you must
+     * guarantee syntax integrity. You may also create the possibility of
+     * malicious SQL injection. Be sure to properly use bind variables and/or
+     * escape literals when concatenated into SQL clauses! One way to escape
+     * literals is to use {@link DSL#name(String...)} and similar methods
      * Add the <code>STORAGE</code> clause to the <code>CREATE TABLE</code> statement.
      *
      * @see SQL
@@ -78,6 +111,36 @@ public interface CreateTableStorageStep extends CreateTableFinalStep {
     CreateTableFinalStep storage(SQL storage);
 
     /**
+     * Add the <code>STORAGE</code> clause to the <code>CREATE TABLE</code> statement.
+     * <p>
+     * Add vendor-specific storage clauses to the <code>CREATE TABLE</code>
+     * statement.
+     * <p>
+     * Storage clauses will always be appended to the <em>end</em> of everything
+     * else that jOOQ renders, including possibly other storage clauses, such as
+     * {@link CreateTableOnCommitStep#onCommitDeleteRows()} or similar clauses.
+     * If custom storage clauses should be mixed with jOOQ-provided storage
+     * clauses, it is recommended not to use the jOOQ API and use the custom
+     * clause API for all storage clauses instead.
+     * <p>
+     * Storage clauses will be separated from previous elements by a separator
+     * (whitespace or newline) to ensure syntactic integrity.
+     * <p>
+     * Example usage:
+     * <p>
+     * <code><pre>
+     * DSL.using(configuration)
+     *    .createTable("t")
+     *    .column(field("i", SQLDataType.INTEGER))
+     *    .storage("TABLESPACE my_tablespace")
+     *    .execute();
+     * </pre></code>
+     * <p>
+     * <b>NOTE</b>: When inserting plain SQL into jOOQ objects, you must
+     * guarantee syntax integrity. You may also create the possibility of
+     * malicious SQL injection. Be sure to properly use bind variables and/or
+     * escape literals when concatenated into SQL clauses! One way to escape
+     * literals is to use {@link DSL#name(String...)} and similar methods
      * Add the <code>STORAGE</code> clause to the <code>CREATE TABLE</code> statement.
      *
      * @see SQL
@@ -88,6 +151,36 @@ public interface CreateTableStorageStep extends CreateTableFinalStep {
     CreateTableFinalStep storage(@Stringly.SQL String storage, QueryPart... parts);
 
     /**
+     * Add the <code>STORAGE</code> clause to the <code>CREATE TABLE</code> statement.
+     * <p>
+     * Add vendor-specific storage clauses to the <code>CREATE TABLE</code>
+     * statement.
+     * <p>
+     * Storage clauses will always be appended to the <em>end</em> of everything
+     * else that jOOQ renders, including possibly other storage clauses, such as
+     * {@link CreateTableOnCommitStep#onCommitDeleteRows()} or similar clauses.
+     * If custom storage clauses should be mixed with jOOQ-provided storage
+     * clauses, it is recommended not to use the jOOQ API and use the custom
+     * clause API for all storage clauses instead.
+     * <p>
+     * Storage clauses will be separated from previous elements by a separator
+     * (whitespace or newline) to ensure syntactic integrity.
+     * <p>
+     * Example usage:
+     * <p>
+     * <code><pre>
+     * DSL.using(configuration)
+     *    .createTable("t")
+     *    .column(field("i", SQLDataType.INTEGER))
+     *    .storage("TABLESPACE my_tablespace")
+     *    .execute();
+     * </pre></code>
+     * <p>
+     * <b>NOTE</b>: When inserting plain SQL into jOOQ objects, you must
+     * guarantee syntax integrity. You may also create the possibility of
+     * malicious SQL injection. Be sure to properly use bind variables and/or
+     * escape literals when concatenated into SQL clauses! One way to escape
+     * literals is to use {@link DSL#name(String...)} and similar methods
      * Add the <code>STORAGE</code> clause to the <code>CREATE TABLE</code> statement.
      *
      * @see SQL
@@ -98,6 +191,36 @@ public interface CreateTableStorageStep extends CreateTableFinalStep {
     CreateTableFinalStep storage(@Stringly.SQL String storage, Object... bindings);
 
     /**
+     * Add the <code>STORAGE</code> clause to the <code>CREATE TABLE</code> statement.
+     * <p>
+     * Add vendor-specific storage clauses to the <code>CREATE TABLE</code>
+     * statement.
+     * <p>
+     * Storage clauses will always be appended to the <em>end</em> of everything
+     * else that jOOQ renders, including possibly other storage clauses, such as
+     * {@link CreateTableOnCommitStep#onCommitDeleteRows()} or similar clauses.
+     * If custom storage clauses should be mixed with jOOQ-provided storage
+     * clauses, it is recommended not to use the jOOQ API and use the custom
+     * clause API for all storage clauses instead.
+     * <p>
+     * Storage clauses will be separated from previous elements by a separator
+     * (whitespace or newline) to ensure syntactic integrity.
+     * <p>
+     * Example usage:
+     * <p>
+     * <code><pre>
+     * DSL.using(configuration)
+     *    .createTable("t")
+     *    .column(field("i", SQLDataType.INTEGER))
+     *    .storage("TABLESPACE my_tablespace")
+     *    .execute();
+     * </pre></code>
+     * <p>
+     * <b>NOTE</b>: When inserting plain SQL into jOOQ objects, you must
+     * guarantee syntax integrity. You may also create the possibility of
+     * malicious SQL injection. Be sure to properly use bind variables and/or
+     * escape literals when concatenated into SQL clauses! One way to escape
+     * literals is to use {@link DSL#name(String...)} and similar methods
      * Add the <code>STORAGE</code> clause to the <code>CREATE TABLE</code> statement.
      *
      * @see SQL
diff --git a/jOOQ/src/main/java/org/jooq/CreateTableWithDataStep.java b/jOOQ/src/main/java/org/jooq/CreateTableWithDataStep.java
index c746ef7220..7ea251d78d 100644
--- a/jOOQ/src/main/java/org/jooq/CreateTableWithDataStep.java
+++ b/jOOQ/src/main/java/org/jooq/CreateTableWithDataStep.java
@@ -38,9 +38,12 @@
 package org.jooq;
 
 import static org.jooq.SQLDialect.*;
+import static org.jooq.impl.DSL.*;
 
 import java.util.*;
 
+import org.jooq.impl.DSL;
+
 import org.jetbrains.annotations.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/CreateTriggerActionStep.java b/jOOQ/src/main/java/org/jooq/CreateTriggerActionStep.java
index 4b85ea5bfe..7eb97e1b69 100644
--- a/jOOQ/src/main/java/org/jooq/CreateTriggerActionStep.java
+++ b/jOOQ/src/main/java/org/jooq/CreateTriggerActionStep.java
@@ -89,6 +89,9 @@ package org.jooq;
 
 
 
+
+
+
 
 
 
diff --git a/jOOQ/src/main/java/org/jooq/CreateTriggerEventOfStep.java b/jOOQ/src/main/java/org/jooq/CreateTriggerEventOfStep.java
index 67156d36e4..c20abfbcf9 100644
--- a/jOOQ/src/main/java/org/jooq/CreateTriggerEventOfStep.java
+++ b/jOOQ/src/main/java/org/jooq/CreateTriggerEventOfStep.java
@@ -96,6 +96,9 @@ package org.jooq;
 
 
 
+
+
+
 
 
 
diff --git a/jOOQ/src/main/java/org/jooq/CreateTriggerEventOnStep.java b/jOOQ/src/main/java/org/jooq/CreateTriggerEventOnStep.java
index 4b85ea5bfe..7eb97e1b69 100644
--- a/jOOQ/src/main/java/org/jooq/CreateTriggerEventOnStep.java
+++ b/jOOQ/src/main/java/org/jooq/CreateTriggerEventOnStep.java
@@ -89,6 +89,9 @@ package org.jooq;
 
 
 
+
+
+
 
 
 
diff --git a/jOOQ/src/main/java/org/jooq/CreateTriggerEventOrStep.java b/jOOQ/src/main/java/org/jooq/CreateTriggerEventOrStep.java
index 4b85ea5bfe..7eb97e1b69 100644
--- a/jOOQ/src/main/java/org/jooq/CreateTriggerEventOrStep.java
+++ b/jOOQ/src/main/java/org/jooq/CreateTriggerEventOrStep.java
@@ -89,6 +89,9 @@ package org.jooq;
 
 
 
+
+
+
 
 
 
diff --git a/jOOQ/src/main/java/org/jooq/CreateTriggerEventStep.java b/jOOQ/src/main/java/org/jooq/CreateTriggerEventStep.java
index 6861747f0f..e1d5f8b214 100644
--- a/jOOQ/src/main/java/org/jooq/CreateTriggerEventStep.java
+++ b/jOOQ/src/main/java/org/jooq/CreateTriggerEventStep.java
@@ -131,6 +131,9 @@ package org.jooq;
 
 
 
+
+
+
 
 
 
diff --git a/jOOQ/src/main/java/org/jooq/CreateTriggerForStep.java b/jOOQ/src/main/java/org/jooq/CreateTriggerForStep.java
index 33f3faa804..bc0d260d57 100644
--- a/jOOQ/src/main/java/org/jooq/CreateTriggerForStep.java
+++ b/jOOQ/src/main/java/org/jooq/CreateTriggerForStep.java
@@ -82,6 +82,9 @@ package org.jooq;
 
 
 
+
+
+
 
 
 
diff --git a/jOOQ/src/main/java/org/jooq/CreateTriggerReferencingStep.java b/jOOQ/src/main/java/org/jooq/CreateTriggerReferencingStep.java
index 67156d36e4..c20abfbcf9 100644
--- a/jOOQ/src/main/java/org/jooq/CreateTriggerReferencingStep.java
+++ b/jOOQ/src/main/java/org/jooq/CreateTriggerReferencingStep.java
@@ -96,6 +96,9 @@ package org.jooq;
 
 
 
+
+
+
 
 
 
diff --git a/jOOQ/src/main/java/org/jooq/CreateTriggerWhenStep.java b/jOOQ/src/main/java/org/jooq/CreateTriggerWhenStep.java
index 2cb8dd1dca..fa3979a0d2 100644
--- a/jOOQ/src/main/java/org/jooq/CreateTriggerWhenStep.java
+++ b/jOOQ/src/main/java/org/jooq/CreateTriggerWhenStep.java
@@ -136,6 +136,9 @@ package org.jooq;
 
 
 
+
+
+
 
 
 
diff --git a/jOOQ/src/main/java/org/jooq/DropDatabaseFinalStep.java b/jOOQ/src/main/java/org/jooq/DropDatabaseFinalStep.java
index fd7c7a048a..de0927b21a 100644
--- a/jOOQ/src/main/java/org/jooq/DropDatabaseFinalStep.java
+++ b/jOOQ/src/main/java/org/jooq/DropDatabaseFinalStep.java
@@ -38,9 +38,12 @@
 package org.jooq;
 
 import static org.jooq.SQLDialect.*;
+import static org.jooq.impl.DSL.*;
 
 import java.util.*;
 
+import org.jooq.impl.DSL;
+
 import org.jetbrains.annotations.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/DropDomainCascadeStep.java b/jOOQ/src/main/java/org/jooq/DropDomainCascadeStep.java
index c011235f98..05083ec93a 100644
--- a/jOOQ/src/main/java/org/jooq/DropDomainCascadeStep.java
+++ b/jOOQ/src/main/java/org/jooq/DropDomainCascadeStep.java
@@ -38,9 +38,12 @@
 package org.jooq;
 
 import static org.jooq.SQLDialect.*;
+import static org.jooq.impl.DSL.*;
 
 import java.util.*;
 
+import org.jooq.impl.DSL;
+
 import org.jetbrains.annotations.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/DropDomainFinalStep.java b/jOOQ/src/main/java/org/jooq/DropDomainFinalStep.java
index 3a8efcda8e..983221d2e5 100644
--- a/jOOQ/src/main/java/org/jooq/DropDomainFinalStep.java
+++ b/jOOQ/src/main/java/org/jooq/DropDomainFinalStep.java
@@ -38,9 +38,12 @@
 package org.jooq;
 
 import static org.jooq.SQLDialect.*;
+import static org.jooq.impl.DSL.*;
 
 import java.util.*;
 
+import org.jooq.impl.DSL;
+
 import org.jetbrains.annotations.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/DropIndexCascadeStep.java b/jOOQ/src/main/java/org/jooq/DropIndexCascadeStep.java
index 29e6b26ecc..9f7d7aefdd 100644
--- a/jOOQ/src/main/java/org/jooq/DropIndexCascadeStep.java
+++ b/jOOQ/src/main/java/org/jooq/DropIndexCascadeStep.java
@@ -38,9 +38,12 @@
 package org.jooq;
 
 import static org.jooq.SQLDialect.*;
+import static org.jooq.impl.DSL.*;
 
 import java.util.*;
 
+import org.jooq.impl.DSL;
+
 import org.jetbrains.annotations.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/DropIndexFinalStep.java b/jOOQ/src/main/java/org/jooq/DropIndexFinalStep.java
index 968544074f..3c46f84e6b 100644
--- a/jOOQ/src/main/java/org/jooq/DropIndexFinalStep.java
+++ b/jOOQ/src/main/java/org/jooq/DropIndexFinalStep.java
@@ -38,9 +38,12 @@
 package org.jooq;
 
 import static org.jooq.SQLDialect.*;
+import static org.jooq.impl.DSL.*;
 
 import java.util.*;
 
+import org.jooq.impl.DSL;
+
 import org.jetbrains.annotations.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/DropIndexOnStep.java b/jOOQ/src/main/java/org/jooq/DropIndexOnStep.java
index 11f860c6c3..f3cd6c7e85 100644
--- a/jOOQ/src/main/java/org/jooq/DropIndexOnStep.java
+++ b/jOOQ/src/main/java/org/jooq/DropIndexOnStep.java
@@ -38,9 +38,12 @@
 package org.jooq;
 
 import static org.jooq.SQLDialect.*;
+import static org.jooq.impl.DSL.*;
 
 import java.util.*;
 
+import org.jooq.impl.DSL;
+
 import org.jetbrains.annotations.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/DropSchemaFinalStep.java b/jOOQ/src/main/java/org/jooq/DropSchemaFinalStep.java
index 6f5652bd7b..9bb50ae0f0 100644
--- a/jOOQ/src/main/java/org/jooq/DropSchemaFinalStep.java
+++ b/jOOQ/src/main/java/org/jooq/DropSchemaFinalStep.java
@@ -38,9 +38,12 @@
 package org.jooq;
 
 import static org.jooq.SQLDialect.*;
+import static org.jooq.impl.DSL.*;
 
 import java.util.*;
 
+import org.jooq.impl.DSL;
+
 import org.jetbrains.annotations.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/DropSchemaStep.java b/jOOQ/src/main/java/org/jooq/DropSchemaStep.java
index 78f4e8facc..2f709fe22d 100644
--- a/jOOQ/src/main/java/org/jooq/DropSchemaStep.java
+++ b/jOOQ/src/main/java/org/jooq/DropSchemaStep.java
@@ -38,9 +38,12 @@
 package org.jooq;
 
 import static org.jooq.SQLDialect.*;
+import static org.jooq.impl.DSL.*;
 
 import java.util.*;
 
+import org.jooq.impl.DSL;
+
 import org.jetbrains.annotations.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/DropSequenceFinalStep.java b/jOOQ/src/main/java/org/jooq/DropSequenceFinalStep.java
index b729a11bb6..ef0f65089f 100644
--- a/jOOQ/src/main/java/org/jooq/DropSequenceFinalStep.java
+++ b/jOOQ/src/main/java/org/jooq/DropSequenceFinalStep.java
@@ -38,9 +38,12 @@
 package org.jooq;
 
 import static org.jooq.SQLDialect.*;
+import static org.jooq.impl.DSL.*;
 
 import java.util.*;
 
+import org.jooq.impl.DSL;
+
 import org.jetbrains.annotations.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/DropTableFinalStep.java b/jOOQ/src/main/java/org/jooq/DropTableFinalStep.java
index b40f7ef3e0..311597cb1f 100644
--- a/jOOQ/src/main/java/org/jooq/DropTableFinalStep.java
+++ b/jOOQ/src/main/java/org/jooq/DropTableFinalStep.java
@@ -38,9 +38,12 @@
 package org.jooq;
 
 import static org.jooq.SQLDialect.*;
+import static org.jooq.impl.DSL.*;
 
 import java.util.*;
 
+import org.jooq.impl.DSL;
+
 import org.jetbrains.annotations.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/DropTableStep.java b/jOOQ/src/main/java/org/jooq/DropTableStep.java
index 2531a0084f..b729221161 100644
--- a/jOOQ/src/main/java/org/jooq/DropTableStep.java
+++ b/jOOQ/src/main/java/org/jooq/DropTableStep.java
@@ -38,9 +38,12 @@
 package org.jooq;
 
 import static org.jooq.SQLDialect.*;
+import static org.jooq.impl.DSL.*;
 
 import java.util.*;
 
+import org.jooq.impl.DSL;
+
 import org.jetbrains.annotations.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/DropViewFinalStep.java b/jOOQ/src/main/java/org/jooq/DropViewFinalStep.java
index e006b807d5..f3f8491ccd 100644
--- a/jOOQ/src/main/java/org/jooq/DropViewFinalStep.java
+++ b/jOOQ/src/main/java/org/jooq/DropViewFinalStep.java
@@ -38,9 +38,12 @@
 package org.jooq;
 
 import static org.jooq.SQLDialect.*;
+import static org.jooq.impl.DSL.*;
 
 import java.util.*;
 
+import org.jooq.impl.DSL;
+
 import org.jetbrains.annotations.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/GrantFinalStep.java b/jOOQ/src/main/java/org/jooq/GrantFinalStep.java
index 2f87af1aff..7a0c977f14 100644
--- a/jOOQ/src/main/java/org/jooq/GrantFinalStep.java
+++ b/jOOQ/src/main/java/org/jooq/GrantFinalStep.java
@@ -38,9 +38,12 @@
 package org.jooq;
 
 import static org.jooq.SQLDialect.*;
+import static org.jooq.impl.DSL.*;
 
 import java.util.*;
 
+import org.jooq.impl.DSL;
+
 import org.jetbrains.annotations.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/GrantOnStep.java b/jOOQ/src/main/java/org/jooq/GrantOnStep.java
index 85e410c3cd..4e279a0caf 100644
--- a/jOOQ/src/main/java/org/jooq/GrantOnStep.java
+++ b/jOOQ/src/main/java/org/jooq/GrantOnStep.java
@@ -38,9 +38,12 @@
 package org.jooq;
 
 import static org.jooq.SQLDialect.*;
+import static org.jooq.impl.DSL.*;
 
 import java.util.*;
 
+import org.jooq.impl.DSL;
+
 import org.jetbrains.annotations.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/GrantToStep.java b/jOOQ/src/main/java/org/jooq/GrantToStep.java
index 0643c97658..8906e1b7b6 100644
--- a/jOOQ/src/main/java/org/jooq/GrantToStep.java
+++ b/jOOQ/src/main/java/org/jooq/GrantToStep.java
@@ -38,9 +38,12 @@
 package org.jooq;
 
 import static org.jooq.SQLDialect.*;
+import static org.jooq.impl.DSL.*;
 
 import java.util.*;
 
+import org.jooq.impl.DSL;
+
 import org.jetbrains.annotations.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/GrantWithGrantOptionStep.java b/jOOQ/src/main/java/org/jooq/GrantWithGrantOptionStep.java
index 8a7dd7141b..d9e7881238 100644
--- a/jOOQ/src/main/java/org/jooq/GrantWithGrantOptionStep.java
+++ b/jOOQ/src/main/java/org/jooq/GrantWithGrantOptionStep.java
@@ -38,9 +38,12 @@
 package org.jooq;
 
 import static org.jooq.SQLDialect.*;
+import static org.jooq.impl.DSL.*;
 
 import java.util.*;
 
+import org.jooq.impl.DSL;
+
 import org.jetbrains.annotations.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/JSONArrayNullStep.java b/jOOQ/src/main/java/org/jooq/JSONArrayNullStep.java
index 31c36afb94..e57c3a1b86 100644
--- a/jOOQ/src/main/java/org/jooq/JSONArrayNullStep.java
+++ b/jOOQ/src/main/java/org/jooq/JSONArrayNullStep.java
@@ -38,9 +38,12 @@
 package org.jooq;
 
 import static org.jooq.SQLDialect.*;
+import static org.jooq.impl.DSL.*;
 
 import java.util.*;
 
+import org.jooq.impl.DSL;
+
 import org.jetbrains.annotations.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/JSONArrayReturningStep.java b/jOOQ/src/main/java/org/jooq/JSONArrayReturningStep.java
index 6d26f46c80..3a311a1787 100644
--- a/jOOQ/src/main/java/org/jooq/JSONArrayReturningStep.java
+++ b/jOOQ/src/main/java/org/jooq/JSONArrayReturningStep.java
@@ -38,9 +38,12 @@
 package org.jooq;
 
 import static org.jooq.SQLDialect.*;
+import static org.jooq.impl.DSL.*;
 
 import java.util.*;
 
+import org.jooq.impl.DSL;
+
 import org.jetbrains.annotations.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/JSONObjectNullStep.java b/jOOQ/src/main/java/org/jooq/JSONObjectNullStep.java
index 348d201630..832b585316 100644
--- a/jOOQ/src/main/java/org/jooq/JSONObjectNullStep.java
+++ b/jOOQ/src/main/java/org/jooq/JSONObjectNullStep.java
@@ -38,9 +38,12 @@
 package org.jooq;
 
 import static org.jooq.SQLDialect.*;
+import static org.jooq.impl.DSL.*;
 
 import java.util.*;
 
+import org.jooq.impl.DSL;
+
 import org.jetbrains.annotations.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/JSONObjectReturningStep.java b/jOOQ/src/main/java/org/jooq/JSONObjectReturningStep.java
index eadc60c146..fedb173839 100644
--- a/jOOQ/src/main/java/org/jooq/JSONObjectReturningStep.java
+++ b/jOOQ/src/main/java/org/jooq/JSONObjectReturningStep.java
@@ -38,9 +38,12 @@
 package org.jooq;
 
 import static org.jooq.SQLDialect.*;
+import static org.jooq.impl.DSL.*;
 
 import java.util.*;
 
+import org.jooq.impl.DSL;
+
 import org.jetbrains.annotations.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/LikeEscapeStep.java b/jOOQ/src/main/java/org/jooq/LikeEscapeStep.java
index 33c3dd4e65..9e4e3e06eb 100644
--- a/jOOQ/src/main/java/org/jooq/LikeEscapeStep.java
+++ b/jOOQ/src/main/java/org/jooq/LikeEscapeStep.java
@@ -38,9 +38,12 @@
 package org.jooq;
 
 import static org.jooq.SQLDialect.*;
+import static org.jooq.impl.DSL.*;
 
 import java.util.*;
 
+import org.jooq.impl.DSL;
+
 import org.jetbrains.annotations.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/RevokeFinalStep.java b/jOOQ/src/main/java/org/jooq/RevokeFinalStep.java
index c1acbeeb7a..52dcaedbf6 100644
--- a/jOOQ/src/main/java/org/jooq/RevokeFinalStep.java
+++ b/jOOQ/src/main/java/org/jooq/RevokeFinalStep.java
@@ -38,9 +38,12 @@
 package org.jooq;
 
 import static org.jooq.SQLDialect.*;
+import static org.jooq.impl.DSL.*;
 
 import java.util.*;
 
+import org.jooq.impl.DSL;
+
 import org.jetbrains.annotations.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/RevokeFromStep.java b/jOOQ/src/main/java/org/jooq/RevokeFromStep.java
index 98074e2cb1..b39d93f280 100644
--- a/jOOQ/src/main/java/org/jooq/RevokeFromStep.java
+++ b/jOOQ/src/main/java/org/jooq/RevokeFromStep.java
@@ -38,9 +38,12 @@
 package org.jooq;
 
 import static org.jooq.SQLDialect.*;
+import static org.jooq.impl.DSL.*;
 
 import java.util.*;
 
+import org.jooq.impl.DSL;
+
 import org.jetbrains.annotations.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/RevokeOnStep.java b/jOOQ/src/main/java/org/jooq/RevokeOnStep.java
index 67c850efad..a4915b6886 100644
--- a/jOOQ/src/main/java/org/jooq/RevokeOnStep.java
+++ b/jOOQ/src/main/java/org/jooq/RevokeOnStep.java
@@ -38,9 +38,12 @@
 package org.jooq;
 
 import static org.jooq.SQLDialect.*;
+import static org.jooq.impl.DSL.*;
 
 import java.util.*;
 
+import org.jooq.impl.DSL;
+
 import org.jetbrains.annotations.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/SignalSetStep.java b/jOOQ/src/main/java/org/jooq/SignalSetStep.java
index c0fff31448..37c207aebc 100644
--- a/jOOQ/src/main/java/org/jooq/SignalSetStep.java
+++ b/jOOQ/src/main/java/org/jooq/SignalSetStep.java
@@ -84,6 +84,9 @@ package org.jooq;
 
 
 
+
+
+
 
 
 
diff --git a/jOOQ/src/main/java/org/jooq/Truncate.java b/jOOQ/src/main/java/org/jooq/Truncate.java
index abcc753244..fdb07a5e3e 100644
--- a/jOOQ/src/main/java/org/jooq/Truncate.java
+++ b/jOOQ/src/main/java/org/jooq/Truncate.java
@@ -38,9 +38,12 @@
 package org.jooq;
 
 import static org.jooq.SQLDialect.*;
+import static org.jooq.impl.DSL.*;
 
 import java.util.*;
 
+import org.jooq.impl.DSL;
+
 import org.jetbrains.annotations.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/TruncateCascadeStep.java b/jOOQ/src/main/java/org/jooq/TruncateCascadeStep.java
index 28ccefdbfc..dffa1cf656 100644
--- a/jOOQ/src/main/java/org/jooq/TruncateCascadeStep.java
+++ b/jOOQ/src/main/java/org/jooq/TruncateCascadeStep.java
@@ -38,9 +38,12 @@
 package org.jooq;
 
 import static org.jooq.SQLDialect.*;
+import static org.jooq.impl.DSL.*;
 
 import java.util.*;
 
+import org.jooq.impl.DSL;
+
 import org.jetbrains.annotations.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/TruncateFinalStep.java b/jOOQ/src/main/java/org/jooq/TruncateFinalStep.java
index a7bf0f939c..c42695af9e 100644
--- a/jOOQ/src/main/java/org/jooq/TruncateFinalStep.java
+++ b/jOOQ/src/main/java/org/jooq/TruncateFinalStep.java
@@ -38,9 +38,12 @@
 package org.jooq;
 
 import static org.jooq.SQLDialect.*;
+import static org.jooq.impl.DSL.*;
 
 import java.util.*;
 
+import org.jooq.impl.DSL;
+
 import org.jetbrains.annotations.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/TruncateIdentityStep.java b/jOOQ/src/main/java/org/jooq/TruncateIdentityStep.java
index cfadb92d58..da8bf23293 100644
--- a/jOOQ/src/main/java/org/jooq/TruncateIdentityStep.java
+++ b/jOOQ/src/main/java/org/jooq/TruncateIdentityStep.java
@@ -38,9 +38,12 @@
 package org.jooq;
 
 import static org.jooq.SQLDialect.*;
+import static org.jooq.impl.DSL.*;
 
 import java.util.*;
 
+import org.jooq.impl.DSL;
+
 import org.jetbrains.annotations.*;
 
 /**