Skip to content

Feature/core 1758 output default schema ant #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SeanTCoder wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Feature/core 1758 output default schema ant #2

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4924e03
Adding the outputDefaultSchema flag to the ant task. This is to maint…
mattbertolini Feb 9, 2014
4ad7b89
Adding the outputDefaultCatalog flag to the ant task.
mattbertolini Feb 9, 2014
6c2b913
Minor method ordering/organization.
mattbertolini Feb 9, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions liquibase-core/src/main/java/liquibase/integration/ant/BaseLiquibaseTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ 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 boolean outputDefaultCatalog = true;


private Map<String, Object> changeLogProperties = new HashMap<String, Object>();
Expand Down Expand Up @@ -265,6 +267,8 @@ public URLClassLoader run() {
database = DatabaseFactory.getInstance().findCorrectDatabaseImplementation(new JdbcConnection(connection));
database.setDefaultCatalogName(defaultCatalogName);
database.setDefaultSchemaName(defaultSchemaName);
database.setOutputDefaultSchema(isOutputDefaultSchema());
database.setOutputDefaultCatalog(isOutputDefaultCatalog());

if (getDatabaseChangeLogTableName() != null)
database.setDatabaseChangeLogTableName(getDatabaseChangeLogTableName());
Expand Down Expand Up @@ -401,6 +405,32 @@ 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 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 String getLogLevel() {
return LogFactory.getLogger().getLogLevel().name();
}
Expand Down