Merge pull request #3093 from martinspielmann/master

Improve failure message of RowCountPrecondition to preserve expected row count
liquibase · Aug 1, 2022 · 9c4e585 · 9c4e585
2 parents c91baf2 + 0a4c5f6
commit 9c4e585
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/liquibase-core/src/main/java/liquibase/precondition/core/RowCountPrecondition.java b/liquibase-core/src/main/java/liquibase/precondition/core/RowCountPrecondition.java
@@ -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) {
@@ -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

diff --git a/liquibase-core/src/main/java/liquibase/precondition/core/TableIsEmptyPrecondition.java b/liquibase-core/src/main/java/liquibase/precondition/core/TableIsEmptyPrecondition.java
@@ -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";
     }