diff --git a/flyway-commandline/src/main/assembly/flyway.conf b/flyway-commandline/src/main/assembly/flyway.conf index 2c33c58dec..94aa5c3eb1 100644 --- a/flyway-commandline/src/main/assembly/flyway.conf +++ b/flyway-commandline/src/main/assembly/flyway.conf @@ -58,11 +58,13 @@ flyway.url= # flyway.initSql= # Comma-separated list of schemas managed by Flyway. These schema names are case-sensitive. -# (default: The default schema for the datasource connection) # Consequences: +# - Flyway will automatically attempt to create all these schemas, unless the first one already exists. # - The first schema in the list will be automatically set as the default one during the migration. # - The first schema in the list will also be the one containing the schema history table. # - The schemas will be cleaned in the order of this list. +# - If Flyway created them, the schemas themselves will as be dropped when cleaning. +# (default: The default schema for the database connection) # flyway.schemas= # Name of Flyway's schema history table (default: flyway_schema_history) diff --git a/flyway-core/src/main/java/org/flywaydb/core/Flyway.java b/flyway-core/src/main/java/org/flywaydb/core/Flyway.java index 3bb0249565..6847004652 100644 --- a/flyway-core/src/main/java/org/flywaydb/core/Flyway.java +++ b/flyway-core/src/main/java/org/flywaydb/core/Flyway.java @@ -841,12 +841,14 @@ public void setEncoding(String encoding) { } /** - * Sets the schemas managed by Flyway. These schema names are case-sensitive. (default: The default schema for the datasource connection) + * Sets the schemas managed by Flyway. These schema names are case-sensitive. (default: The default schema for the database connection) *

Consequences:

* * * @param schemas The schemas managed by Flyway. May not be {@code null}. Must contain at least one element. diff --git a/flyway-core/src/main/java/org/flywaydb/core/api/configuration/ClassicConfiguration.java b/flyway-core/src/main/java/org/flywaydb/core/api/configuration/ClassicConfiguration.java index 0bde92e0c8..356cf6e3f9 100644 --- a/flyway-core/src/main/java/org/flywaydb/core/api/configuration/ClassicConfiguration.java +++ b/flyway-core/src/main/java/org/flywaydb/core/api/configuration/ClassicConfiguration.java @@ -102,12 +102,14 @@ public class ClassicConfiguration implements Configuration { private Charset encoding = Charset.forName("UTF-8"); /** - * The schemas managed by Flyway. These schema names are case-sensitive. (default: The default schema for the datasource connection) + * The schemas managed by Flyway. These schema names are case-sensitive. *

Consequences:

* */ private String[] schemaNames = {}; @@ -977,12 +979,14 @@ public void setEncodingAsString(String encoding) { } /** - * Sets the schemas managed by Flyway. These schema names are case-sensitive. (default: The default schema for the datasource connection) + * Sets the schemas managed by Flyway. These schema names are case-sensitive. (default: The default schema for the database connection) *

Consequences:

* * * @param schemas The schemas managed by Flyway. May not be {@code null}. Must contain at least one element. diff --git a/flyway-core/src/main/java/org/flywaydb/core/api/configuration/Configuration.java b/flyway-core/src/main/java/org/flywaydb/core/api/configuration/Configuration.java index 77cf5f799f..0b9e4a0c9d 100644 --- a/flyway-core/src/main/java/org/flywaydb/core/api/configuration/Configuration.java +++ b/flyway-core/src/main/java/org/flywaydb/core/api/configuration/Configuration.java @@ -200,15 +200,17 @@ public interface Configuration { String getTable(); /** - * Retrieves the schemas managed by Flyway. These schema names are case-sensitive. + * Retrieves the schemas managed by Flyway. These schema names are case-sensitive. *

Consequences:

* * - * @return The schemas managed by Flyway. (default: The default schema for the datasource connection) + * @return The schemas managed by Flyway. (default: The default schema for the database connection) */ String[] getSchemas(); diff --git a/flyway-core/src/main/java/org/flywaydb/core/api/configuration/FluentConfiguration.java b/flyway-core/src/main/java/org/flywaydb/core/api/configuration/FluentConfiguration.java index 36a93d91aa..c6e385e0bb 100644 --- a/flyway-core/src/main/java/org/flywaydb/core/api/configuration/FluentConfiguration.java +++ b/flyway-core/src/main/java/org/flywaydb/core/api/configuration/FluentConfiguration.java @@ -559,12 +559,14 @@ public FluentConfiguration encoding(Charset encoding) { } /** - * Sets the schemas managed by Flyway. These schema names are case-sensitive. (default: The default schema for the datasource connection) + * Sets the schemas managed by Flyway. These schema names are case-sensitive. (default: The default schema for the database connection) *

Consequences:

* * * @param schemas The schemas managed by Flyway. May not be {@code null}. Must contain at least one element. diff --git a/flyway-gradle-plugin/src/main/java/org/flywaydb/gradle/FlywayExtension.java b/flyway-gradle-plugin/src/main/java/org/flywaydb/gradle/FlywayExtension.java index fa4a0c8d72..46222d82cb 100644 --- a/flyway-gradle-plugin/src/main/java/org/flywaydb/gradle/FlywayExtension.java +++ b/flyway-gradle-plugin/src/main/java/org/flywaydb/gradle/FlywayExtension.java @@ -67,7 +67,16 @@ public class FlywayExtension { public String table; /** - * The case-sensitive list of schemas managed by Flyway + * The schemas managed by Flyway. These schema names are case-sensitive. (default: The default schema for the database connection) + *

Consequences:

+ * + *

Also configurable with Gradle or System Property: ${flyway.schemas} (comma-separated list)

*/ public String[] schemas; diff --git a/flyway-gradle-plugin/src/main/java/org/flywaydb/gradle/task/AbstractFlywayTask.java b/flyway-gradle-plugin/src/main/java/org/flywaydb/gradle/task/AbstractFlywayTask.java index 61d5864ae9..24fbf6fb69 100644 --- a/flyway-gradle-plugin/src/main/java/org/flywaydb/gradle/task/AbstractFlywayTask.java +++ b/flyway-gradle-plugin/src/main/java/org/flywaydb/gradle/task/AbstractFlywayTask.java @@ -108,7 +108,16 @@ public abstract class AbstractFlywayTask extends DefaultTask { public String table; /** - * The case-sensitive list of schemas managed by Flyway + * The schemas managed by Flyway. These schema names are case-sensitive. (default: The default schema for the database connection) + *

Consequences:

+ * + *

Also configurable with Gradle or System Property: ${flyway.schemas} (comma-separated list)

*/ public String[] schemas; diff --git a/flyway-maven-plugin/src/main/java/org/flywaydb/maven/AbstractFlywayMojo.java b/flyway-maven-plugin/src/main/java/org/flywaydb/maven/AbstractFlywayMojo.java index ae03f371d7..60c65d5158 100644 --- a/flyway-maven-plugin/src/main/java/org/flywaydb/maven/AbstractFlywayMojo.java +++ b/flyway-maven-plugin/src/main/java/org/flywaydb/maven/AbstractFlywayMojo.java @@ -116,13 +116,14 @@ abstract class AbstractFlywayMojo extends AbstractMojo { private String initSql; /** - * List of the schemas managed by Flyway. These schema names are case-sensitive.
- * (default: The default schema for the datasource connection) + * The schemas managed by Flyway. These schema names are case-sensitive. (default: The default schema for the database connection) *

Consequences:

* *

Also configurable with Maven or System Property: ${flyway.schemas} (comma-separated list)

*/