Do not throw exception when runWith is empty string (DAT-14316) (liqu…

…ibase#4495) * [DAT-14316] Map empty string to null in runWith getter to avoid improper setting with empty string. * [DAT-14316] Adds test with empty runWith.
mkarg · Jul 25, 2023 · a2667dc · a2667dc
1 parent 034c6c5
commit a2667dc
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 1 deletion.
diff --git a/...e-integration-tests/src/test/resources/changelogs/h2/complete/empty.runWith.changelog.xml b/...e-integration-tests/src/test/resources/changelogs/h2/complete/empty.runWith.changelog.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<databaseChangeLog
+        xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd">
+    <changeSet id="1" author="your.name" labels="example-label" context="example-context" runWith="">
+        <comment>example-comment</comment>
+        <createTable tableName="person">
+            <column name="id" type="int" autoIncrement="true">
+                <constraints primaryKey="true" nullable="false"/>
+            </column>
+            <column name="name" type="varchar(50)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="address1" type="varchar(50)"/>
+            <column name="address2" type="varchar(50)"/>
+            <column name="city" type="varchar(30)"/>
+        </createTable>
+    </changeSet>
+</databaseChangeLog>
diff --git a/...tegration-tests/src/test/resources/liquibase/extension/testing/command/update.test.groovy b/...tegration-tests/src/test/resources/liquibase/extension/testing/command/update.test.groovy
@@ -386,4 +386,18 @@ Optional Args:
                 'EVENT: ran fired',
         ]
     }
+
+    run "Should fall back to jdbc executor when runWith is an empty string", {
+        arguments = [
+                url                    : { it.url },
+                username               : { it.username },
+                password               : { it.password },
+                changelogFile          : 'changelogs/h2/complete/empty.runWith.changelog.xml',
+        ]
+
+        expectedResults = [
+                statusCode: 0,
+                defaultChangeExecListener: 'not_null'
+        ]
+    }
 }
diff --git a/liquibase-standard/src/main/java/liquibase/changelog/ChangeSet.java b/liquibase-standard/src/main/java/liquibase/changelog/ChangeSet.java
@@ -319,8 +319,11 @@ public void setStoredFilePath(String storedFilePath) {
         this.storedFilePath = storedFilePath;
     }
 
+    /**
+     * @return the runWith value. If the runWith value is empty or not set this method will return null.
+     */
     public String getRunWith() {
-        return runWith;
+        return runWith == null || runWith.isEmpty() ? null : runWith;
     }
 
     public void setRunWith(String runWith) {