diff --git a/jOOQ/src/main/java/org/jooq/AlterDatabaseFinalStep.java b/jOOQ/src/main/java/org/jooq/AlterDatabaseFinalStep.java
index 314c27abf1..c213356bb0 100644
--- a/jOOQ/src/main/java/org/jooq/AlterDatabaseFinalStep.java
+++ b/jOOQ/src/main/java/org/jooq/AlterDatabaseFinalStep.java
@@ -37,8 +37,12 @@
*/
package org.jooq;
+import static org.jooq.SQLDialect.*;
+
+import java.util.*;
+
/**
- * The final step in the DROP SCHEMA DSL.
+ * A step in the construction of the ALTER DATABASE statement.
*
*
XYZ*Step types directly from client code@@ -57,9 +61,7 @@ package org.jooq; *
ALTER DATABASE DSL used to specify
- * ALTER behaviour.
+ * A step in the construction of the ALTER DATABASE statement.
* *
XYZ*Step types directly from client code@@ -62,30 +61,25 @@ import static org.jooq.SQLDialect.POSTGRES; *
RENAME TO clause to the ALTER DATABASE
- * statement.
+ * Add the RENAME TO clause to the ALTER DATABASE statement.
*/
@Support({ POSTGRES })
- AlterDatabaseFinalStep renameTo(Catalog newName);
+ AlterDatabaseFinalStep renameTo(String renameTo);
/**
- * Add a RENAME TO clause to the ALTER DATABASE
- * statement.
+ * Add the RENAME TO clause to the ALTER DATABASE statement.
*/
@Support({ POSTGRES })
- AlterDatabaseFinalStep renameTo(Name newName);
+ AlterDatabaseFinalStep renameTo(Name renameTo);
/**
- * Add a RENAME TO clause to the ALTER DATABASE
- * statement.
+ * Add the RENAME TO clause to the ALTER DATABASE statement.
*/
@Support({ POSTGRES })
- AlterDatabaseFinalStep renameTo(String newName);
-
+ AlterDatabaseFinalStep renameTo(Catalog renameTo);
}
diff --git a/jOOQ/src/main/java/org/jooq/AlterDomainStep.java b/jOOQ/src/main/java/org/jooq/AlterDomainStep.java
index 127a6f54e8..19a0bc3b18 100644
--- a/jOOQ/src/main/java/org/jooq/AlterDomainStep.java
+++ b/jOOQ/src/main/java/org/jooq/AlterDomainStep.java
@@ -72,121 +72,121 @@ public interface AlterDomainStepDROPDEFAULT clause to the ALTER DOMAIN statement.
+ * Add the DROP DEFAULT clause to the ALTER DOMAIN statement.
*/
@Support({ POSTGRES })
AlterDomainFinalStep dropDefault();
/**
- * Add the SETNOTNULL clause to the ALTER DOMAIN statement.
+ * Add the SET NOT NULL clause to the ALTER DOMAIN statement.
*/
@Support({ POSTGRES })
AlterDomainFinalStep setNotNull();
/**
- * Add the DROPNOTNULL clause to the ALTER DOMAIN statement.
+ * Add the DROP NOT NULL clause to the ALTER DOMAIN statement.
*/
@Support({ POSTGRES })
AlterDomainFinalStep dropNotNull();
/**
- * Add the DROPCONSTRAINT clause to the ALTER DOMAIN statement.
+ * Add the DROP CONSTRAINT clause to the ALTER DOMAIN statement.
*/
@Support({ POSTGRES })
AlterDomainDropConstraintCascadeStep dropConstraint(String dropConstraint);
/**
- * Add the DROPCONSTRAINT clause to the ALTER DOMAIN statement.
+ * Add the DROP CONSTRAINT clause to the ALTER DOMAIN statement.
*/
@Support({ POSTGRES })
AlterDomainDropConstraintCascadeStep dropConstraint(Name dropConstraint);
/**
- * Add the DROPCONSTRAINT clause to the ALTER DOMAIN statement.
+ * Add the DROP CONSTRAINT clause to the ALTER DOMAIN statement.
*/
@Support({ POSTGRES })
AlterDomainDropConstraintCascadeStep dropConstraint(Constraint dropConstraint);
/**
- * Add the DROPCONSTRAINTIFEXISTS clause to the ALTER DOMAIN statement.
+ * Add the DROP CONSTRAINT IF EXISTS clause to the ALTER DOMAIN statement.
*/
@Support({ POSTGRES })
AlterDomainDropConstraintCascadeStep dropConstraintIfExists(String dropConstraint);
/**
- * Add the DROPCONSTRAINTIFEXISTS clause to the ALTER DOMAIN statement.
+ * Add the DROP CONSTRAINT IF EXISTS clause to the ALTER DOMAIN statement.
*/
@Support({ POSTGRES })
AlterDomainDropConstraintCascadeStep dropConstraintIfExists(Name dropConstraint);
/**
- * Add the DROPCONSTRAINTIFEXISTS clause to the ALTER DOMAIN statement.
+ * Add the DROP CONSTRAINT IF EXISTS clause to the ALTER DOMAIN statement.
*/
@Support({ POSTGRES })
AlterDomainDropConstraintCascadeStep dropConstraintIfExists(Constraint dropConstraint);
/**
- * Add the RENAMETO clause to the ALTER DOMAIN statement.
+ * Add the RENAME TO clause to the ALTER DOMAIN statement.
*/
@Support({ POSTGRES })
AlterDomainFinalStep renameTo(String renameTo);
/**
- * Add the RENAMETO clause to the ALTER DOMAIN statement.
+ * Add the RENAME TO clause to the ALTER DOMAIN statement.
*/
@Support({ POSTGRES })
AlterDomainFinalStep renameTo(Name renameTo);
/**
- * Add the RENAMETO clause to the ALTER DOMAIN statement.
+ * Add the RENAME TO clause to the ALTER DOMAIN statement.
*/
@Support({ POSTGRES })
AlterDomainFinalStep renameTo(Domain> renameTo);
/**
- * Add the RENAMECONSTRAINT clause to the ALTER DOMAIN statement.
+ * Add the RENAME CONSTRAINT clause to the ALTER DOMAIN statement.
*/
@Support({ POSTGRES })
AlterDomainRenameConstraintStep renameConstraint(String renameConstraint);
/**
- * Add the RENAMECONSTRAINT clause to the ALTER DOMAIN statement.
+ * Add the RENAME CONSTRAINT clause to the ALTER DOMAIN statement.
*/
@Support({ POSTGRES })
AlterDomainRenameConstraintStep renameConstraint(Name renameConstraint);
/**
- * Add the RENAMECONSTRAINT clause to the ALTER DOMAIN statement.
+ * Add the RENAME CONSTRAINT clause to the ALTER DOMAIN statement.
*/
@Support({ POSTGRES })
AlterDomainRenameConstraintStep renameConstraint(Constraint renameConstraint);
/**
- * Add the RENAMECONSTRAINTIFEXISTS clause to the ALTER DOMAIN statement.
+ * Add the RENAME CONSTRAINT IF EXISTS clause to the ALTER DOMAIN statement.
*/
@Support({ POSTGRES })
AlterDomainRenameConstraintStep renameConstraintIfExists(String renameConstraint);
/**
- * Add the RENAMECONSTRAINTIFEXISTS clause to the ALTER DOMAIN statement.
+ * Add the RENAME CONSTRAINT IF EXISTS clause to the ALTER DOMAIN statement.
*/
@Support({ POSTGRES })
AlterDomainRenameConstraintStep renameConstraintIfExists(Name renameConstraint);
/**
- * Add the RENAMECONSTRAINTIFEXISTS clause to the ALTER DOMAIN statement.
+ * Add the RENAME CONSTRAINT IF EXISTS clause to the ALTER DOMAIN statement.
*/
@Support({ POSTGRES })
AlterDomainRenameConstraintStep renameConstraintIfExists(Constraint renameConstraint);
/**
- * Add the SETDEFAULT clause to the ALTER DOMAIN statement.
+ * Add the SET DEFAULT clause to the ALTER DOMAIN statement.
*/
@Support({ POSTGRES })
AlterDomainFinalStep setDefault(T setDefault);
/**
- * Add the SETDEFAULT clause to the ALTER DOMAIN statement.
+ * Add the SET DEFAULT clause to the ALTER DOMAIN statement.
*/
@Support({ POSTGRES })
AlterDomainFinalStep setDefault(FieldAS[T] clause to the CREATE DOMAIN statement.
+ * Add the AS clause to the CREATE DOMAIN statement.
*/
@Support({ H2, POSTGRES })
AS[T] clause to the CREATE DOMAIN statement.
+ * Add the AS clause to the CREATE DOMAIN statement.
*/
@Support({ H2, POSTGRES })
ALTER DATABASE statement.
+ *
+ * @see DSL#alterDatabase(String)
+ */
+ @Support({ POSTGRES })
+ AlterDatabaseStep alterDatabase(String database);
+
+ /**
+ * The ALTER DATABASE statement.
+ *
+ * @see DSL#alterDatabase(Name)
+ */
+ @Support({ POSTGRES })
+ AlterDatabaseStep alterDatabase(Name database);
+
+ /**
+ * The ALTER DATABASE statement.
+ *
+ * @see DSL#alterDatabase(Catalog)
+ */
+ @Support({ POSTGRES })
+ AlterDatabaseStep alterDatabase(Catalog database);
+
+ /**
+ * The ALTER DATABASE IF EXISTS statement.
+ *
+ * @see DSL#alterDatabaseIfExists(String)
+ */
+ @Support({ POSTGRES })
+ AlterDatabaseStep alterDatabaseIfExists(String database);
+
+ /**
+ * The ALTER DATABASE IF EXISTS statement.
+ *
+ * @see DSL#alterDatabaseIfExists(Name)
+ */
+ @Support({ POSTGRES })
+ AlterDatabaseStep alterDatabaseIfExists(Name database);
+
+ /**
+ * The ALTER DATABASE IF EXISTS statement.
+ *
+ * @see DSL#alterDatabaseIfExists(Catalog)
+ */
+ @Support({ POSTGRES })
+ AlterDatabaseStep alterDatabaseIfExists(Catalog database);
+
/**
* The ALTER DOMAIN statement.
*
@@ -9942,54 +9990,6 @@ public interface DSLContext extends Scope , AutoCloseable {
@Support({ H2, MARIADB, POSTGRES })
AlterTableStep alterTableIfExists(Table> table);
- /**
- * Create a new DSL ALTER DATABASE statement.
- *
- * @see DSL#alterDatabase(String)
- */
- @Support({ POSTGRES })
- AlterDatabaseStep alterDatabase(String database);
-
- /**
- * Create a new DSL ALTER DATABASE statement.
- *
- * @see DSL#alterDatabase(Name)
- */
- @Support({ POSTGRES })
- AlterDatabaseStep alterDatabase(Name database);
-
- /**
- * Create a new DSL ALTER DATABASE statement.
- *
- * @see DSL#alterDatabase(Catalog)
- */
- @Support({ POSTGRES })
- AlterDatabaseStep alterDatabase(Catalog database);
-
- /**
- * Create a new DSL ALTER DATABASE statement.
- *
- * @see DSL#alterDatabaseIfExists(String)
- */
- @Support({ POSTGRES })
- AlterDatabaseStep alterDatabaseIfExists(String database);
-
- /**
- * Create a new DSL ALTER DATABASE statement.
- *
- * @see DSL#alterDatabaseIfExists(Name)
- */
- @Support({ POSTGRES })
- AlterDatabaseStep alterDatabaseIfExists(Name database);
-
- /**
- * Create a new DSL ALTER DATABASE statement.
- *
- * @see DSL#alterDatabaseIfExists(Catalog)
- */
- @Support({ POSTGRES })
- AlterDatabaseStep alterDatabaseIfExists(Catalog database);
-
/**
* Create a new DSL ALTER SCHEMA statement.
*
diff --git a/jOOQ/src/main/java/org/jooq/impl/AlterDatabaseImpl.java b/jOOQ/src/main/java/org/jooq/impl/AlterDatabaseImpl.java
index 2fd3dd2a10..929392f482 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AlterDatabaseImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AlterDatabaseImpl.java
@@ -37,90 +37,95 @@
*/
package org.jooq.impl;
-// ...
-// ...
-import static org.jooq.SQLDialect.POSTGRES;
-import static org.jooq.impl.DSL.name;
-import static org.jooq.impl.Keywords.K_ALTER;
-import static org.jooq.impl.Keywords.K_DATABASE;
-import static org.jooq.impl.Keywords.K_IF_EXISTS;
-import static org.jooq.impl.Keywords.K_RENAME;
-import static org.jooq.impl.Keywords.K_RENAME_TO;
-import static org.jooq.impl.Keywords.K_TO;
+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.AlterDatabaseFinalStep;
-import org.jooq.AlterDatabaseStep;
-import org.jooq.Catalog;
-import org.jooq.Configuration;
-import org.jooq.Context;
-import org.jooq.Name;
-// ...
-import org.jooq.SQLDialect;
+import java.util.*;
/**
- * @author Lukas Eder
+ * The ALTER DATABASE IF EXISTS statement.
*/
-final class AlterDatabaseImpl extends AbstractRowCountQuery implements
-
- // Cascading interface implementations for ALTER DATABASE behaviour
+@SuppressWarnings({ "hiding", "rawtypes", "unchecked", "unused" })
+final class AlterDatabaseImpl
+extends
+ AbstractRowCountQuery
+implements
AlterDatabaseStep,
- AlterDatabaseFinalStep {
+ AlterDatabaseFinalStep
+{
+
+ private static final long serialVersionUID = 1L;
+
+ private final Catalog database;
+ private final boolean ifExists;
+ private final Catalog renameTo;
+
+ AlterDatabaseImpl(
+ Configuration configuration,
+ Catalog database,
+ boolean ifExists
+ ) {
+ this(
+ configuration,
+ database,
+ ifExists,
+ null
+ );
+ }
+
+ AlterDatabaseImpl(
+ Configuration configuration,
+ Catalog database,
+ boolean ifExists,
+ Catalog renameTo
+ ) {
+ super(configuration);
+
+ this.database = database;
+ this.ifExists = ifExists;
+ this.renameTo = renameTo;
+ }
+
+ // -------------------------------------------------------------------------
+ // XXX DSL API
+ // -------------------------------------------------------------------------
+
+ @Override
+ public final AlterDatabaseImpl renameTo(String renameTo) {
+ return renameTo(DSL.catalog(renameTo));
+ }
+
+ @Override
+ public final AlterDatabaseImpl renameTo(Name renameTo) {
+ return renameTo(DSL.catalog(renameTo));
+ }
+
+ @Override
+ public final AlterDatabaseImpl renameTo(Catalog renameTo) {
+ return new AlterDatabaseImpl(
+ configuration(),
+ this.database,
+ this.ifExists,
+ renameTo
+ );
+ }
+
+ // -------------------------------------------------------------------------
+ // XXX QueryPart API
+ // -------------------------------------------------------------------------
+
+
- /**
- * Generated UID
- */
- private static final long serialVersionUID = 8904572826501186329L;
private static final SetALTER DATABASE statement.
+ *
+ * @see DSLContext#alterDatabase(String)
+ */
+ @Support({ POSTGRES })
+ public static org.jooq.AlterDatabaseStep alterDatabase(String database) {
+ return dsl().alterDatabase(database);
+ }
+
+ /**
+ * The ALTER DATABASE statement.
+ *
+ * @see DSLContext#alterDatabase(Name)
+ */
+ @Support({ POSTGRES })
+ public static org.jooq.AlterDatabaseStep alterDatabase(Name database) {
+ return dsl().alterDatabase(database);
+ }
+
+ /**
+ * The ALTER DATABASE statement.
+ *
+ * @see DSLContext#alterDatabase(Catalog)
+ */
+ @Support({ POSTGRES })
+ public static org.jooq.AlterDatabaseStep alterDatabase(Catalog database) {
+ return dsl().alterDatabase(database);
+ }
+
+ /**
+ * The ALTER DATABASE IF EXISTS statement.
+ *
+ * @see DSLContext#alterDatabaseIfExists(String)
+ */
+ @Support({ POSTGRES })
+ public static org.jooq.AlterDatabaseStep alterDatabaseIfExists(String database) {
+ return dsl().alterDatabaseIfExists(database);
+ }
+
+ /**
+ * The ALTER DATABASE IF EXISTS statement.
+ *
+ * @see DSLContext#alterDatabaseIfExists(Name)
+ */
+ @Support({ POSTGRES })
+ public static org.jooq.AlterDatabaseStep alterDatabaseIfExists(Name database) {
+ return dsl().alterDatabaseIfExists(database);
+ }
+
+ /**
+ * The ALTER DATABASE IF EXISTS statement.
+ *
+ * @see DSLContext#alterDatabaseIfExists(Catalog)
+ */
+ @Support({ POSTGRES })
+ public static org.jooq.AlterDatabaseStep alterDatabaseIfExists(Catalog database) {
+ return dsl().alterDatabaseIfExists(database);
+ }
+
/**
* The ALTER DOMAIN statement.
*
@@ -8012,66 +8071,6 @@ public class DSL {
return dsl().alterTableIfExists(table);
}
- /**
- * Create a new DSL ALTER DATABASE statement.
- *
- * @see DSLContext#alterDatabase(String)
- */
- @Support({ POSTGRES })
- public static AlterDatabaseStep alterDatabase(String database) {
- return dsl().alterDatabase(database);
- }
-
- /**
- * Create a new DSL ALTER DATABASE statement.
- *
- * @see DSLContext#alterDatabase(Name)
- */
- @Support({ POSTGRES })
- public static AlterDatabaseStep alterDatabase(Name database) {
- return dsl().alterDatabase(database);
- }
-
- /**
- * Create a new DSL ALTER DATABASE statement.
- *
- * @see DSLContext#alterDatabase(Catalog)
- */
- @Support({ POSTGRES })
- public static AlterDatabaseStep alterDatabase(Catalog database) {
- return dsl().alterDatabase(database);
- }
-
- /**
- * Create a new DSL ALTER DATABASE statement.
- *
- * @see DSLContext#alterDatabaseIfExists(String)
- */
- @Support({ POSTGRES })
- public static AlterDatabaseStep alterDatabaseIfExists(String database) {
- return dsl().alterDatabaseIfExists(database);
- }
-
- /**
- * Create a new DSL ALTER DATABASE statement.
- *
- * @see DSLContext#alterDatabaseIfExists(Name)
- */
- @Support({ POSTGRES })
- public static AlterDatabaseStep alterDatabaseIfExists(Name database) {
- return dsl().alterDatabaseIfExists(database);
- }
-
- /**
- * Create a new DSL ALTER DATABASE statement.
- *
- * @see DSLContext#alterDatabaseIfExists(Catalog)
- */
- @Support({ POSTGRES })
- public static AlterDatabaseStep alterDatabaseIfExists(Catalog database) {
- return dsl().alterDatabaseIfExists(database);
- }
-
/**
* Create a new DSL ALTER SCHEMA statement.
*
diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java b/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java
index f376e32b9a..f49765b863 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java
@@ -92,7 +92,6 @@ import javax.xml.parsers.ParserConfigurationException;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
-import org.jooq.AlterDatabaseStep;
import org.jooq.AlterIndexOnStep;
import org.jooq.AlterIndexStep;
import org.jooq.AlterSchemaStep;
@@ -2981,6 +2980,36 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri
return new CreateDomainImpl<>(configuration(), domain, true);
}
+ @Override
+ public org.jooq.AlterDatabaseStep alterDatabase(String database) {
+ return new AlterDatabaseImpl(configuration(), DSL.catalog(database), false);
+ }
+
+ @Override
+ public org.jooq.AlterDatabaseStep alterDatabase(Name database) {
+ return new AlterDatabaseImpl(configuration(), DSL.catalog(database), false);
+ }
+
+ @Override
+ public org.jooq.AlterDatabaseStep alterDatabase(Catalog database) {
+ return new AlterDatabaseImpl(configuration(), database, false);
+ }
+
+ @Override
+ public org.jooq.AlterDatabaseStep alterDatabaseIfExists(String database) {
+ return new AlterDatabaseImpl(configuration(), DSL.catalog(database), true);
+ }
+
+ @Override
+ public org.jooq.AlterDatabaseStep alterDatabaseIfExists(Name database) {
+ return new AlterDatabaseImpl(configuration(), DSL.catalog(database), true);
+ }
+
+ @Override
+ public org.jooq.AlterDatabaseStep alterDatabaseIfExists(Catalog database) {
+ return new AlterDatabaseImpl(configuration(), database, true);
+ }
+
@Override
public