diff --git a/jOOQ/src/main/java/org/jooq/impl/AlterDatabaseImpl.java b/jOOQ/src/main/java/org/jooq/impl/AlterDatabaseImpl.java
index 02979341ed..4a65aa2f98 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AlterDatabaseImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AlterDatabaseImpl.java
@@ -37,7 +37,10 @@
  */
 package org.jooq.impl;
 
+import static org.jooq.impl.DSL.*;
 import static org.jooq.impl.Keywords.*;
+import static org.jooq.impl.Names.*;
+import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
 import static org.jooq.SQLDialect.*;
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/AlterDomainImpl.java b/jOOQ/src/main/java/org/jooq/impl/AlterDomainImpl.java
index f54d7cfc02..c9dd626169 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AlterDomainImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AlterDomainImpl.java
@@ -37,7 +37,10 @@
  */
 package org.jooq.impl;
 
+import static org.jooq.impl.DSL.*;
 import static org.jooq.impl.Keywords.*;
+import static org.jooq.impl.Names.*;
+import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
 import static org.jooq.SQLDialect.*;
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/AlterSchemaImpl.java b/jOOQ/src/main/java/org/jooq/impl/AlterSchemaImpl.java
index cff3f70bd1..a830312b2e 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AlterSchemaImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AlterSchemaImpl.java
@@ -37,7 +37,10 @@
  */
 package org.jooq.impl;
 
+import static org.jooq.impl.DSL.*;
 import static org.jooq.impl.Keywords.*;
+import static org.jooq.impl.Names.*;
+import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
 import static org.jooq.SQLDialect.*;
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateDatabaseImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateDatabaseImpl.java
index 0a93617fc9..ba7ad56de2 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CreateDatabaseImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CreateDatabaseImpl.java
@@ -37,7 +37,10 @@
  */
 package org.jooq.impl;
 
+import static org.jooq.impl.DSL.*;
 import static org.jooq.impl.Keywords.*;
+import static org.jooq.impl.Names.*;
+import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
 import static org.jooq.SQLDialect.*;
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateDomainImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateDomainImpl.java
index ffbc61ad3f..da6d82dbfc 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CreateDomainImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CreateDomainImpl.java
@@ -37,7 +37,10 @@
  */
 package org.jooq.impl;
 
+import static org.jooq.impl.DSL.*;
 import static org.jooq.impl.Keywords.*;
+import static org.jooq.impl.Names.*;
+import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
 import static org.jooq.SQLDialect.*;
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateSchemaImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateSchemaImpl.java
index 7ffc5ed136..57969344a1 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CreateSchemaImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CreateSchemaImpl.java
@@ -37,7 +37,10 @@
  */
 package org.jooq.impl;
 
+import static org.jooq.impl.DSL.*;
 import static org.jooq.impl.Keywords.*;
+import static org.jooq.impl.Names.*;
+import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
 import static org.jooq.SQLDialect.*;
 
@@ -97,34 +100,52 @@ implements
 
     @Override
     public final void accept(Context<?> ctx) {
-        if (createSchemaIfNotExists && !supportsIfNotExists(ctx)) {
-            Tools.beginTryCatch(ctx, DDLStatementType.CREATE_SCHEMA);
-            accept0(ctx);
-            Tools.endTryCatch(ctx, DDLStatementType.CREATE_SCHEMA);
-        }
-        else {
-            accept0(ctx);
-        }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+        accept0(ctx);
     }
 
     private final void accept0(Context<?> ctx) {
-
-
-
-
-
-
-
-
-
-
-
-
-
+        if (createSchemaIfNotExists && !supportsIfNotExists(ctx)) {
+            Tools.beginTryCatch(ctx, DDLStatementType.CREATE_SCHEMA);
             accept1(ctx);
+            Tools.endTryCatch(ctx, DDLStatementType.CREATE_SCHEMA);
+        }
+        else {
+            accept1(ctx);
+        }
     }
 
     private final void accept1(Context<?> ctx) {
+
+
+
+
+
+
+
+
+
+
+
+
+
+            accept2(ctx);
+    }
+
+    private final void accept2(Context<?> ctx) {
         ctx.start(Clause.CREATE_SCHEMA_NAME)
            .visit(K_CREATE);
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateSequenceImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateSequenceImpl.java
index c1fbccaab3..e2958f2f59 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CreateSequenceImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CreateSequenceImpl.java
@@ -37,7 +37,10 @@
  */
 package org.jooq.impl;
 
+import static org.jooq.impl.DSL.*;
 import static org.jooq.impl.Keywords.*;
+import static org.jooq.impl.Names.*;
+import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
 import static org.jooq.SQLDialect.*;
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/DropDatabaseImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropDatabaseImpl.java
index 3196c23aef..8019a7ebfd 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DropDatabaseImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DropDatabaseImpl.java
@@ -37,7 +37,10 @@
  */
 package org.jooq.impl;
 
+import static org.jooq.impl.DSL.*;
 import static org.jooq.impl.Keywords.*;
+import static org.jooq.impl.Names.*;
+import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
 import static org.jooq.SQLDialect.*;
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/DropDomainImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropDomainImpl.java
index 74b3b833a9..ebeabab75b 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DropDomainImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DropDomainImpl.java
@@ -37,7 +37,10 @@
  */
 package org.jooq.impl;
 
+import static org.jooq.impl.DSL.*;
 import static org.jooq.impl.Keywords.*;
+import static org.jooq.impl.Names.*;
+import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
 import static org.jooq.SQLDialect.*;
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/DropSchemaImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropSchemaImpl.java
index cfc06b68dd..9b10178ad3 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DropSchemaImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DropSchemaImpl.java
@@ -37,7 +37,10 @@
  */
 package org.jooq.impl;
 
+import static org.jooq.impl.DSL.*;
 import static org.jooq.impl.Keywords.*;
+import static org.jooq.impl.Names.*;
+import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
 import static org.jooq.SQLDialect.*;
 
@@ -131,17 +134,35 @@ implements
 
     @Override
     public final void accept(Context<?> ctx) {
-        if (dropSchemaIfExists && !supportsIfExists(ctx)) {
-            Tools.beginTryCatch(ctx, DDLStatementType.DROP_SCHEMA);
-            accept0(ctx);
-            Tools.endTryCatch(ctx, DDLStatementType.DROP_SCHEMA);
-        }
-        else {
-            accept0(ctx);
-        }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+        accept0(ctx);
     }
 
     private void accept0(Context<?> ctx) {
+        if (dropSchemaIfExists && !supportsIfExists(ctx)) {
+            Tools.beginTryCatch(ctx, DDLStatementType.DROP_SCHEMA);
+            accept1(ctx);
+            Tools.endTryCatch(ctx, DDLStatementType.DROP_SCHEMA);
+        }
+        else {
+            accept1(ctx);
+        }
+    }
+
+    private void accept1(Context<?> ctx) {
         ctx.start(Clause.DROP_SCHEMA_SCHEMA)
            .visit(K_DROP);
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/DropSequenceImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropSequenceImpl.java
index 77dc1e5de4..66fbb83a24 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DropSequenceImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DropSequenceImpl.java
@@ -37,7 +37,10 @@
  */
 package org.jooq.impl;
 
+import static org.jooq.impl.DSL.*;
 import static org.jooq.impl.Keywords.*;
+import static org.jooq.impl.Names.*;
+import static org.jooq.impl.SQLDataType.*;
 import static org.jooq.impl.Tools.BooleanDataKey.*;
 import static org.jooq.SQLDialect.*;
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Names.java b/jOOQ/src/main/java/org/jooq/impl/Names.java
index fb2bf13844..7437036cf0 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Names.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Names.java
@@ -101,6 +101,7 @@ final class Names {
     static final Name N_DAYOFWEEK              = unquotedName("dayofweek");
     static final Name N_DAYOFYEAR              = unquotedName("dayofyear");
     static final Name N_DAYS_BETWEEN           = unquotedName("days_between");
+    static final Name N_DB_NAME                = unquotedName("db_name");
     static final Name N_DECODE                 = unquotedName("decode");
     static final Name N_DEGREES                = unquotedName("degrees");
     static final Name N_DUAL                   = unquotedName("dual");