diff --git a/jOOQ/src/main/java/org/jooq/CreateDatabaseFinalStep.java b/jOOQ/src/main/java/org/jooq/CreateDatabaseFinalStep.java index 3486fd390c..be2166c7c7 100644 --- a/jOOQ/src/main/java/org/jooq/CreateDatabaseFinalStep.java +++ b/jOOQ/src/main/java/org/jooq/CreateDatabaseFinalStep.java @@ -37,8 +37,12 @@ */ package org.jooq; +import static org.jooq.SQLDialect.*; + +import java.util.*; + /** - * A {@link Query} that can create databases. + * A step in the construction of the CREATE DATABASE statement. *

*

Referencing XYZ*Step types directly from client code

*

@@ -57,9 +61,7 @@ package org.jooq; *

  • They're less readable
    • *
  • They might have binary incompatible changes between minor releases
    • * - * - * @author Lukas Eder */ +@SuppressWarnings({ "unused" }) public interface CreateDatabaseFinalStep extends DDLQuery { - } diff --git a/jOOQ/src/main/java/org/jooq/DSLContext.java b/jOOQ/src/main/java/org/jooq/DSLContext.java index c167fb8704..514af6fa08 100644 --- a/jOOQ/src/main/java/org/jooq/DSLContext.java +++ b/jOOQ/src/main/java/org/jooq/DSLContext.java @@ -8740,6 +8740,54 @@ public interface DSLContext extends Scope , AutoCloseable { + /** + * The CREATE DATABASE statement. + * + * @see DSL#createDatabase(String) + */ + @Support({ MARIADB, MYSQL, POSTGRES }) + CreateDatabaseFinalStep createDatabase(String database); + + /** + * The CREATE DATABASE statement. + * + * @see DSL#createDatabase(Name) + */ + @Support({ MARIADB, MYSQL, POSTGRES }) + CreateDatabaseFinalStep createDatabase(Name database); + + /** + * The CREATE DATABASE statement. + * + * @see DSL#createDatabase(Catalog) + */ + @Support({ MARIADB, MYSQL, POSTGRES }) + CreateDatabaseFinalStep createDatabase(Catalog database); + + /** + * The CREATE DATABASE IF NOT EXISTS statement. + * + * @see DSL#createDatabaseIfNotExists(String) + */ + @Support({ MARIADB, MYSQL }) + CreateDatabaseFinalStep createDatabaseIfNotExists(String database); + + /** + * The CREATE DATABASE IF NOT EXISTS statement. + * + * @see DSL#createDatabaseIfNotExists(Name) + */ + @Support({ MARIADB, MYSQL }) + CreateDatabaseFinalStep createDatabaseIfNotExists(Name database); + + /** + * The CREATE DATABASE IF NOT EXISTS statement. + * + * @see DSL#createDatabaseIfNotExists(Catalog) + */ + @Support({ MARIADB, MYSQL }) + CreateDatabaseFinalStep createDatabaseIfNotExists(Catalog database); + /** * The CREATE DOMAIN statement. * @@ -8956,54 +9004,6 @@ public interface DSLContext extends Scope , AutoCloseable { @Support({ FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES }) CommentOnIsStep commentOnColumn(Field field); - /** - * Create a new DSL CREATE DATABASE statement. - * - * @see DSL#createDatabase(String) - */ - @Support({ MARIADB, MYSQL, POSTGRES }) - CreateDatabaseFinalStep createDatabase(String database); - - /** - * Create a new DSL CREATE DATABASE statement. - * - * @see DSL#createDatabase(Name) - */ - @Support({ MARIADB, MYSQL, POSTGRES }) - CreateDatabaseFinalStep createDatabase(Name database); - - /** - * Create a new DSL CREATE DATABASE statement. - * - * @see DSL#createDatabase(Catalog) - */ - @Support({ MARIADB, MYSQL, POSTGRES }) - CreateDatabaseFinalStep createDatabase(Catalog database); - - /** - * Create a new DSL CREATE DATABASE statement. - * - * @see DSL#createDatabaseIfNotExists(String) - */ - @Support({ MARIADB, MYSQL }) - CreateDatabaseFinalStep createDatabaseIfNotExists(String database); - - /** - * Create a new DSL CREATE DATABASE statement. - * - * @see DSL#createDatabaseIfNotExists(Name) - */ - @Support({ MARIADB, MYSQL }) - CreateDatabaseFinalStep createDatabaseIfNotExists(Name database); - - /** - * Create a new DSL CREATE DATABASE statement. - * - * @see DSL#createDatabaseIfNotExists(Catalog) - */ - @Support({ MARIADB, MYSQL }) - CreateDatabaseFinalStep createDatabaseIfNotExists(Catalog database); - /** * Create a new DSL CREATE SCHEMA statement. * diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateDatabaseImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateDatabaseImpl.java index 25ad0ffa43..be576683ea 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CreateDatabaseImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/CreateDatabaseImpl.java @@ -37,64 +37,54 @@ */ package org.jooq.impl; -// ... -// ... -// ... -// ... -import static org.jooq.SQLDialect.DERBY; -import static org.jooq.SQLDialect.FIREBIRD; -// ... -// ... -import static org.jooq.SQLDialect.POSTGRES; -// ... -// ... -import static org.jooq.impl.Keywords.K_CREATE; -import static org.jooq.impl.Keywords.K_DATABASE; -import static org.jooq.impl.Keywords.K_IF_NOT_EXISTS; +import static org.jooq.impl.Keywords.*; +import static org.jooq.impl.Tools.BooleanDataKey.*; +import static org.jooq.SQLDialect.*; -import java.util.Set; +import org.jooq.*; +import org.jooq.impl.*; -import org.jooq.Catalog; -import org.jooq.Configuration; -import org.jooq.Context; -import org.jooq.CreateDatabaseFinalStep; -import org.jooq.SQLDialect; +import java.util.*; /** - * @author Lukas Eder + * The CREATE DATABASE IF NOT EXISTS statement. */ -final class CreateDatabaseImpl extends AbstractRowCountQuery implements +@SuppressWarnings({ "hiding", "rawtypes", "unchecked", "unused" }) +final class CreateDatabaseImpl +extends + AbstractRowCountQuery +implements + CreateDatabaseFinalStep +{ + + private static final long serialVersionUID = 1L; - // Cascading interface implementations for CREATE DATABASE behaviour - CreateDatabaseFinalStep { - - - /** - * Generated UID - */ - private static final long serialVersionUID = 8904572826501186329L; - private static final Set NO_SUPPORT_IF_NOT_EXISTS = SQLDialect.supportedBy(DERBY, FIREBIRD, POSTGRES); - - private final Catalog database; - private final boolean ifNotExists; - - CreateDatabaseImpl(Configuration configuration, Catalog database, boolean ifNotExists) { + private final Catalog database; + private final boolean ifNotExists; + + + CreateDatabaseImpl( + Configuration configuration, + Catalog database, + boolean ifNotExists + ) { super(configuration); this.database = database; this.ifNotExists = ifNotExists; } - final Catalog $database() { return database; } - final boolean $ifNotExists() { return ifNotExists; } + // ------------------------------------------------------------------------- + // XXX DSL API + // ------------------------------------------------------------------------- - // ------------------------------------------------------------------------ - // XXX: DSL API - // ------------------------------------------------------------------------ + // ------------------------------------------------------------------------- + // XXX QueryPart API + // ------------------------------------------------------------------------- - // ------------------------------------------------------------------------ - // XXX: QueryPart API - // ------------------------------------------------------------------------ + + + private static final Set NO_SUPPORT_IF_NOT_EXISTS = SQLDialect.supportedBy(DERBY, FIREBIRD, POSTGRES); private final boolean supportsIfNotExists(Context ctx) { return !NO_SUPPORT_IF_NOT_EXISTS.contains(ctx.family()); @@ -120,4 +110,6 @@ final class CreateDatabaseImpl extends AbstractRowCountQuery implements ctx.sql(' ').visit(database); } + + } diff --git a/jOOQ/src/main/java/org/jooq/impl/DSL.java b/jOOQ/src/main/java/org/jooq/impl/DSL.java index e2128487a4..67e5d842ad 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DSL.java +++ b/jOOQ/src/main/java/org/jooq/impl/DSL.java @@ -185,7 +185,6 @@ import org.jooq.ConstraintForeignKeyReferencesStep9; import org.jooq.ConstraintForeignKeyReferencesStepN; import org.jooq.ConstraintTypeStep; // ... -import org.jooq.CreateDatabaseFinalStep; import org.jooq.CreateIndexStep; import org.jooq.CreateSchemaFinalStep; import org.jooq.CreateSequenceFlagsStep; @@ -6825,6 +6824,66 @@ public class DSL { + /** + * The CREATE DATABASE statement. + * + * @see DSLContext#createDatabase(String) + */ + @Support({ MARIADB, MYSQL, POSTGRES }) + public static org.jooq.CreateDatabaseFinalStep createDatabase(String database) { + return dsl().createDatabase(database); + } + + /** + * The CREATE DATABASE statement. + * + * @see DSLContext#createDatabase(Name) + */ + @Support({ MARIADB, MYSQL, POSTGRES }) + public static org.jooq.CreateDatabaseFinalStep createDatabase(Name database) { + return dsl().createDatabase(database); + } + + /** + * The CREATE DATABASE statement. + * + * @see DSLContext#createDatabase(Catalog) + */ + @Support({ MARIADB, MYSQL, POSTGRES }) + public static org.jooq.CreateDatabaseFinalStep createDatabase(Catalog database) { + return dsl().createDatabase(database); + } + + /** + * The CREATE DATABASE IF NOT EXISTS statement. + * + * @see DSLContext#createDatabaseIfNotExists(String) + */ + @Support({ MARIADB, MYSQL }) + public static org.jooq.CreateDatabaseFinalStep createDatabaseIfNotExists(String database) { + return dsl().createDatabaseIfNotExists(database); + } + + /** + * The CREATE DATABASE IF NOT EXISTS statement. + * + * @see DSLContext#createDatabaseIfNotExists(Name) + */ + @Support({ MARIADB, MYSQL }) + public static org.jooq.CreateDatabaseFinalStep createDatabaseIfNotExists(Name database) { + return dsl().createDatabaseIfNotExists(database); + } + + /** + * The CREATE DATABASE IF NOT EXISTS statement. + * + * @see DSLContext#createDatabaseIfNotExists(Catalog) + */ + @Support({ MARIADB, MYSQL }) + public static org.jooq.CreateDatabaseFinalStep createDatabaseIfNotExists(Catalog database) { + return dsl().createDatabaseIfNotExists(database); + } + /** * The CREATE DOMAIN statement. * @@ -7007,66 +7066,6 @@ public class DSL { - /** - * Create a new DSL CREATE DATABASE statement. - * - * @see DSLContext#createDatabase(String) - */ - @Support({ MARIADB, MYSQL, POSTGRES }) - public static CreateDatabaseFinalStep createDatabase(String database) { - return dsl().createDatabase(database); - } - - /** - * Create a new DSL CREATE DATABASE statement. - * - * @see DSLContext#createDatabase(Name) - */ - @Support({ MARIADB, MYSQL, POSTGRES }) - public static CreateDatabaseFinalStep createDatabase(Name database) { - return dsl().createDatabase(database); - } - - /** - * Create a new DSL CREATE DATABASE statement. - * - * @see DSLContext#createDatabase(Catalog) - */ - @Support({ MARIADB, MYSQL, POSTGRES }) - public static CreateDatabaseFinalStep createDatabase(Catalog database) { - return dsl().createDatabase(database); - } - - /** - * Create a new DSL CREATE DATABASE statement. - * - * @see DSLContext#createDatabaseIfNotExists(String) - */ - @Support({ MARIADB, MYSQL }) - public static CreateDatabaseFinalStep createDatabaseIfNotExists(String database) { - return dsl().createDatabaseIfNotExists(database); - } - - /** - * Create a new DSL CREATE DATABASE statement. - * - * @see DSLContext#createDatabaseIfNotExists(Name) - */ - @Support({ MARIADB, MYSQL }) - public static CreateDatabaseFinalStep createDatabaseIfNotExists(Name database) { - return dsl().createDatabaseIfNotExists(database); - } - - /** - * Create a new DSL CREATE DATABASE statement. - * - * @see DSLContext#createDatabaseIfNotExists(Catalog) - */ - @Support({ MARIADB, MYSQL }) - public static CreateDatabaseFinalStep createDatabaseIfNotExists(Catalog database) { - return dsl().createDatabaseIfNotExists(database); - } - /** * Create a new DSL CREATE SCHEMA statement. * @@ -10199,6 +10198,24 @@ public class DSL { return new SchemaImpl(name); } + /** + * Create a qualified catalog, given its catalog name. + *

    + * This constructs a catalog reference given the catalog's qualified name. + *

    + * Example: 

    +     * // This catalog...
+     * catalog(name("MY_CATALOG"));
+     *
+     * // ... will render this SQL by default, using the SQL Server dialect
+     * [MY_CATALOG]
+     *
    + */ + @Support + public static Catalog catalog(String name) { + return catalog(name(name)); + } + /** * Create a qualified catalog, given its catalog name. *

    diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java b/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java index eb13b72df7..f376e32b9a 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java +++ b/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java @@ -115,7 +115,6 @@ import org.jooq.ConnectionProvider; import org.jooq.ConnectionRunnable; import org.jooq.ContextTransactionalCallable; import org.jooq.ContextTransactionalRunnable; -import org.jooq.CreateDatabaseFinalStep; import org.jooq.CreateIndexStep; import org.jooq.CreateSchemaFinalStep; import org.jooq.CreateSequenceFlagsStep; @@ -2922,6 +2921,36 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri + @Override + public org.jooq.CreateDatabaseFinalStep createDatabase(String database) { + return new CreateDatabaseImpl(configuration(), DSL.catalog(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(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(domain), false); @@ -3309,36 +3338,6 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri } - @Override - public CreateDatabaseFinalStep createDatabase(String database) { - return createDatabase(name(database)); - } - - @Override - public CreateDatabaseFinalStep createDatabase(Name database) { - return createDatabase(catalog(database)); - } - - @Override - public CreateDatabaseFinalStep createDatabase(Catalog database) { - return new CreateDatabaseImpl(configuration(), database, false); - } - - @Override - public CreateDatabaseFinalStep createDatabaseIfNotExists(String database) { - return createDatabaseIfNotExists(name(database)); - } - - @Override - public CreateDatabaseFinalStep createDatabaseIfNotExists(Name database) { - return createDatabaseIfNotExists(catalog(database)); - } - - @Override - public CreateDatabaseFinalStep createDatabaseIfNotExists(Catalog database) { - return new CreateDatabaseImpl(configuration(), database, true); - } - @Override public CreateSchemaFinalStep createSchema(String schema) { return createSchema(name(schema));