Skip to content
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

Jump to bottom

Allow update command to handle additional properties that are passed on the command line DAT-15769 #4726

Merged
merged 3 commits into from Sep 5, 2023
Merged

Allow update command to handle additional properties that are passed on the command line DAT-15769 #4726

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d578988
Allow update command to handle additional properties that are
wwillard7800 Aug 24, 2023
99f5fa4
Remove outputWriter from call to run update in old Main
wwillard7800 Aug 30, 2023
d2aac3c
Merge remote-tracking branch 'origin/master' into DAT-15769
wwillard7800 Aug 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion liquibase-standard/src/main/java/liquibase/diff/core/StandardDiffGenerator.java
View file
Open in desktop
Expand Up @@ -119,7 +119,6 @@ protected <T extends DatabaseObject> void compareObjectType(Class<T> type, Datab
if (referenceSnapshot.get(comparisonObject) == null) {
diffResult.addUnexpectedObject(comparisonObject);
}
// }
}
}

Expand Down
4 changes: 3 additions & 1 deletion liquibase-standard/src/main/java/liquibase/integration/commandline/Main.java
View file
Open in desktop
Expand Up @@ -1399,7 +1399,7 @@
final ResourceAccessor fileOpener = this.getFileOpenerResourceAccessor();

if (COMMANDS.DIFF.equalsIgnoreCase(command) || COMMANDS.DIFF_CHANGELOG.equalsIgnoreCase(command)
|| COMMANDS.GENERATE_CHANGELOG.equalsIgnoreCase(command) || COMMANDS.UPDATE.equalsIgnoreCase(command)
|| COMMANDS.GENERATE_CHANGELOG.equalsIgnoreCase(command)
|| COMMANDS.RELEASE_LOCKS.equalsIgnoreCase(command)
|| COMMANDS.ROLLBACK.equalsIgnoreCase(command) || COMMANDS.ROLLBACK_SQL.equalsIgnoreCase(command)) {
this.runUsingCommandFramework();
Expand Down Expand Up @@ -1563,6 +1563,8 @@
} catch (LiquibaseException updateException) {
handleUpdateException(database, updateException, defaultChangeExecListener, rollbackOnError);
}
} else if (COMMANDS.UPDATE.equalsIgnoreCase(command)) {
liquibase.update(new Contexts(contexts), new LabelExpression(getLabelFilter()));

Check notice

Code scanning / CodeQL

Deprecated method or constructor invocation Note

Invoking
Liquibase.update
should be avoided because it has been deprecated.
} else if (COMMANDS.UPDATE_COUNT_SQL.equalsIgnoreCase(command)) {
liquibase.update(Integer.parseInt(commandParams.iterator().next()), new Contexts(contexts), new
LabelExpression(getLabelFilter()), getOutputWriter());
Expand Down