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

Improve failure message of RowCountPrecondition to preserve expected row count #3093

Merged
merged 2 commits into from Aug 1, 2022
Merged

Improve failure message of RowCountPrecondition to preserve expected row count #3093

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
33871e8
Improved error message of RowCountPrecondition
martinspielmann Jul 21, 2022
0a4c5f6
Merge branch 'master' into master
nvoxland Jul 27, 2022
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
6 changes: 3 additions & 3 deletions liquibase-core/src/main/java/liquibase/precondition/core/RowCountPrecondition.java
View file
Open in desktop
Expand Up @@ -75,7 +75,7 @@ public void check(Database database, DatabaseChangeLog changeLog, ChangeSet chan

int result = Scope.getCurrentScope().getSingleton(ExecutorService.class).getExecutor("jdbc", database).queryForInt(statement);
if (result != expectedRows) {
throw new PreconditionFailedException(getFailureMessage(result), changeLog, this);
throw new PreconditionFailedException(getFailureMessage(result, expectedRows), changeLog, this);
}

} catch (PreconditionFailedException e) {
Expand All @@ -85,8 +85,8 @@ public void check(Database database, DatabaseChangeLog changeLog, ChangeSet chan
}
}

protected String getFailureMessage(int result) {
return "Table "+tableName+" is not empty. Contains "+result+" rows";
protected String getFailureMessage(int result, int expectedRows) {
return "Table "+tableName+" does not have the expected row count of "+expectedRows+". It contains "+result+" rows";
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion liquibase-core/src/main/java/liquibase/precondition/core/TableIsEmptyPrecondition.java
View file
Open in desktop
Expand Up @@ -7,7 +7,7 @@ public TableIsEmptyPrecondition() {
}

@Override
protected String getFailureMessage(int result) {
protected String getFailureMessage(int result, int expectedRows) {
return "Table "+getTableName()+" is not empty. Contains "+result+" rows";
}

Expand Down