From 4924e03df5cfff3cc228f4969cfc34e32f7278aa Mon Sep 17 00:00:00 2001 From: mattbertolini Date: Sun, 9 Feb 2014 12:43:40 -0500 Subject: [PATCH 1/3] Adding the outputDefaultSchema flag to the ant task. This is to maintain parity with the maven plugin and the command line client. This fixes CORE-1758. --- .../integration/ant/BaseLiquibaseTask.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/liquibase-core/src/main/java/liquibase/integration/ant/BaseLiquibaseTask.java b/liquibase-core/src/main/java/liquibase/integration/ant/BaseLiquibaseTask.java index 332a446c3a..47c1d84710 100644 --- a/liquibase-core/src/main/java/liquibase/integration/ant/BaseLiquibaseTask.java +++ b/liquibase-core/src/main/java/liquibase/integration/ant/BaseLiquibaseTask.java @@ -52,6 +52,7 @@ public abstract class BaseLiquibaseTask extends Task { private String databaseChangeLogTableName; private String databaseChangeLogLockTableName; private String databaseChangeLogObjectsTablespace; + private boolean outputDefaultSchema = true; // Default based on setting in AbstractJdbcDatabase private Map changeLogProperties = new HashMap(); @@ -265,6 +266,7 @@ public URLClassLoader run() { database = DatabaseFactory.getInstance().findCorrectDatabaseImplementation(new JdbcConnection(connection)); database.setDefaultCatalogName(defaultCatalogName); database.setDefaultSchemaName(defaultSchemaName); + database.setOutputDefaultSchema(isOutputDefaultSchema()); if (getDatabaseChangeLogTableName() != null) database.setDatabaseChangeLogTableName(getDatabaseChangeLogTableName()); @@ -401,6 +403,19 @@ public void setDatabaseChangeLogObjectsTablespace(String tablespaceName) { this.databaseChangeLogObjectsTablespace = tablespaceName; } + public boolean isOutputDefaultSchema() { + return outputDefaultSchema; + } + + /** + * If not set, defaults to true. + * + * @param outputDefaultSchema True to output the default schema. + */ + public void setOutputDefaultSchema(boolean outputDefaultSchema) { + this.outputDefaultSchema = outputDefaultSchema; + } + public String getLogLevel() { return LogFactory.getLogger().getLogLevel().name(); } From 4ad7b8987fbb7d08c42e77f25f9ab3e07ebc1be2 Mon Sep 17 00:00:00 2001 From: mattbertolini Date: Sun, 9 Feb 2014 16:15:02 -0500 Subject: [PATCH 2/3] Adding the outputDefaultCatalog flag to the ant task. --- .../integration/ant/BaseLiquibaseTask.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/liquibase-core/src/main/java/liquibase/integration/ant/BaseLiquibaseTask.java b/liquibase-core/src/main/java/liquibase/integration/ant/BaseLiquibaseTask.java index 47c1d84710..b59297ffc9 100644 --- a/liquibase-core/src/main/java/liquibase/integration/ant/BaseLiquibaseTask.java +++ b/liquibase-core/src/main/java/liquibase/integration/ant/BaseLiquibaseTask.java @@ -53,6 +53,7 @@ public abstract class BaseLiquibaseTask extends Task { private String databaseChangeLogLockTableName; private String databaseChangeLogObjectsTablespace; private boolean outputDefaultSchema = true; // Default based on setting in AbstractJdbcDatabase + private boolean outputDefaultCatalog = true; private Map changeLogProperties = new HashMap(); @@ -267,6 +268,7 @@ public URLClassLoader run() { database.setDefaultCatalogName(defaultCatalogName); database.setDefaultSchemaName(defaultSchemaName); database.setOutputDefaultSchema(isOutputDefaultSchema()); + database.setOutputDefaultCatalog(isOutputDefaultCatalog()); if (getDatabaseChangeLogTableName() != null) database.setDatabaseChangeLogTableName(getDatabaseChangeLogTableName()); @@ -420,6 +422,19 @@ public String getLogLevel() { return LogFactory.getLogger().getLogLevel().name(); } + public boolean isOutputDefaultCatalog() { + return outputDefaultCatalog; + } + + /** + * If not set, defaults to true + * + * @param outputDefaultCatalog True to output the default catalog. + */ + public void setOutputDefaultCatalog(boolean outputDefaultCatalog) { + this.outputDefaultCatalog = outputDefaultCatalog; + } + public void setLogLevel(String level) { LogFactory.getLogger().setLogLevel(level); } From 6c2b9136df0c2f7cf36a749c193a10c2facc8546 Mon Sep 17 00:00:00 2001 From: mattbertolini Date: Sun, 9 Feb 2014 16:15:33 -0500 Subject: [PATCH 3/3] Minor method ordering/organization. --- .../java/liquibase/integration/ant/BaseLiquibaseTask.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/liquibase-core/src/main/java/liquibase/integration/ant/BaseLiquibaseTask.java b/liquibase-core/src/main/java/liquibase/integration/ant/BaseLiquibaseTask.java index b59297ffc9..fbfc96b32c 100644 --- a/liquibase-core/src/main/java/liquibase/integration/ant/BaseLiquibaseTask.java +++ b/liquibase-core/src/main/java/liquibase/integration/ant/BaseLiquibaseTask.java @@ -418,10 +418,6 @@ public void setOutputDefaultSchema(boolean outputDefaultSchema) { this.outputDefaultSchema = outputDefaultSchema; } - public String getLogLevel() { - return LogFactory.getLogger().getLogLevel().name(); - } - public boolean isOutputDefaultCatalog() { return outputDefaultCatalog; } @@ -435,6 +431,10 @@ public void setOutputDefaultCatalog(boolean outputDefaultCatalog) { this.outputDefaultCatalog = outputDefaultCatalog; } + public String getLogLevel() { + return LogFactory.getLogger().getLogLevel().name(); + } + public void setLogLevel(String level) { LogFactory.getLogger().setLogLevel(level); }