DAT-15857 - Fix for checksum upgrade in runWith change sets (#4874)

DAT-15857 --------- Co-authored-by: Wesley Willard <wwillard@datical.com>
liquibase · Sep 11, 2023 · 727c540 · 727c540
1 parent acfe8ed
commit 727c540
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/liquibase-standard/src/main/java/liquibase/change/AbstractSQLChange.java b/liquibase-standard/src/main/java/liquibase/change/AbstractSQLChange.java
@@ -14,6 +14,7 @@
 import liquibase.statement.SqlStatement;
 import liquibase.statement.core.RawCompoundStatement;
 import liquibase.statement.core.RawSqlStatement;
+import liquibase.util.BooleanUtil;
 import liquibase.util.StringUtil;
 
 import java.io.ByteArrayInputStream;
@@ -36,6 +37,8 @@ public abstract class AbstractSQLChange extends AbstractChange implements DbmsTa
 
     private boolean stripComments;
     private boolean splitStatements;
+
+    private Boolean originalSplitStatements;
     /**
      *
      * @deprecated  To be removed when splitStatements is changed to be type Boolean
@@ -55,6 +58,10 @@ protected AbstractSQLChange() {
         setSplitStatements(null);
     }
 
+    public void setOriginalSplitStatements(Boolean originalSplitStatements) {
+        this.originalSplitStatements = originalSplitStatements;
+    }
+
     public InputStream openSqlStream() throws IOException {
         return null;
     }
@@ -216,7 +223,11 @@ public CheckSum generateCheckSum() {
 
             ChecksumVersion version = Scope.getCurrentScope().getChecksumVersion();
             if (version.lowerOrEqualThan(ChecksumVersion.V8)) {
-                return CheckSum.compute(new NormalizingStreamV8(this.getEndDelimiter(), this.isSplitStatements(), this.isStripComments(), stream), false);
+                boolean isSplitStatements = this.isSplitStatements();
+                if (getChangeSet() != null && getChangeSet().getRunWith() != null) {
+                    isSplitStatements = BooleanUtil.isTrue(originalSplitStatements);
+                }
+                return CheckSum.compute(new NormalizingStreamV8(this.getEndDelimiter(), isSplitStatements, this.isStripComments(), stream), false);
             }
             return CheckSum.compute(new AbstractSQLChange.NormalizingStream(stream), false);
 

diff --git a/liquibase-standard/src/test/groovy/liquibase/change/core/SQLFileChangeTest.groovy b/liquibase-standard/src/test/groovy/liquibase/change/core/SQLFileChangeTest.groovy
@@ -10,7 +10,6 @@ import liquibase.changelog.ChangeSet
 import liquibase.changelog.DatabaseChangeLog
 import liquibase.database.core.MockDatabase
 import liquibase.exception.UnexpectedLiquibaseException
-import liquibase.integration.commandline.LiquibaseCommandLineConfiguration
 import liquibase.statement.SqlStatement
 import liquibase.test.JUnitResourceAccessor
 import liquibase.util.StreamUtil