Moved the logic up a level. This is specific to the unexpected sets, …

…so I expanded the removeIf predicate to be two conditions. This solves the issue of changesets not showing up in the DBCL table.
liquibase · Feb 15, 2024 · 25f033b · 25f033b
1 parent ebb40f8
commit 25f033b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/liquibase-standard/src/main/java/liquibase/changelog/RanChangeSet.java b/liquibase-standard/src/main/java/liquibase/changelog/RanChangeSet.java
@@ -117,7 +117,7 @@ public String toString() {
 
     public boolean isSameAs(ChangeSet changeSet) {
         String normalizedFilePath = DatabaseChangeLog.normalizePath(this.getChangeLog());
-        return normalizedFilePath.equalsIgnoreCase("liquibase-internal") || (this.getId().equalsIgnoreCase(changeSet.getId())
+        return (this.getId().equalsIgnoreCase(changeSet.getId())
                 && this.getAuthor().equalsIgnoreCase(changeSet.getAuthor())
                 && isSamePath(changeSet.getFilePath(), normalizedFilePath));
     }

diff --git a/liquibase-standard/src/main/java/liquibase/changelog/visitor/ExpectedChangesVisitor.java b/liquibase-standard/src/main/java/liquibase/changelog/visitor/ExpectedChangesVisitor.java
@@ -23,7 +23,7 @@ public Direction getDirection() {
 
     @Override
     public void visit(ChangeSet changeSet, DatabaseChangeLog databaseChangeLog, Database database, Set<ChangeSetFilterResult> filterResults) throws LiquibaseException {
-        unexpectedChangeSets.removeIf(ranChangeSet -> ranChangeSet.isSameAs(changeSet));
+        unexpectedChangeSets.removeIf(ranChangeSet -> ranChangeSet.isSameAs(changeSet) || ranChangeSet.getChangeLog().equalsIgnoreCase("liquibase-internal"));
     }
 
     public Collection<RanChangeSet> getUnexpectedChangeSets() {