Traverse parent changelogs for rollbacks

liquibase · Jul 2, 2016 · 39b9e0d · 39b9e0d
1 parent cddc01b
commit 39b9e0d
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/liquibase-core/src/main/java/liquibase/changelog/ChangeSet.java b/liquibase-core/src/main/java/liquibase/changelog/ChangeSet.java
@@ -377,13 +377,17 @@ protected void handleRollbackNode(ParsedNode rollbackNode, ResourceAccessor reso
             String changeSetAuthor = rollbackNode.getChildValue(null, "changeSetAuthor", String.class);
             String changeSetPath = rollbackNode.getChildValue(null, "changeSetPath", getFilePath());
 
-            ChangeSet changeSet = this.getChangeLog().getChangeSet(changeSetPath, changeSetAuthor, changeSetId);
-            if (changeSet == null) { //check from root
-                changeSet = getChangeLog().getRootChangeLog().getChangeSet(changeSetPath, changeSetAuthor, changeSetId);
-                if (changeSet == null) {
-                    throw new ParsedNodeException("Change set " + new ChangeSet(changeSetId, changeSetAuthor, false, false, changeSetPath, null, null, null).toString(false) + " does not exist");
+            DatabaseChangeLog changeLog = this.getChangeLog();
+            ChangeSet changeSet = changeLog.getChangeSet(changeSetPath, changeSetAuthor, changeSetId);
+            while (changeSet == null && changeLog != null) {
+                changeLog = changeLog.getParentChangeLog();
+                if (changeLog != null) {
+                    changeSet = changeLog.getChangeSet(changeSetPath, changeSetAuthor, changeSetId);
                 }
             }
+            if (changeSet == null) {
+                throw new ParsedNodeException("Change set " + new ChangeSet(changeSetId, changeSetAuthor, false, false, changeSetPath, null, null, null).toString(false) + " does not exist");
+            }
             for (Change change : changeSet.getChanges()) {
                 rollback.getChanges().add(change);
             }