diff --git a/jOOQ/src/main/java/org/jooq/DSLContext.java b/jOOQ/src/main/java/org/jooq/DSLContext.java
index add4c30c65..b3e8313327 100644
--- a/jOOQ/src/main/java/org/jooq/DSLContext.java
+++ b/jOOQ/src/main/java/org/jooq/DSLContext.java
@@ -9112,366 +9112,6 @@ public interface DSLContext extends Scope {
 
 
 
-    /**
-     * The <code>CREATE DATABASE</code> statement.
-     *
-     * @see DSL#createDatabase(String)
-     */
-    @NotNull
-    @Support({ MARIADB, MYSQL, POSTGRES })
-    CreateDatabaseFinalStep createDatabase(String database);
-
-    /**
-     * The <code>CREATE DATABASE</code> statement.
-     *
-     * @see DSL#createDatabase(Name)
-     */
-    @NotNull
-    @Support({ MARIADB, MYSQL, POSTGRES })
-    CreateDatabaseFinalStep createDatabase(Name database);
-
-    /**
-     * The <code>CREATE DATABASE</code> statement.
-     *
-     * @see DSL#createDatabase(Catalog)
-     */
-    @NotNull
-    @Support({ MARIADB, MYSQL, POSTGRES })
-    CreateDatabaseFinalStep createDatabase(Catalog database);
-
-    /**
-     * The <code>CREATE DATABASE IF NOT EXISTS</code> statement.
-     *
-     * @see DSL#createDatabaseIfNotExists(String)
-     */
-    @NotNull
-    @Support({ MARIADB, MYSQL })
-    CreateDatabaseFinalStep createDatabaseIfNotExists(String database);
-
-    /**
-     * The <code>CREATE DATABASE IF NOT EXISTS</code> statement.
-     *
-     * @see DSL#createDatabaseIfNotExists(Name)
-     */
-    @NotNull
-    @Support({ MARIADB, MYSQL })
-    CreateDatabaseFinalStep createDatabaseIfNotExists(Name database);
-
-    /**
-     * The <code>CREATE DATABASE IF NOT EXISTS</code> statement.
-     *
-     * @see DSL#createDatabaseIfNotExists(Catalog)
-     */
-    @NotNull
-    @Support({ MARIADB, MYSQL })
-    CreateDatabaseFinalStep createDatabaseIfNotExists(Catalog database);
-
-    /**
-     * The <code>CREATE DOMAIN</code> statement.
-     *
-     * @see DSL#createDomain(String)
-     */
-    @NotNull
-    @Support({ FIREBIRD, H2, HSQLDB, POSTGRES })
-    CreateDomainAsStep createDomain(String domain);
-
-    /**
-     * The <code>CREATE DOMAIN</code> statement.
-     *
-     * @see DSL#createDomain(Name)
-     */
-    @NotNull
-    @Support({ FIREBIRD, H2, HSQLDB, POSTGRES })
-    CreateDomainAsStep createDomain(Name domain);
-
-    /**
-     * The <code>CREATE DOMAIN</code> statement.
-     *
-     * @see DSL#createDomain(Domain)
-     */
-    @NotNull
-    @Support({ FIREBIRD, H2, HSQLDB, POSTGRES })
-    CreateDomainAsStep createDomain(Domain<?> domain);
-
-    /**
-     * The <code>CREATE DOMAIN IF NOT EXISTS</code> statement.
-     *
-     * @see DSL#createDomainIfNotExists(String)
-     */
-    @NotNull
-    @Support({ FIREBIRD, H2, POSTGRES })
-    CreateDomainAsStep createDomainIfNotExists(String domain);
-
-    /**
-     * The <code>CREATE DOMAIN IF NOT EXISTS</code> statement.
-     *
-     * @see DSL#createDomainIfNotExists(Name)
-     */
-    @NotNull
-    @Support({ FIREBIRD, H2, POSTGRES })
-    CreateDomainAsStep createDomainIfNotExists(Name domain);
-
-    /**
-     * The <code>CREATE DOMAIN IF NOT EXISTS</code> statement.
-     *
-     * @see DSL#createDomainIfNotExists(Domain)
-     */
-    @NotNull
-    @Support({ FIREBIRD, H2, POSTGRES })
-    CreateDomainAsStep createDomainIfNotExists(Domain<?> domain);
-
-    /**
-     * The <code>CREATE INDEX</code> statement.
-     *
-     * @see DSL#createIndex(String)
-     */
-    @NotNull
-    @Support
-    CreateIndexStep createIndex(String index);
-
-    /**
-     * The <code>CREATE INDEX</code> statement.
-     *
-     * @see DSL#createIndex(Name)
-     */
-    @NotNull
-    @Support
-    CreateIndexStep createIndex(Name index);
-
-    /**
-     * The <code>CREATE INDEX</code> statement.
-     *
-     * @see DSL#createIndex(Index)
-     */
-    @NotNull
-    @Support
-    CreateIndexStep createIndex(Index index);
-
-    /**
-     * The <code>CREATE INDEX</code> statement.
-     *
-     * @see DSL#createIndex()
-     */
-    @NotNull
-    @Support
-    CreateIndexStep createIndex();
-
-    /**
-     * The <code>CREATE INDEX IF NOT EXISTS</code> statement.
-     *
-     * @see DSL#createIndexIfNotExists(String)
-     */
-    @NotNull
-    @Support({ FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES, SQLITE })
-    CreateIndexStep createIndexIfNotExists(String index);
-
-    /**
-     * The <code>CREATE INDEX IF NOT EXISTS</code> statement.
-     *
-     * @see DSL#createIndexIfNotExists(Name)
-     */
-    @NotNull
-    @Support({ FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES, SQLITE })
-    CreateIndexStep createIndexIfNotExists(Name index);
-
-    /**
-     * The <code>CREATE INDEX IF NOT EXISTS</code> statement.
-     *
-     * @see DSL#createIndexIfNotExists(Index)
-     */
-    @NotNull
-    @Support({ FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES, SQLITE })
-    CreateIndexStep createIndexIfNotExists(Index index);
-
-    /**
-     * The <code>CREATE INDEX IF NOT EXISTS</code> statement.
-     *
-     * @see DSL#createIndexIfNotExists()
-     */
-    @NotNull
-    @Support({ FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES, SQLITE })
-    CreateIndexStep createIndexIfNotExists();
-
-    /**
-     * The <code>CREATE UNIQUE INDEX</code> statement.
-     *
-     * @see DSL#createUniqueIndex(String)
-     */
-    @NotNull
-    @Support
-    CreateIndexStep createUniqueIndex(String index);
-
-    /**
-     * The <code>CREATE UNIQUE INDEX</code> statement.
-     *
-     * @see DSL#createUniqueIndex(Name)
-     */
-    @NotNull
-    @Support
-    CreateIndexStep createUniqueIndex(Name index);
-
-    /**
-     * The <code>CREATE UNIQUE INDEX</code> statement.
-     *
-     * @see DSL#createUniqueIndex(Index)
-     */
-    @NotNull
-    @Support
-    CreateIndexStep createUniqueIndex(Index index);
-
-    /**
-     * The <code>CREATE UNIQUE INDEX</code> statement.
-     *
-     * @see DSL#createUniqueIndex()
-     */
-    @NotNull
-    @Support
-    CreateIndexStep createUniqueIndex();
-
-    /**
-     * The <code>CREATE UNIQUE INDEX IF NOT EXISTS</code> statement.
-     *
-     * @see DSL#createUniqueIndexIfNotExists(String)
-     */
-    @NotNull
-    @Support({ FIREBIRD, H2, HSQLDB, POSTGRES, SQLITE })
-    CreateIndexStep createUniqueIndexIfNotExists(String index);
-
-    /**
-     * The <code>CREATE UNIQUE INDEX IF NOT EXISTS</code> statement.
-     *
-     * @see DSL#createUniqueIndexIfNotExists(Name)
-     */
-    @NotNull
-    @Support({ FIREBIRD, H2, HSQLDB, POSTGRES, SQLITE })
-    CreateIndexStep createUniqueIndexIfNotExists(Name index);
-
-    /**
-     * The <code>CREATE UNIQUE INDEX IF NOT EXISTS</code> statement.
-     *
-     * @see DSL#createUniqueIndexIfNotExists(Index)
-     */
-    @NotNull
-    @Support({ FIREBIRD, H2, HSQLDB, POSTGRES, SQLITE })
-    CreateIndexStep createUniqueIndexIfNotExists(Index index);
-
-    /**
-     * The <code>CREATE UNIQUE INDEX IF NOT EXISTS</code> statement.
-     *
-     * @see DSL#createUniqueIndexIfNotExists()
-     */
-    @NotNull
-    @Support({ FIREBIRD, H2, HSQLDB, POSTGRES, SQLITE })
-    CreateIndexStep createUniqueIndexIfNotExists();
-
-    /**
-     * The <code>CREATE SCHEMA</code> statement.
-     *
-     * @see DSL#createSchema(String)
-     */
-    @NotNull
-    @Support({ DERBY, H2, HSQLDB, MARIADB, MYSQL, POSTGRES })
-    CreateSchemaFinalStep createSchema(String schema);
-
-    /**
-     * The <code>CREATE SCHEMA</code> statement.
-     *
-     * @see DSL#createSchema(Name)
-     */
-    @NotNull
-    @Support({ DERBY, H2, HSQLDB, MARIADB, MYSQL, POSTGRES })
-    CreateSchemaFinalStep createSchema(Name schema);
-
-    /**
-     * The <code>CREATE SCHEMA</code> statement.
-     *
-     * @see DSL#createSchema(Schema)
-     */
-    @NotNull
-    @Support({ DERBY, H2, HSQLDB, MARIADB, MYSQL, POSTGRES })
-    CreateSchemaFinalStep createSchema(Schema schema);
-
-    /**
-     * The <code>CREATE SCHEMA IF NOT EXISTS</code> statement.
-     *
-     * @see DSL#createSchemaIfNotExists(String)
-     */
-    @NotNull
-    @Support({ H2, MARIADB, MYSQL, POSTGRES })
-    CreateSchemaFinalStep createSchemaIfNotExists(String schema);
-
-    /**
-     * The <code>CREATE SCHEMA IF NOT EXISTS</code> statement.
-     *
-     * @see DSL#createSchemaIfNotExists(Name)
-     */
-    @NotNull
-    @Support({ H2, MARIADB, MYSQL, POSTGRES })
-    CreateSchemaFinalStep createSchemaIfNotExists(Name schema);
-
-    /**
-     * The <code>CREATE SCHEMA IF NOT EXISTS</code> statement.
-     *
-     * @see DSL#createSchemaIfNotExists(Schema)
-     */
-    @NotNull
-    @Support({ H2, MARIADB, MYSQL, POSTGRES })
-    CreateSchemaFinalStep createSchemaIfNotExists(Schema schema);
-
-    /**
-     * The <code>CREATE SEQUENCE</code> statement.
-     *
-     * @see DSL#createSequence(String)
-     */
-    @NotNull
-    @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES })
-    CreateSequenceFlagsStep createSequence(String sequence);
-
-    /**
-     * The <code>CREATE SEQUENCE</code> statement.
-     *
-     * @see DSL#createSequence(Name)
-     */
-    @NotNull
-    @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES })
-    CreateSequenceFlagsStep createSequence(Name sequence);
-
-    /**
-     * The <code>CREATE SEQUENCE</code> statement.
-     *
-     * @see DSL#createSequence(Sequence)
-     */
-    @NotNull
-    @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES })
-    CreateSequenceFlagsStep createSequence(Sequence<?> sequence);
-
-    /**
-     * The <code>CREATE SEQUENCE IF NOT EXISTS</code> statement.
-     *
-     * @see DSL#createSequenceIfNotExists(String)
-     */
-    @NotNull
-    @Support({ FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES })
-    CreateSequenceFlagsStep createSequenceIfNotExists(String sequence);
-
-    /**
-     * The <code>CREATE SEQUENCE IF NOT EXISTS</code> statement.
-     *
-     * @see DSL#createSequenceIfNotExists(Name)
-     */
-    @NotNull
-    @Support({ FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES })
-    CreateSequenceFlagsStep createSequenceIfNotExists(Name sequence);
-
-    /**
-     * The <code>CREATE SEQUENCE IF NOT EXISTS</code> statement.
-     *
-     * @see DSL#createSequenceIfNotExists(Sequence)
-     */
-    @NotNull
-    @Support({ FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES })
-    CreateSequenceFlagsStep createSequenceIfNotExists(Sequence<?> sequence);
-
     /**
      * The <code>ALTER DATABASE</code> statement.
      *
@@ -9895,6 +9535,366 @@ public interface DSLContext extends Scope {
     @Support({ FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES })
     CommentOnIsStep commentOnColumn(Field<?> field);
 
+    /**
+     * The <code>CREATE DATABASE</code> statement.
+     *
+     * @see DSL#createDatabase(String)
+     */
+    @NotNull
+    @Support({ MARIADB, MYSQL, POSTGRES })
+    CreateDatabaseFinalStep createDatabase(String database);
+
+    /**
+     * The <code>CREATE DATABASE</code> statement.
+     *
+     * @see DSL#createDatabase(Name)
+     */
+    @NotNull
+    @Support({ MARIADB, MYSQL, POSTGRES })
+    CreateDatabaseFinalStep createDatabase(Name database);
+
+    /**
+     * The <code>CREATE DATABASE</code> statement.
+     *
+     * @see DSL#createDatabase(Catalog)
+     */
+    @NotNull
+    @Support({ MARIADB, MYSQL, POSTGRES })
+    CreateDatabaseFinalStep createDatabase(Catalog database);
+
+    /**
+     * The <code>CREATE DATABASE IF NOT EXISTS</code> statement.
+     *
+     * @see DSL#createDatabaseIfNotExists(String)
+     */
+    @NotNull
+    @Support({ MARIADB, MYSQL })
+    CreateDatabaseFinalStep createDatabaseIfNotExists(String database);
+
+    /**
+     * The <code>CREATE DATABASE IF NOT EXISTS</code> statement.
+     *
+     * @see DSL#createDatabaseIfNotExists(Name)
+     */
+    @NotNull
+    @Support({ MARIADB, MYSQL })
+    CreateDatabaseFinalStep createDatabaseIfNotExists(Name database);
+
+    /**
+     * The <code>CREATE DATABASE IF NOT EXISTS</code> statement.
+     *
+     * @see DSL#createDatabaseIfNotExists(Catalog)
+     */
+    @NotNull
+    @Support({ MARIADB, MYSQL })
+    CreateDatabaseFinalStep createDatabaseIfNotExists(Catalog database);
+
+    /**
+     * The <code>CREATE DOMAIN</code> statement.
+     *
+     * @see DSL#createDomain(String)
+     */
+    @NotNull
+    @Support({ FIREBIRD, H2, HSQLDB, POSTGRES })
+    CreateDomainAsStep createDomain(String domain);
+
+    /**
+     * The <code>CREATE DOMAIN</code> statement.
+     *
+     * @see DSL#createDomain(Name)
+     */
+    @NotNull
+    @Support({ FIREBIRD, H2, HSQLDB, POSTGRES })
+    CreateDomainAsStep createDomain(Name domain);
+
+    /**
+     * The <code>CREATE DOMAIN</code> statement.
+     *
+     * @see DSL#createDomain(Domain)
+     */
+    @NotNull
+    @Support({ FIREBIRD, H2, HSQLDB, POSTGRES })
+    CreateDomainAsStep createDomain(Domain<?> domain);
+
+    /**
+     * The <code>CREATE DOMAIN IF NOT EXISTS</code> statement.
+     *
+     * @see DSL#createDomainIfNotExists(String)
+     */
+    @NotNull
+    @Support({ FIREBIRD, H2, POSTGRES })
+    CreateDomainAsStep createDomainIfNotExists(String domain);
+
+    /**
+     * The <code>CREATE DOMAIN IF NOT EXISTS</code> statement.
+     *
+     * @see DSL#createDomainIfNotExists(Name)
+     */
+    @NotNull
+    @Support({ FIREBIRD, H2, POSTGRES })
+    CreateDomainAsStep createDomainIfNotExists(Name domain);
+
+    /**
+     * The <code>CREATE DOMAIN IF NOT EXISTS</code> statement.
+     *
+     * @see DSL#createDomainIfNotExists(Domain)
+     */
+    @NotNull
+    @Support({ FIREBIRD, H2, POSTGRES })
+    CreateDomainAsStep createDomainIfNotExists(Domain<?> domain);
+
+    /**
+     * The <code>CREATE INDEX</code> statement.
+     *
+     * @see DSL#createIndex(String)
+     */
+    @NotNull
+    @Support
+    CreateIndexStep createIndex(String index);
+
+    /**
+     * The <code>CREATE INDEX</code> statement.
+     *
+     * @see DSL#createIndex(Name)
+     */
+    @NotNull
+    @Support
+    CreateIndexStep createIndex(Name index);
+
+    /**
+     * The <code>CREATE INDEX</code> statement.
+     *
+     * @see DSL#createIndex(Index)
+     */
+    @NotNull
+    @Support
+    CreateIndexStep createIndex(Index index);
+
+    /**
+     * The <code>CREATE INDEX</code> statement.
+     *
+     * @see DSL#createIndex()
+     */
+    @NotNull
+    @Support
+    CreateIndexStep createIndex();
+
+    /**
+     * The <code>CREATE INDEX IF NOT EXISTS</code> statement.
+     *
+     * @see DSL#createIndexIfNotExists(String)
+     */
+    @NotNull
+    @Support({ FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES, SQLITE })
+    CreateIndexStep createIndexIfNotExists(String index);
+
+    /**
+     * The <code>CREATE INDEX IF NOT EXISTS</code> statement.
+     *
+     * @see DSL#createIndexIfNotExists(Name)
+     */
+    @NotNull
+    @Support({ FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES, SQLITE })
+    CreateIndexStep createIndexIfNotExists(Name index);
+
+    /**
+     * The <code>CREATE INDEX IF NOT EXISTS</code> statement.
+     *
+     * @see DSL#createIndexIfNotExists(Index)
+     */
+    @NotNull
+    @Support({ FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES, SQLITE })
+    CreateIndexStep createIndexIfNotExists(Index index);
+
+    /**
+     * The <code>CREATE INDEX IF NOT EXISTS</code> statement.
+     *
+     * @see DSL#createIndexIfNotExists()
+     */
+    @NotNull
+    @Support({ FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES, SQLITE })
+    CreateIndexStep createIndexIfNotExists();
+
+    /**
+     * The <code>CREATE UNIQUE INDEX</code> statement.
+     *
+     * @see DSL#createUniqueIndex(String)
+     */
+    @NotNull
+    @Support
+    CreateIndexStep createUniqueIndex(String index);
+
+    /**
+     * The <code>CREATE UNIQUE INDEX</code> statement.
+     *
+     * @see DSL#createUniqueIndex(Name)
+     */
+    @NotNull
+    @Support
+    CreateIndexStep createUniqueIndex(Name index);
+
+    /**
+     * The <code>CREATE UNIQUE INDEX</code> statement.
+     *
+     * @see DSL#createUniqueIndex(Index)
+     */
+    @NotNull
+    @Support
+    CreateIndexStep createUniqueIndex(Index index);
+
+    /**
+     * The <code>CREATE UNIQUE INDEX</code> statement.
+     *
+     * @see DSL#createUniqueIndex()
+     */
+    @NotNull
+    @Support
+    CreateIndexStep createUniqueIndex();
+
+    /**
+     * The <code>CREATE UNIQUE INDEX IF NOT EXISTS</code> statement.
+     *
+     * @see DSL#createUniqueIndexIfNotExists(String)
+     */
+    @NotNull
+    @Support({ FIREBIRD, H2, HSQLDB, POSTGRES, SQLITE })
+    CreateIndexStep createUniqueIndexIfNotExists(String index);
+
+    /**
+     * The <code>CREATE UNIQUE INDEX IF NOT EXISTS</code> statement.
+     *
+     * @see DSL#createUniqueIndexIfNotExists(Name)
+     */
+    @NotNull
+    @Support({ FIREBIRD, H2, HSQLDB, POSTGRES, SQLITE })
+    CreateIndexStep createUniqueIndexIfNotExists(Name index);
+
+    /**
+     * The <code>CREATE UNIQUE INDEX IF NOT EXISTS</code> statement.
+     *
+     * @see DSL#createUniqueIndexIfNotExists(Index)
+     */
+    @NotNull
+    @Support({ FIREBIRD, H2, HSQLDB, POSTGRES, SQLITE })
+    CreateIndexStep createUniqueIndexIfNotExists(Index index);
+
+    /**
+     * The <code>CREATE UNIQUE INDEX IF NOT EXISTS</code> statement.
+     *
+     * @see DSL#createUniqueIndexIfNotExists()
+     */
+    @NotNull
+    @Support({ FIREBIRD, H2, HSQLDB, POSTGRES, SQLITE })
+    CreateIndexStep createUniqueIndexIfNotExists();
+
+    /**
+     * The <code>CREATE SCHEMA</code> statement.
+     *
+     * @see DSL#createSchema(String)
+     */
+    @NotNull
+    @Support({ DERBY, H2, HSQLDB, MARIADB, MYSQL, POSTGRES })
+    CreateSchemaFinalStep createSchema(String schema);
+
+    /**
+     * The <code>CREATE SCHEMA</code> statement.
+     *
+     * @see DSL#createSchema(Name)
+     */
+    @NotNull
+    @Support({ DERBY, H2, HSQLDB, MARIADB, MYSQL, POSTGRES })
+    CreateSchemaFinalStep createSchema(Name schema);
+
+    /**
+     * The <code>CREATE SCHEMA</code> statement.
+     *
+     * @see DSL#createSchema(Schema)
+     */
+    @NotNull
+    @Support({ DERBY, H2, HSQLDB, MARIADB, MYSQL, POSTGRES })
+    CreateSchemaFinalStep createSchema(Schema schema);
+
+    /**
+     * The <code>CREATE SCHEMA IF NOT EXISTS</code> statement.
+     *
+     * @see DSL#createSchemaIfNotExists(String)
+     */
+    @NotNull
+    @Support({ H2, MARIADB, MYSQL, POSTGRES })
+    CreateSchemaFinalStep createSchemaIfNotExists(String schema);
+
+    /**
+     * The <code>CREATE SCHEMA IF NOT EXISTS</code> statement.
+     *
+     * @see DSL#createSchemaIfNotExists(Name)
+     */
+    @NotNull
+    @Support({ H2, MARIADB, MYSQL, POSTGRES })
+    CreateSchemaFinalStep createSchemaIfNotExists(Name schema);
+
+    /**
+     * The <code>CREATE SCHEMA IF NOT EXISTS</code> statement.
+     *
+     * @see DSL#createSchemaIfNotExists(Schema)
+     */
+    @NotNull
+    @Support({ H2, MARIADB, MYSQL, POSTGRES })
+    CreateSchemaFinalStep createSchemaIfNotExists(Schema schema);
+
+    /**
+     * The <code>CREATE SEQUENCE</code> statement.
+     *
+     * @see DSL#createSequence(String)
+     */
+    @NotNull
+    @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES })
+    CreateSequenceFlagsStep createSequence(String sequence);
+
+    /**
+     * The <code>CREATE SEQUENCE</code> statement.
+     *
+     * @see DSL#createSequence(Name)
+     */
+    @NotNull
+    @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES })
+    CreateSequenceFlagsStep createSequence(Name sequence);
+
+    /**
+     * The <code>CREATE SEQUENCE</code> statement.
+     *
+     * @see DSL#createSequence(Sequence)
+     */
+    @NotNull
+    @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES })
+    CreateSequenceFlagsStep createSequence(Sequence<?> sequence);
+
+    /**
+     * The <code>CREATE SEQUENCE IF NOT EXISTS</code> statement.
+     *
+     * @see DSL#createSequenceIfNotExists(String)
+     */
+    @NotNull
+    @Support({ FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES })
+    CreateSequenceFlagsStep createSequenceIfNotExists(String sequence);
+
+    /**
+     * The <code>CREATE SEQUENCE IF NOT EXISTS</code> statement.
+     *
+     * @see DSL#createSequenceIfNotExists(Name)
+     */
+    @NotNull
+    @Support({ FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES })
+    CreateSequenceFlagsStep createSequenceIfNotExists(Name sequence);
+
+    /**
+     * The <code>CREATE SEQUENCE IF NOT EXISTS</code> statement.
+     *
+     * @see DSL#createSequenceIfNotExists(Sequence)
+     */
+    @NotNull
+    @Support({ FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES })
+    CreateSequenceFlagsStep createSequenceIfNotExists(Sequence<?> sequence);
+
     /**
      * The <code>DROP DATABASE</code> statement.
      *
diff --git a/jOOQ/src/main/java/org/jooq/impl/DSL.java b/jOOQ/src/main/java/org/jooq/impl/DSL.java
index 33beb4ab45..f46ab798ff 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DSL.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DSL.java
@@ -6974,446 +6974,6 @@ public class DSL {
 
 
 
-    /**
-     * The <code>CREATE DATABASE</code> statement.
-     *
-     * @see DSLContext#createDatabase(String)
-     */
-    @NotNull
-    @Support({ MARIADB, MYSQL, POSTGRES })
-    public static org.jooq.CreateDatabaseFinalStep createDatabase(String database) {
-        return dsl().createDatabase(database);
-    }
-
-    /**
-     * The <code>CREATE DATABASE</code> statement.
-     *
-     * @see DSLContext#createDatabase(Name)
-     */
-    @NotNull
-    @Support({ MARIADB, MYSQL, POSTGRES })
-    public static org.jooq.CreateDatabaseFinalStep createDatabase(Name database) {
-        return dsl().createDatabase(database);
-    }
-
-    /**
-     * The <code>CREATE DATABASE</code> statement.
-     *
-     * @see DSLContext#createDatabase(Catalog)
-     */
-    @NotNull
-    @Support({ MARIADB, MYSQL, POSTGRES })
-    public static org.jooq.CreateDatabaseFinalStep createDatabase(Catalog database) {
-        return dsl().createDatabase(database);
-    }
-
-    /**
-     * The <code>CREATE DATABASE IF NOT EXISTS</code> statement.
-     *
-     * @see DSLContext#createDatabaseIfNotExists(String)
-     */
-    @NotNull
-    @Support({ MARIADB, MYSQL })
-    public static org.jooq.CreateDatabaseFinalStep createDatabaseIfNotExists(String database) {
-        return dsl().createDatabaseIfNotExists(database);
-    }
-
-    /**
-     * The <code>CREATE DATABASE IF NOT EXISTS</code> statement.
-     *
-     * @see DSLContext#createDatabaseIfNotExists(Name)
-     */
-    @NotNull
-    @Support({ MARIADB, MYSQL })
-    public static org.jooq.CreateDatabaseFinalStep createDatabaseIfNotExists(Name database) {
-        return dsl().createDatabaseIfNotExists(database);
-    }
-
-    /**
-     * The <code>CREATE DATABASE IF NOT EXISTS</code> statement.
-     *
-     * @see DSLContext#createDatabaseIfNotExists(Catalog)
-     */
-    @NotNull
-    @Support({ MARIADB, MYSQL })
-    public static org.jooq.CreateDatabaseFinalStep createDatabaseIfNotExists(Catalog database) {
-        return dsl().createDatabaseIfNotExists(database);
-    }
-
-    /**
-     * The <code>CREATE DOMAIN</code> statement.
-     *
-     * @see DSLContext#createDomain(String)
-     */
-    @NotNull
-    @Support({ FIREBIRD, H2, HSQLDB, POSTGRES })
-    public static org.jooq.CreateDomainAsStep createDomain(String domain) {
-        return dsl().createDomain(domain);
-    }
-
-    /**
-     * The <code>CREATE DOMAIN</code> statement.
-     *
-     * @see DSLContext#createDomain(Name)
-     */
-    @NotNull
-    @Support({ FIREBIRD, H2, HSQLDB, POSTGRES })
-    public static org.jooq.CreateDomainAsStep createDomain(Name domain) {
-        return dsl().createDomain(domain);
-    }
-
-    /**
-     * The <code>CREATE DOMAIN</code> statement.
-     *
-     * @see DSLContext#createDomain(Domain)
-     */
-    @NotNull
-    @Support({ FIREBIRD, H2, HSQLDB, POSTGRES })
-    public static org.jooq.CreateDomainAsStep createDomain(Domain<?> domain) {
-        return dsl().createDomain(domain);
-    }
-
-    /**
-     * The <code>CREATE DOMAIN IF NOT EXISTS</code> statement.
-     *
-     * @see DSLContext#createDomainIfNotExists(String)
-     */
-    @NotNull
-    @Support({ FIREBIRD, H2, POSTGRES })
-    public static org.jooq.CreateDomainAsStep createDomainIfNotExists(String domain) {
-        return dsl().createDomainIfNotExists(domain);
-    }
-
-    /**
-     * The <code>CREATE DOMAIN IF NOT EXISTS</code> statement.
-     *
-     * @see DSLContext#createDomainIfNotExists(Name)
-     */
-    @NotNull
-    @Support({ FIREBIRD, H2, POSTGRES })
-    public static org.jooq.CreateDomainAsStep createDomainIfNotExists(Name domain) {
-        return dsl().createDomainIfNotExists(domain);
-    }
-
-    /**
-     * The <code>CREATE DOMAIN IF NOT EXISTS</code> statement.
-     *
-     * @see DSLContext#createDomainIfNotExists(Domain)
-     */
-    @NotNull
-    @Support({ FIREBIRD, H2, POSTGRES })
-    public static org.jooq.CreateDomainAsStep createDomainIfNotExists(Domain<?> domain) {
-        return dsl().createDomainIfNotExists(domain);
-    }
-
-    /**
-     * The <code>CREATE INDEX</code> statement.
-     *
-     * @see DSLContext#createIndex(String)
-     */
-    @NotNull
-    @Support
-    public static org.jooq.CreateIndexStep createIndex(String index) {
-        return dsl().createIndex(index);
-    }
-
-    /**
-     * The <code>CREATE INDEX</code> statement.
-     *
-     * @see DSLContext#createIndex(Name)
-     */
-    @NotNull
-    @Support
-    public static org.jooq.CreateIndexStep createIndex(Name index) {
-        return dsl().createIndex(index);
-    }
-
-    /**
-     * The <code>CREATE INDEX</code> statement.
-     *
-     * @see DSLContext#createIndex(Index)
-     */
-    @NotNull
-    @Support
-    public static org.jooq.CreateIndexStep createIndex(Index index) {
-        return dsl().createIndex(index);
-    }
-
-    /**
-     * The <code>CREATE INDEX</code> statement.
-     *
-     * @see DSLContext#createIndex()
-     */
-    @NotNull
-    @Support
-    public static org.jooq.CreateIndexStep createIndex() {
-        return dsl().createIndex();
-    }
-
-    /**
-     * The <code>CREATE INDEX IF NOT EXISTS</code> statement.
-     *
-     * @see DSLContext#createIndexIfNotExists(String)
-     */
-    @NotNull
-    @Support({ FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES, SQLITE })
-    public static org.jooq.CreateIndexStep createIndexIfNotExists(String index) {
-        return dsl().createIndexIfNotExists(index);
-    }
-
-    /**
-     * The <code>CREATE INDEX IF NOT EXISTS</code> statement.
-     *
-     * @see DSLContext#createIndexIfNotExists(Name)
-     */
-    @NotNull
-    @Support({ FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES, SQLITE })
-    public static org.jooq.CreateIndexStep createIndexIfNotExists(Name index) {
-        return dsl().createIndexIfNotExists(index);
-    }
-
-    /**
-     * The <code>CREATE INDEX IF NOT EXISTS</code> statement.
-     *
-     * @see DSLContext#createIndexIfNotExists(Index)
-     */
-    @NotNull
-    @Support({ FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES, SQLITE })
-    public static org.jooq.CreateIndexStep createIndexIfNotExists(Index index) {
-        return dsl().createIndexIfNotExists(index);
-    }
-
-    /**
-     * The <code>CREATE INDEX IF NOT EXISTS</code> statement.
-     *
-     * @see DSLContext#createIndexIfNotExists()
-     */
-    @NotNull
-    @Support({ FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES, SQLITE })
-    public static org.jooq.CreateIndexStep createIndexIfNotExists() {
-        return dsl().createIndexIfNotExists();
-    }
-
-    /**
-     * The <code>CREATE UNIQUE INDEX</code> statement.
-     *
-     * @see DSLContext#createUniqueIndex(String)
-     */
-    @NotNull
-    @Support
-    public static org.jooq.CreateIndexStep createUniqueIndex(String index) {
-        return dsl().createUniqueIndex(index);
-    }
-
-    /**
-     * The <code>CREATE UNIQUE INDEX</code> statement.
-     *
-     * @see DSLContext#createUniqueIndex(Name)
-     */
-    @NotNull
-    @Support
-    public static org.jooq.CreateIndexStep createUniqueIndex(Name index) {
-        return dsl().createUniqueIndex(index);
-    }
-
-    /**
-     * The <code>CREATE UNIQUE INDEX</code> statement.
-     *
-     * @see DSLContext#createUniqueIndex(Index)
-     */
-    @NotNull
-    @Support
-    public static org.jooq.CreateIndexStep createUniqueIndex(Index index) {
-        return dsl().createUniqueIndex(index);
-    }
-
-    /**
-     * The <code>CREATE UNIQUE INDEX</code> statement.
-     *
-     * @see DSLContext#createUniqueIndex()
-     */
-    @NotNull
-    @Support
-    public static org.jooq.CreateIndexStep createUniqueIndex() {
-        return dsl().createUniqueIndex();
-    }
-
-    /**
-     * The <code>CREATE UNIQUE INDEX IF NOT EXISTS</code> statement.
-     *
-     * @see DSLContext#createUniqueIndexIfNotExists(String)
-     */
-    @NotNull
-    @Support({ FIREBIRD, H2, HSQLDB, POSTGRES, SQLITE })
-    public static org.jooq.CreateIndexStep createUniqueIndexIfNotExists(String index) {
-        return dsl().createUniqueIndexIfNotExists(index);
-    }
-
-    /**
-     * The <code>CREATE UNIQUE INDEX IF NOT EXISTS</code> statement.
-     *
-     * @see DSLContext#createUniqueIndexIfNotExists(Name)
-     */
-    @NotNull
-    @Support({ FIREBIRD, H2, HSQLDB, POSTGRES, SQLITE })
-    public static org.jooq.CreateIndexStep createUniqueIndexIfNotExists(Name index) {
-        return dsl().createUniqueIndexIfNotExists(index);
-    }
-
-    /**
-     * The <code>CREATE UNIQUE INDEX IF NOT EXISTS</code> statement.
-     *
-     * @see DSLContext#createUniqueIndexIfNotExists(Index)
-     */
-    @NotNull
-    @Support({ FIREBIRD, H2, HSQLDB, POSTGRES, SQLITE })
-    public static org.jooq.CreateIndexStep createUniqueIndexIfNotExists(Index index) {
-        return dsl().createUniqueIndexIfNotExists(index);
-    }
-
-    /**
-     * The <code>CREATE UNIQUE INDEX IF NOT EXISTS</code> statement.
-     *
-     * @see DSLContext#createUniqueIndexIfNotExists()
-     */
-    @NotNull
-    @Support({ FIREBIRD, H2, HSQLDB, POSTGRES, SQLITE })
-    public static org.jooq.CreateIndexStep createUniqueIndexIfNotExists() {
-        return dsl().createUniqueIndexIfNotExists();
-    }
-
-    /**
-     * The <code>CREATE SCHEMA</code> statement.
-     *
-     * @see DSLContext#createSchema(String)
-     */
-    @NotNull
-    @Support({ DERBY, H2, HSQLDB, MARIADB, MYSQL, POSTGRES })
-    public static org.jooq.CreateSchemaFinalStep createSchema(String schema) {
-        return dsl().createSchema(schema);
-    }
-
-    /**
-     * The <code>CREATE SCHEMA</code> statement.
-     *
-     * @see DSLContext#createSchema(Name)
-     */
-    @NotNull
-    @Support({ DERBY, H2, HSQLDB, MARIADB, MYSQL, POSTGRES })
-    public static org.jooq.CreateSchemaFinalStep createSchema(Name schema) {
-        return dsl().createSchema(schema);
-    }
-
-    /**
-     * The <code>CREATE SCHEMA</code> statement.
-     *
-     * @see DSLContext#createSchema(Schema)
-     */
-    @NotNull
-    @Support({ DERBY, H2, HSQLDB, MARIADB, MYSQL, POSTGRES })
-    public static org.jooq.CreateSchemaFinalStep createSchema(Schema schema) {
-        return dsl().createSchema(schema);
-    }
-
-    /**
-     * The <code>CREATE SCHEMA IF NOT EXISTS</code> statement.
-     *
-     * @see DSLContext#createSchemaIfNotExists(String)
-     */
-    @NotNull
-    @Support({ H2, MARIADB, MYSQL, POSTGRES })
-    public static org.jooq.CreateSchemaFinalStep createSchemaIfNotExists(String schema) {
-        return dsl().createSchemaIfNotExists(schema);
-    }
-
-    /**
-     * The <code>CREATE SCHEMA IF NOT EXISTS</code> statement.
-     *
-     * @see DSLContext#createSchemaIfNotExists(Name)
-     */
-    @NotNull
-    @Support({ H2, MARIADB, MYSQL, POSTGRES })
-    public static org.jooq.CreateSchemaFinalStep createSchemaIfNotExists(Name schema) {
-        return dsl().createSchemaIfNotExists(schema);
-    }
-
-    /**
-     * The <code>CREATE SCHEMA IF NOT EXISTS</code> statement.
-     *
-     * @see DSLContext#createSchemaIfNotExists(Schema)
-     */
-    @NotNull
-    @Support({ H2, MARIADB, MYSQL, POSTGRES })
-    public static org.jooq.CreateSchemaFinalStep createSchemaIfNotExists(Schema schema) {
-        return dsl().createSchemaIfNotExists(schema);
-    }
-
-    /**
-     * The <code>CREATE SEQUENCE</code> statement.
-     *
-     * @see DSLContext#createSequence(String)
-     */
-    @NotNull
-    @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES })
-    public static org.jooq.CreateSequenceFlagsStep createSequence(String sequence) {
-        return dsl().createSequence(sequence);
-    }
-
-    /**
-     * The <code>CREATE SEQUENCE</code> statement.
-     *
-     * @see DSLContext#createSequence(Name)
-     */
-    @NotNull
-    @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES })
-    public static org.jooq.CreateSequenceFlagsStep createSequence(Name sequence) {
-        return dsl().createSequence(sequence);
-    }
-
-    /**
-     * The <code>CREATE SEQUENCE</code> statement.
-     *
-     * @see DSLContext#createSequence(Sequence)
-     */
-    @NotNull
-    @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES })
-    public static org.jooq.CreateSequenceFlagsStep createSequence(Sequence<?> sequence) {
-        return dsl().createSequence(sequence);
-    }
-
-    /**
-     * The <code>CREATE SEQUENCE IF NOT EXISTS</code> statement.
-     *
-     * @see DSLContext#createSequenceIfNotExists(String)
-     */
-    @NotNull
-    @Support({ FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES })
-    public static org.jooq.CreateSequenceFlagsStep createSequenceIfNotExists(String sequence) {
-        return dsl().createSequenceIfNotExists(sequence);
-    }
-
-    /**
-     * The <code>CREATE SEQUENCE IF NOT EXISTS</code> statement.
-     *
-     * @see DSLContext#createSequenceIfNotExists(Name)
-     */
-    @NotNull
-    @Support({ FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES })
-    public static org.jooq.CreateSequenceFlagsStep createSequenceIfNotExists(Name sequence) {
-        return dsl().createSequenceIfNotExists(sequence);
-    }
-
-    /**
-     * The <code>CREATE SEQUENCE IF NOT EXISTS</code> statement.
-     *
-     * @see DSLContext#createSequenceIfNotExists(Sequence)
-     */
-    @NotNull
-    @Support({ FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES })
-    public static org.jooq.CreateSequenceFlagsStep createSequenceIfNotExists(Sequence<?> sequence) {
-        return dsl().createSequenceIfNotExists(sequence);
-    }
-
     /**
      * The <code>ALTER DATABASE</code> statement.
      *
@@ -7931,6 +7491,446 @@ public class DSL {
         return dsl().commentOnColumn(field);
     }
 
+    /**
+     * The <code>CREATE DATABASE</code> statement.
+     *
+     * @see DSLContext#createDatabase(String)
+     */
+    @NotNull
+    @Support({ MARIADB, MYSQL, POSTGRES })
+    public static org.jooq.CreateDatabaseFinalStep createDatabase(String database) {
+        return dsl().createDatabase(database);
+    }
+
+    /**
+     * The <code>CREATE DATABASE</code> statement.
+     *
+     * @see DSLContext#createDatabase(Name)
+     */
+    @NotNull
+    @Support({ MARIADB, MYSQL, POSTGRES })
+    public static org.jooq.CreateDatabaseFinalStep createDatabase(Name database) {
+        return dsl().createDatabase(database);
+    }
+
+    /**
+     * The <code>CREATE DATABASE</code> statement.
+     *
+     * @see DSLContext#createDatabase(Catalog)
+     */
+    @NotNull
+    @Support({ MARIADB, MYSQL, POSTGRES })
+    public static org.jooq.CreateDatabaseFinalStep createDatabase(Catalog database) {
+        return dsl().createDatabase(database);
+    }
+
+    /**
+     * The <code>CREATE DATABASE IF NOT EXISTS</code> statement.
+     *
+     * @see DSLContext#createDatabaseIfNotExists(String)
+     */
+    @NotNull
+    @Support({ MARIADB, MYSQL })
+    public static org.jooq.CreateDatabaseFinalStep createDatabaseIfNotExists(String database) {
+        return dsl().createDatabaseIfNotExists(database);
+    }
+
+    /**
+     * The <code>CREATE DATABASE IF NOT EXISTS</code> statement.
+     *
+     * @see DSLContext#createDatabaseIfNotExists(Name)
+     */
+    @NotNull
+    @Support({ MARIADB, MYSQL })
+    public static org.jooq.CreateDatabaseFinalStep createDatabaseIfNotExists(Name database) {
+        return dsl().createDatabaseIfNotExists(database);
+    }
+
+    /**
+     * The <code>CREATE DATABASE IF NOT EXISTS</code> statement.
+     *
+     * @see DSLContext#createDatabaseIfNotExists(Catalog)
+     */
+    @NotNull
+    @Support({ MARIADB, MYSQL })
+    public static org.jooq.CreateDatabaseFinalStep createDatabaseIfNotExists(Catalog database) {
+        return dsl().createDatabaseIfNotExists(database);
+    }
+
+    /**
+     * The <code>CREATE DOMAIN</code> statement.
+     *
+     * @see DSLContext#createDomain(String)
+     */
+    @NotNull
+    @Support({ FIREBIRD, H2, HSQLDB, POSTGRES })
+    public static org.jooq.CreateDomainAsStep createDomain(String domain) {
+        return dsl().createDomain(domain);
+    }
+
+    /**
+     * The <code>CREATE DOMAIN</code> statement.
+     *
+     * @see DSLContext#createDomain(Name)
+     */
+    @NotNull
+    @Support({ FIREBIRD, H2, HSQLDB, POSTGRES })
+    public static org.jooq.CreateDomainAsStep createDomain(Name domain) {
+        return dsl().createDomain(domain);
+    }
+
+    /**
+     * The <code>CREATE DOMAIN</code> statement.
+     *
+     * @see DSLContext#createDomain(Domain)
+     */
+    @NotNull
+    @Support({ FIREBIRD, H2, HSQLDB, POSTGRES })
+    public static org.jooq.CreateDomainAsStep createDomain(Domain<?> domain) {
+        return dsl().createDomain(domain);
+    }
+
+    /**
+     * The <code>CREATE DOMAIN IF NOT EXISTS</code> statement.
+     *
+     * @see DSLContext#createDomainIfNotExists(String)
+     */
+    @NotNull
+    @Support({ FIREBIRD, H2, POSTGRES })
+    public static org.jooq.CreateDomainAsStep createDomainIfNotExists(String domain) {
+        return dsl().createDomainIfNotExists(domain);
+    }
+
+    /**
+     * The <code>CREATE DOMAIN IF NOT EXISTS</code> statement.
+     *
+     * @see DSLContext#createDomainIfNotExists(Name)
+     */
+    @NotNull
+    @Support({ FIREBIRD, H2, POSTGRES })
+    public static org.jooq.CreateDomainAsStep createDomainIfNotExists(Name domain) {
+        return dsl().createDomainIfNotExists(domain);
+    }
+
+    /**
+     * The <code>CREATE DOMAIN IF NOT EXISTS</code> statement.
+     *
+     * @see DSLContext#createDomainIfNotExists(Domain)
+     */
+    @NotNull
+    @Support({ FIREBIRD, H2, POSTGRES })
+    public static org.jooq.CreateDomainAsStep createDomainIfNotExists(Domain<?> domain) {
+        return dsl().createDomainIfNotExists(domain);
+    }
+
+    /**
+     * The <code>CREATE INDEX</code> statement.
+     *
+     * @see DSLContext#createIndex(String)
+     */
+    @NotNull
+    @Support
+    public static org.jooq.CreateIndexStep createIndex(String index) {
+        return dsl().createIndex(index);
+    }
+
+    /**
+     * The <code>CREATE INDEX</code> statement.
+     *
+     * @see DSLContext#createIndex(Name)
+     */
+    @NotNull
+    @Support
+    public static org.jooq.CreateIndexStep createIndex(Name index) {
+        return dsl().createIndex(index);
+    }
+
+    /**
+     * The <code>CREATE INDEX</code> statement.
+     *
+     * @see DSLContext#createIndex(Index)
+     */
+    @NotNull
+    @Support
+    public static org.jooq.CreateIndexStep createIndex(Index index) {
+        return dsl().createIndex(index);
+    }
+
+    /**
+     * The <code>CREATE INDEX</code> statement.
+     *
+     * @see DSLContext#createIndex()
+     */
+    @NotNull
+    @Support
+    public static org.jooq.CreateIndexStep createIndex() {
+        return dsl().createIndex();
+    }
+
+    /**
+     * The <code>CREATE INDEX IF NOT EXISTS</code> statement.
+     *
+     * @see DSLContext#createIndexIfNotExists(String)
+     */
+    @NotNull
+    @Support({ FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES, SQLITE })
+    public static org.jooq.CreateIndexStep createIndexIfNotExists(String index) {
+        return dsl().createIndexIfNotExists(index);
+    }
+
+    /**
+     * The <code>CREATE INDEX IF NOT EXISTS</code> statement.
+     *
+     * @see DSLContext#createIndexIfNotExists(Name)
+     */
+    @NotNull
+    @Support({ FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES, SQLITE })
+    public static org.jooq.CreateIndexStep createIndexIfNotExists(Name index) {
+        return dsl().createIndexIfNotExists(index);
+    }
+
+    /**
+     * The <code>CREATE INDEX IF NOT EXISTS</code> statement.
+     *
+     * @see DSLContext#createIndexIfNotExists(Index)
+     */
+    @NotNull
+    @Support({ FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES, SQLITE })
+    public static org.jooq.CreateIndexStep createIndexIfNotExists(Index index) {
+        return dsl().createIndexIfNotExists(index);
+    }
+
+    /**
+     * The <code>CREATE INDEX IF NOT EXISTS</code> statement.
+     *
+     * @see DSLContext#createIndexIfNotExists()
+     */
+    @NotNull
+    @Support({ FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES, SQLITE })
+    public static org.jooq.CreateIndexStep createIndexIfNotExists() {
+        return dsl().createIndexIfNotExists();
+    }
+
+    /**
+     * The <code>CREATE UNIQUE INDEX</code> statement.
+     *
+     * @see DSLContext#createUniqueIndex(String)
+     */
+    @NotNull
+    @Support
+    public static org.jooq.CreateIndexStep createUniqueIndex(String index) {
+        return dsl().createUniqueIndex(index);
+    }
+
+    /**
+     * The <code>CREATE UNIQUE INDEX</code> statement.
+     *
+     * @see DSLContext#createUniqueIndex(Name)
+     */
+    @NotNull
+    @Support
+    public static org.jooq.CreateIndexStep createUniqueIndex(Name index) {
+        return dsl().createUniqueIndex(index);
+    }
+
+    /**
+     * The <code>CREATE UNIQUE INDEX</code> statement.
+     *
+     * @see DSLContext#createUniqueIndex(Index)
+     */
+    @NotNull
+    @Support
+    public static org.jooq.CreateIndexStep createUniqueIndex(Index index) {
+        return dsl().createUniqueIndex(index);
+    }
+
+    /**
+     * The <code>CREATE UNIQUE INDEX</code> statement.
+     *
+     * @see DSLContext#createUniqueIndex()
+     */
+    @NotNull
+    @Support
+    public static org.jooq.CreateIndexStep createUniqueIndex() {
+        return dsl().createUniqueIndex();
+    }
+
+    /**
+     * The <code>CREATE UNIQUE INDEX IF NOT EXISTS</code> statement.
+     *
+     * @see DSLContext#createUniqueIndexIfNotExists(String)
+     */
+    @NotNull
+    @Support({ FIREBIRD, H2, HSQLDB, POSTGRES, SQLITE })
+    public static org.jooq.CreateIndexStep createUniqueIndexIfNotExists(String index) {
+        return dsl().createUniqueIndexIfNotExists(index);
+    }
+
+    /**
+     * The <code>CREATE UNIQUE INDEX IF NOT EXISTS</code> statement.
+     *
+     * @see DSLContext#createUniqueIndexIfNotExists(Name)
+     */
+    @NotNull
+    @Support({ FIREBIRD, H2, HSQLDB, POSTGRES, SQLITE })
+    public static org.jooq.CreateIndexStep createUniqueIndexIfNotExists(Name index) {
+        return dsl().createUniqueIndexIfNotExists(index);
+    }
+
+    /**
+     * The <code>CREATE UNIQUE INDEX IF NOT EXISTS</code> statement.
+     *
+     * @see DSLContext#createUniqueIndexIfNotExists(Index)
+     */
+    @NotNull
+    @Support({ FIREBIRD, H2, HSQLDB, POSTGRES, SQLITE })
+    public static org.jooq.CreateIndexStep createUniqueIndexIfNotExists(Index index) {
+        return dsl().createUniqueIndexIfNotExists(index);
+    }
+
+    /**
+     * The <code>CREATE UNIQUE INDEX IF NOT EXISTS</code> statement.
+     *
+     * @see DSLContext#createUniqueIndexIfNotExists()
+     */
+    @NotNull
+    @Support({ FIREBIRD, H2, HSQLDB, POSTGRES, SQLITE })
+    public static org.jooq.CreateIndexStep createUniqueIndexIfNotExists() {
+        return dsl().createUniqueIndexIfNotExists();
+    }
+
+    /**
+     * The <code>CREATE SCHEMA</code> statement.
+     *
+     * @see DSLContext#createSchema(String)
+     */
+    @NotNull
+    @Support({ DERBY, H2, HSQLDB, MARIADB, MYSQL, POSTGRES })
+    public static org.jooq.CreateSchemaFinalStep createSchema(String schema) {
+        return dsl().createSchema(schema);
+    }
+
+    /**
+     * The <code>CREATE SCHEMA</code> statement.
+     *
+     * @see DSLContext#createSchema(Name)
+     */
+    @NotNull
+    @Support({ DERBY, H2, HSQLDB, MARIADB, MYSQL, POSTGRES })
+    public static org.jooq.CreateSchemaFinalStep createSchema(Name schema) {
+        return dsl().createSchema(schema);
+    }
+
+    /**
+     * The <code>CREATE SCHEMA</code> statement.
+     *
+     * @see DSLContext#createSchema(Schema)
+     */
+    @NotNull
+    @Support({ DERBY, H2, HSQLDB, MARIADB, MYSQL, POSTGRES })
+    public static org.jooq.CreateSchemaFinalStep createSchema(Schema schema) {
+        return dsl().createSchema(schema);
+    }
+
+    /**
+     * The <code>CREATE SCHEMA IF NOT EXISTS</code> statement.
+     *
+     * @see DSLContext#createSchemaIfNotExists(String)
+     */
+    @NotNull
+    @Support({ H2, MARIADB, MYSQL, POSTGRES })
+    public static org.jooq.CreateSchemaFinalStep createSchemaIfNotExists(String schema) {
+        return dsl().createSchemaIfNotExists(schema);
+    }
+
+    /**
+     * The <code>CREATE SCHEMA IF NOT EXISTS</code> statement.
+     *
+     * @see DSLContext#createSchemaIfNotExists(Name)
+     */
+    @NotNull
+    @Support({ H2, MARIADB, MYSQL, POSTGRES })
+    public static org.jooq.CreateSchemaFinalStep createSchemaIfNotExists(Name schema) {
+        return dsl().createSchemaIfNotExists(schema);
+    }
+
+    /**
+     * The <code>CREATE SCHEMA IF NOT EXISTS</code> statement.
+     *
+     * @see DSLContext#createSchemaIfNotExists(Schema)
+     */
+    @NotNull
+    @Support({ H2, MARIADB, MYSQL, POSTGRES })
+    public static org.jooq.CreateSchemaFinalStep createSchemaIfNotExists(Schema schema) {
+        return dsl().createSchemaIfNotExists(schema);
+    }
+
+    /**
+     * The <code>CREATE SEQUENCE</code> statement.
+     *
+     * @see DSLContext#createSequence(String)
+     */
+    @NotNull
+    @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES })
+    public static org.jooq.CreateSequenceFlagsStep createSequence(String sequence) {
+        return dsl().createSequence(sequence);
+    }
+
+    /**
+     * The <code>CREATE SEQUENCE</code> statement.
+     *
+     * @see DSLContext#createSequence(Name)
+     */
+    @NotNull
+    @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES })
+    public static org.jooq.CreateSequenceFlagsStep createSequence(Name sequence) {
+        return dsl().createSequence(sequence);
+    }
+
+    /**
+     * The <code>CREATE SEQUENCE</code> statement.
+     *
+     * @see DSLContext#createSequence(Sequence)
+     */
+    @NotNull
+    @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES })
+    public static org.jooq.CreateSequenceFlagsStep createSequence(Sequence<?> sequence) {
+        return dsl().createSequence(sequence);
+    }
+
+    /**
+     * The <code>CREATE SEQUENCE IF NOT EXISTS</code> statement.
+     *
+     * @see DSLContext#createSequenceIfNotExists(String)
+     */
+    @NotNull
+    @Support({ FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES })
+    public static org.jooq.CreateSequenceFlagsStep createSequenceIfNotExists(String sequence) {
+        return dsl().createSequenceIfNotExists(sequence);
+    }
+
+    /**
+     * The <code>CREATE SEQUENCE IF NOT EXISTS</code> statement.
+     *
+     * @see DSLContext#createSequenceIfNotExists(Name)
+     */
+    @NotNull
+    @Support({ FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES })
+    public static org.jooq.CreateSequenceFlagsStep createSequenceIfNotExists(Name sequence) {
+        return dsl().createSequenceIfNotExists(sequence);
+    }
+
+    /**
+     * The <code>CREATE SEQUENCE IF NOT EXISTS</code> statement.
+     *
+     * @see DSLContext#createSequenceIfNotExists(Sequence)
+     */
+    @NotNull
+    @Support({ FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES })
+    public static org.jooq.CreateSequenceFlagsStep createSequenceIfNotExists(Sequence<?> sequence) {
+        return dsl().createSequenceIfNotExists(sequence);
+    }
+
     /**
      * The <code>DROP DATABASE</code> statement.
      *
@@ -14862,28 +14862,6 @@ public class DSL {
         return new BitLength(string);
     }
 
-    /**
-     * The <code>CEIL</code> function.
-     * <p>
-     * Get the smallest integer value equal or greater to a value.
-     */
-    @NotNull
-    @Support
-    public static <T extends Number> Field<T> ceil(T value) {
-        return new Ceil(Tools.field(value));
-    }
-
-    /**
-     * The <code>CEIL</code> function.
-     * <p>
-     * Get the smallest integer value equal or greater to a value.
-     */
-    @NotNull
-    @Support
-    public static <T extends Number> Field<T> ceil(Field<T> value) {
-        return new Ceil(value);
-    }
-
     /**
      * The <code>CHAR_LENGTH</code> function.
      * <p>
@@ -14924,6 +14902,28 @@ public class DSL {
         return new Chr(number);
     }
 
+    /**
+     * The <code>CEIL</code> function.
+     * <p>
+     * Get the smallest integer value equal or greater to a value.
+     */
+    @NotNull
+    @Support
+    public static <T extends Number> Field<T> ceil(T value) {
+        return new Ceil(Tools.field(value));
+    }
+
+    /**
+     * The <code>CEIL</code> function.
+     * <p>
+     * Get the smallest integer value equal or greater to a value.
+     */
+    @NotNull
+    @Support
+    public static <T extends Number> Field<T> ceil(Field<T> value) {
+        return new Ceil(value);
+    }
+
     /**
      * The <code>COS</code> function.
      */
@@ -16200,6 +16200,21 @@ public class DSL {
         return new Round(value);
     }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     /**
      * The <code>RPAD</code> function.
      * <p>
@@ -16370,21 +16385,6 @@ public class DSL {
         return new Rtrim(string);
     }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
     /**
      * The <code>SIGN</code> function.
      * <p>
@@ -16469,24 +16469,6 @@ public class DSL {
         return new Space(count);
     }
 
-    /**
-     * The <code>SQRT</code> function.
-     */
-    @NotNull
-    @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES })
-    public static Field<BigDecimal> sqrt(Number value) {
-        return new Sqrt(Tools.field(value));
-    }
-
-    /**
-     * The <code>SQRT</code> function.
-     */
-    @NotNull
-    @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES })
-    public static Field<BigDecimal> sqrt(Field<? extends Number> value) {
-        return new Sqrt(value);
-    }
-
     /**
      * The <code>SPLIT_PART</code> function.
      * <p>
@@ -16547,6 +16529,42 @@ public class DSL {
         return new SplitPart(string, delimiter, n);
     }
 
+    /**
+     * The <code>SQRT</code> function.
+     */
+    @NotNull
+    @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES })
+    public static Field<BigDecimal> sqrt(Number value) {
+        return new Sqrt(Tools.field(value));
+    }
+
+    /**
+     * The <code>SQRT</code> function.
+     */
+    @NotNull
+    @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES })
+    public static Field<BigDecimal> sqrt(Field<? extends Number> value) {
+        return new Sqrt(value);
+    }
+
+    /**
+     * The <code>SQUARE</code> function.
+     */
+    @NotNull
+    @Support
+    public static <T extends Number> Field<T> square(T value) {
+        return new Square(Tools.field(value));
+    }
+
+    /**
+     * The <code>SQUARE</code> function.
+     */
+    @NotNull
+    @Support
+    public static <T extends Number> Field<T> square(Field<T> value) {
+        return new Square(value);
+    }
+
     /**
      * The <code>SUBSTRING</code> function.
      * <p>
diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java b/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java
index 48ac79118c..4e1de2bc4d 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java
@@ -2681,206 +2681,6 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri
 
 
 
-    @Override
-    public org.jooq.CreateDatabaseFinalStep createDatabase(String database) {
-        return new CreateDatabaseImpl(configuration(), DSL.catalog(DSL.name(database)), false);
-    }
-
-    @Override
-    public org.jooq.CreateDatabaseFinalStep createDatabase(Name database) {
-        return new CreateDatabaseImpl(configuration(), DSL.catalog(database), false);
-    }
-
-    @Override
-    public org.jooq.CreateDatabaseFinalStep createDatabase(Catalog database) {
-        return new CreateDatabaseImpl(configuration(), database, false);
-    }
-
-    @Override
-    public org.jooq.CreateDatabaseFinalStep createDatabaseIfNotExists(String database) {
-        return new CreateDatabaseImpl(configuration(), DSL.catalog(DSL.name(database)), true);
-    }
-
-    @Override
-    public org.jooq.CreateDatabaseFinalStep createDatabaseIfNotExists(Name database) {
-        return new CreateDatabaseImpl(configuration(), DSL.catalog(database), true);
-    }
-
-    @Override
-    public org.jooq.CreateDatabaseFinalStep createDatabaseIfNotExists(Catalog database) {
-        return new CreateDatabaseImpl(configuration(), database, true);
-    }
-
-    @Override
-    public org.jooq.CreateDomainAsStep createDomain(String domain) {
-        return new CreateDomainImpl<>(configuration(), DSL.domain(DSL.name(domain)), false);
-    }
-
-    @Override
-    public org.jooq.CreateDomainAsStep createDomain(Name domain) {
-        return new CreateDomainImpl<>(configuration(), DSL.domain(domain), false);
-    }
-
-    @Override
-    public org.jooq.CreateDomainAsStep createDomain(Domain<?> domain) {
-        return new CreateDomainImpl<>(configuration(), domain, false);
-    }
-
-    @Override
-    public org.jooq.CreateDomainAsStep createDomainIfNotExists(String domain) {
-        return new CreateDomainImpl<>(configuration(), DSL.domain(DSL.name(domain)), true);
-    }
-
-    @Override
-    public org.jooq.CreateDomainAsStep createDomainIfNotExists(Name domain) {
-        return new CreateDomainImpl<>(configuration(), DSL.domain(domain), true);
-    }
-
-    @Override
-    public org.jooq.CreateDomainAsStep createDomainIfNotExists(Domain<?> domain) {
-        return new CreateDomainImpl<>(configuration(), domain, true);
-    }
-
-    @Override
-    public org.jooq.CreateIndexStep createIndex(String index) {
-        return new CreateIndexImpl(configuration(), false, DSL.index(DSL.name(index)), false);
-    }
-
-    @Override
-    public org.jooq.CreateIndexStep createIndex(Name index) {
-        return new CreateIndexImpl(configuration(), false, DSL.index(index), false);
-    }
-
-    @Override
-    public org.jooq.CreateIndexStep createIndex(Index index) {
-        return new CreateIndexImpl(configuration(), false, index, false);
-    }
-
-    @Override
-    public org.jooq.CreateIndexStep createIndex() {
-        return new CreateIndexImpl(configuration(), false, false);
-    }
-
-    @Override
-    public org.jooq.CreateIndexStep createIndexIfNotExists(String index) {
-        return new CreateIndexImpl(configuration(), false, DSL.index(DSL.name(index)), true);
-    }
-
-    @Override
-    public org.jooq.CreateIndexStep createIndexIfNotExists(Name index) {
-        return new CreateIndexImpl(configuration(), false, DSL.index(index), true);
-    }
-
-    @Override
-    public org.jooq.CreateIndexStep createIndexIfNotExists(Index index) {
-        return new CreateIndexImpl(configuration(), false, index, true);
-    }
-
-    @Override
-    public org.jooq.CreateIndexStep createIndexIfNotExists() {
-        return new CreateIndexImpl(configuration(), false, true);
-    }
-
-    @Override
-    public org.jooq.CreateIndexStep createUniqueIndex(String index) {
-        return new CreateIndexImpl(configuration(), true, DSL.index(DSL.name(index)), false);
-    }
-
-    @Override
-    public org.jooq.CreateIndexStep createUniqueIndex(Name index) {
-        return new CreateIndexImpl(configuration(), true, DSL.index(index), false);
-    }
-
-    @Override
-    public org.jooq.CreateIndexStep createUniqueIndex(Index index) {
-        return new CreateIndexImpl(configuration(), true, index, false);
-    }
-
-    @Override
-    public org.jooq.CreateIndexStep createUniqueIndex() {
-        return new CreateIndexImpl(configuration(), true, false);
-    }
-
-    @Override
-    public org.jooq.CreateIndexStep createUniqueIndexIfNotExists(String index) {
-        return new CreateIndexImpl(configuration(), true, DSL.index(DSL.name(index)), true);
-    }
-
-    @Override
-    public org.jooq.CreateIndexStep createUniqueIndexIfNotExists(Name index) {
-        return new CreateIndexImpl(configuration(), true, DSL.index(index), true);
-    }
-
-    @Override
-    public org.jooq.CreateIndexStep createUniqueIndexIfNotExists(Index index) {
-        return new CreateIndexImpl(configuration(), true, index, true);
-    }
-
-    @Override
-    public org.jooq.CreateIndexStep createUniqueIndexIfNotExists() {
-        return new CreateIndexImpl(configuration(), true, true);
-    }
-
-    @Override
-    public org.jooq.CreateSchemaFinalStep createSchema(String schema) {
-        return new CreateSchemaImpl(configuration(), DSL.schema(DSL.name(schema)), false);
-    }
-
-    @Override
-    public org.jooq.CreateSchemaFinalStep createSchema(Name schema) {
-        return new CreateSchemaImpl(configuration(), DSL.schema(schema), false);
-    }
-
-    @Override
-    public org.jooq.CreateSchemaFinalStep createSchema(Schema schema) {
-        return new CreateSchemaImpl(configuration(), schema, false);
-    }
-
-    @Override
-    public org.jooq.CreateSchemaFinalStep createSchemaIfNotExists(String schema) {
-        return new CreateSchemaImpl(configuration(), DSL.schema(DSL.name(schema)), true);
-    }
-
-    @Override
-    public org.jooq.CreateSchemaFinalStep createSchemaIfNotExists(Name schema) {
-        return new CreateSchemaImpl(configuration(), DSL.schema(schema), true);
-    }
-
-    @Override
-    public org.jooq.CreateSchemaFinalStep createSchemaIfNotExists(Schema schema) {
-        return new CreateSchemaImpl(configuration(), schema, true);
-    }
-
-    @Override
-    public org.jooq.CreateSequenceFlagsStep createSequence(String sequence) {
-        return new CreateSequenceImpl(configuration(), DSL.sequence(DSL.name(sequence)), false);
-    }
-
-    @Override
-    public org.jooq.CreateSequenceFlagsStep createSequence(Name sequence) {
-        return new CreateSequenceImpl(configuration(), DSL.sequence(sequence), false);
-    }
-
-    @Override
-    public org.jooq.CreateSequenceFlagsStep createSequence(Sequence<?> sequence) {
-        return new CreateSequenceImpl(configuration(), sequence, false);
-    }
-
-    @Override
-    public org.jooq.CreateSequenceFlagsStep createSequenceIfNotExists(String sequence) {
-        return new CreateSequenceImpl(configuration(), DSL.sequence(DSL.name(sequence)), true);
-    }
-
-    @Override
-    public org.jooq.CreateSequenceFlagsStep createSequenceIfNotExists(Name sequence) {
-        return new CreateSequenceImpl(configuration(), DSL.sequence(sequence), true);
-    }
-
-    @Override
-    public org.jooq.CreateSequenceFlagsStep createSequenceIfNotExists(Sequence<?> sequence) {
-        return new CreateSequenceImpl(configuration(), sequence, true);
-    }
-
     @Override
     public org.jooq.AlterDatabaseStep alterDatabase(String database) {
         return new AlterDatabaseImpl(configuration(), DSL.catalog(DSL.name(database)), false);
@@ -3116,6 +2916,206 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri
         return new CommentOnImpl(configuration(), null, false, field);
     }
 
+    @Override
+    public org.jooq.CreateDatabaseFinalStep createDatabase(String database) {
+        return new CreateDatabaseImpl(configuration(), DSL.catalog(DSL.name(database)), false);
+    }
+
+    @Override
+    public org.jooq.CreateDatabaseFinalStep createDatabase(Name database) {
+        return new CreateDatabaseImpl(configuration(), DSL.catalog(database), false);
+    }
+
+    @Override
+    public org.jooq.CreateDatabaseFinalStep createDatabase(Catalog database) {
+        return new CreateDatabaseImpl(configuration(), database, false);
+    }
+
+    @Override
+    public org.jooq.CreateDatabaseFinalStep createDatabaseIfNotExists(String database) {
+        return new CreateDatabaseImpl(configuration(), DSL.catalog(DSL.name(database)), true);
+    }
+
+    @Override
+    public org.jooq.CreateDatabaseFinalStep createDatabaseIfNotExists(Name database) {
+        return new CreateDatabaseImpl(configuration(), DSL.catalog(database), true);
+    }
+
+    @Override
+    public org.jooq.CreateDatabaseFinalStep createDatabaseIfNotExists(Catalog database) {
+        return new CreateDatabaseImpl(configuration(), database, true);
+    }
+
+    @Override
+    public org.jooq.CreateDomainAsStep createDomain(String domain) {
+        return new CreateDomainImpl<>(configuration(), DSL.domain(DSL.name(domain)), false);
+    }
+
+    @Override
+    public org.jooq.CreateDomainAsStep createDomain(Name domain) {
+        return new CreateDomainImpl<>(configuration(), DSL.domain(domain), false);
+    }
+
+    @Override
+    public org.jooq.CreateDomainAsStep createDomain(Domain<?> domain) {
+        return new CreateDomainImpl<>(configuration(), domain, false);
+    }
+
+    @Override
+    public org.jooq.CreateDomainAsStep createDomainIfNotExists(String domain) {
+        return new CreateDomainImpl<>(configuration(), DSL.domain(DSL.name(domain)), true);
+    }
+
+    @Override
+    public org.jooq.CreateDomainAsStep createDomainIfNotExists(Name domain) {
+        return new CreateDomainImpl<>(configuration(), DSL.domain(domain), true);
+    }
+
+    @Override
+    public org.jooq.CreateDomainAsStep createDomainIfNotExists(Domain<?> domain) {
+        return new CreateDomainImpl<>(configuration(), domain, true);
+    }
+
+    @Override
+    public org.jooq.CreateIndexStep createIndex(String index) {
+        return new CreateIndexImpl(configuration(), false, DSL.index(DSL.name(index)), false);
+    }
+
+    @Override
+    public org.jooq.CreateIndexStep createIndex(Name index) {
+        return new CreateIndexImpl(configuration(), false, DSL.index(index), false);
+    }
+
+    @Override
+    public org.jooq.CreateIndexStep createIndex(Index index) {
+        return new CreateIndexImpl(configuration(), false, index, false);
+    }
+
+    @Override
+    public org.jooq.CreateIndexStep createIndex() {
+        return new CreateIndexImpl(configuration(), false, false);
+    }
+
+    @Override
+    public org.jooq.CreateIndexStep createIndexIfNotExists(String index) {
+        return new CreateIndexImpl(configuration(), false, DSL.index(DSL.name(index)), true);
+    }
+
+    @Override
+    public org.jooq.CreateIndexStep createIndexIfNotExists(Name index) {
+        return new CreateIndexImpl(configuration(), false, DSL.index(index), true);
+    }
+
+    @Override
+    public org.jooq.CreateIndexStep createIndexIfNotExists(Index index) {
+        return new CreateIndexImpl(configuration(), false, index, true);
+    }
+
+    @Override
+    public org.jooq.CreateIndexStep createIndexIfNotExists() {
+        return new CreateIndexImpl(configuration(), false, true);
+    }
+
+    @Override
+    public org.jooq.CreateIndexStep createUniqueIndex(String index) {
+        return new CreateIndexImpl(configuration(), true, DSL.index(DSL.name(index)), false);
+    }
+
+    @Override
+    public org.jooq.CreateIndexStep createUniqueIndex(Name index) {
+        return new CreateIndexImpl(configuration(), true, DSL.index(index), false);
+    }
+
+    @Override
+    public org.jooq.CreateIndexStep createUniqueIndex(Index index) {
+        return new CreateIndexImpl(configuration(), true, index, false);
+    }
+
+    @Override
+    public org.jooq.CreateIndexStep createUniqueIndex() {
+        return new CreateIndexImpl(configuration(), true, false);
+    }
+
+    @Override
+    public org.jooq.CreateIndexStep createUniqueIndexIfNotExists(String index) {
+        return new CreateIndexImpl(configuration(), true, DSL.index(DSL.name(index)), true);
+    }
+
+    @Override
+    public org.jooq.CreateIndexStep createUniqueIndexIfNotExists(Name index) {
+        return new CreateIndexImpl(configuration(), true, DSL.index(index), true);
+    }
+
+    @Override
+    public org.jooq.CreateIndexStep createUniqueIndexIfNotExists(Index index) {
+        return new CreateIndexImpl(configuration(), true, index, true);
+    }
+
+    @Override
+    public org.jooq.CreateIndexStep createUniqueIndexIfNotExists() {
+        return new CreateIndexImpl(configuration(), true, true);
+    }
+
+    @Override
+    public org.jooq.CreateSchemaFinalStep createSchema(String schema) {
+        return new CreateSchemaImpl(configuration(), DSL.schema(DSL.name(schema)), false);
+    }
+
+    @Override
+    public org.jooq.CreateSchemaFinalStep createSchema(Name schema) {
+        return new CreateSchemaImpl(configuration(), DSL.schema(schema), false);
+    }
+
+    @Override
+    public org.jooq.CreateSchemaFinalStep createSchema(Schema schema) {
+        return new CreateSchemaImpl(configuration(), schema, false);
+    }
+
+    @Override
+    public org.jooq.CreateSchemaFinalStep createSchemaIfNotExists(String schema) {
+        return new CreateSchemaImpl(configuration(), DSL.schema(DSL.name(schema)), true);
+    }
+
+    @Override
+    public org.jooq.CreateSchemaFinalStep createSchemaIfNotExists(Name schema) {
+        return new CreateSchemaImpl(configuration(), DSL.schema(schema), true);
+    }
+
+    @Override
+    public org.jooq.CreateSchemaFinalStep createSchemaIfNotExists(Schema schema) {
+        return new CreateSchemaImpl(configuration(), schema, true);
+    }
+
+    @Override
+    public org.jooq.CreateSequenceFlagsStep createSequence(String sequence) {
+        return new CreateSequenceImpl(configuration(), DSL.sequence(DSL.name(sequence)), false);
+    }
+
+    @Override
+    public org.jooq.CreateSequenceFlagsStep createSequence(Name sequence) {
+        return new CreateSequenceImpl(configuration(), DSL.sequence(sequence), false);
+    }
+
+    @Override
+    public org.jooq.CreateSequenceFlagsStep createSequence(Sequence<?> sequence) {
+        return new CreateSequenceImpl(configuration(), sequence, false);
+    }
+
+    @Override
+    public org.jooq.CreateSequenceFlagsStep createSequenceIfNotExists(String sequence) {
+        return new CreateSequenceImpl(configuration(), DSL.sequence(DSL.name(sequence)), true);
+    }
+
+    @Override
+    public org.jooq.CreateSequenceFlagsStep createSequenceIfNotExists(Name sequence) {
+        return new CreateSequenceImpl(configuration(), DSL.sequence(sequence), true);
+    }
+
+    @Override
+    public org.jooq.CreateSequenceFlagsStep createSequenceIfNotExists(Sequence<?> sequence) {
+        return new CreateSequenceImpl(configuration(), sequence, true);
+    }
+
     @Override
     public org.jooq.DropDatabaseFinalStep dropDatabase(String database) {
         return new DropDatabaseImpl(configuration(), DSL.catalog(DSL.name(database)), false);
diff --git a/jOOQ/src/main/java/org/jooq/impl/Names.java b/jOOQ/src/main/java/org/jooq/impl/Names.java
index 6cddc5a035..f162a1b896 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Names.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Names.java
@@ -261,6 +261,7 @@ final class Names {
     static final Name N_SQL_TSI_YEAR           = unquotedName("sql_tsi_year");
     static final Name N_SQR                    = unquotedName("sqr");
     static final Name N_SQRT                   = unquotedName("sqrt");
+    static final Name N_SQUARE                 = unquotedName("square");
     static final Name N_STANDARD_HASH          = unquotedName("standard_hash");
     static final Name N_STATS_MODE             = unquotedName("stats_mode");
     static final Name N_STDDEV                 = unquotedName("stddev");
diff --git a/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java b/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
index 730fb28a4d..5ac537a56e 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
@@ -278,6 +278,7 @@ import static org.jooq.impl.DSL.space;
 import static org.jooq.impl.DSL.splitPart;
 import static org.jooq.impl.DSL.sql;
 import static org.jooq.impl.DSL.sqrt;
+import static org.jooq.impl.DSL.square;
 import static org.jooq.impl.DSL.stddevPop;
 import static org.jooq.impl.DSL.stddevSamp;
 import static org.jooq.impl.DSL.sum;
@@ -7100,6 +7101,8 @@ final class ParserContext {
                         return sign((Field) parseFieldParenthesised(N));
                     else if (parseFunctionNameIf("SQRT", "SQR"))
                         return sqrt((Field) parseFieldNumericOpParenthesised());
+                    else if (parseFunctionNameIf("SQUARE"))
+                        return square((Field) parseFieldNumericOpParenthesised());
                     else if (parseFunctionNameIf("SINH"))
                         return sinh((Field) parseFieldNumericOpParenthesised());
                     else if (parseFunctionNameIf("SIN"))
diff --git a/pom.xml b/pom.xml
index 7586e12309..998e90c59b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -171,11 +171,6 @@
 
 
 
-
-
-
-
-
             <dependency>
                 <groupId>org.jooq</groupId>
                 <artifactId>jooq-xtend</artifactId>
@@ -664,7 +659,6 @@
 
 
 
-
         <module>jOOQ-xtend</module>