Merge pull request #4433 from liquibase/fix-error-if-missing

Rollback errorIfMissingOrEmpty parameter for includeAll tag
liquibase · Jun 23, 2023 · e8eb891 · e8eb891
2 parents b05aee7 + 38f1b43
commit e8eb891
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 12 deletions.
diff --git a/liquibase-standard/src/main/java/liquibase/changelog/DatabaseChangeLog.java b/liquibase-standard/src/main/java/liquibase/changelog/DatabaseChangeLog.java
@@ -496,7 +496,7 @@ protected void handleChildNode(ParsedNode node, ResourceAccessor resourceAccesso
                     ignore = false;
                 }
                 includeAll(path, node.getChildValue(null, "relativeToChangelogFile", false), resourceFilter,
-                        node.getChildValue(null, "errorIfMissing", true),
+                        node.getChildValue(null, "errorIfMissingOrEmpty", true),
                         resourceComparator,
                         resourceAccessor,
                         includeContextFilter,
@@ -630,7 +630,7 @@ public boolean isDbmsMatch(Set<String> dbmsSet) {
     public void includeAll(String pathName,
                            boolean isRelativeToChangelogFile,
                            IncludeAllFilter resourceFilter,
-                           boolean errorIfMissing,
+                           boolean errorIfMissingOrEmpty,
                            Comparator<String> resourceComparator,
                            ResourceAccessor resourceAccessor,
                            ContextExpression includeContextFilter,
@@ -644,7 +644,7 @@ public void includeAll(String pathName,
         includeAll(pathName,
                 isRelativeToChangelogFile,
                 resourceFilter,
-                errorIfMissing,
+                errorIfMissingOrEmpty,
                 resourceComparator,
                 resourceAccessor,
                 includeContextFilter,
@@ -656,7 +656,7 @@ public void includeAll(String pathName,
     public void includeAll(String pathName,
                            boolean isRelativeToChangelogFile,
                            IncludeAllFilter resourceFilter,
-                           boolean errorIfMissing,
+                           boolean errorIfMissingOrEmpty,
                            Comparator<String> resourceComparator,
                            ResourceAccessor resourceAccessor,
                            ContextExpression includeContextFilter,
@@ -665,14 +665,14 @@ public void includeAll(String pathName,
                            int minDepth,
                            int maxDepth)
             throws SetupException {
-        includeAll(pathName, isRelativeToChangelogFile, resourceFilter, errorIfMissing, resourceComparator,
+        includeAll(pathName, isRelativeToChangelogFile, resourceFilter, errorIfMissingOrEmpty, resourceComparator,
                    resourceAccessor, includeContextFilter, labels, ignore, minDepth, maxDepth, new ModifyChangeSets(null, null));
     }
 
     public void includeAll(String pathName,
                            boolean isRelativeToChangelogFile,
                            IncludeAllFilter resourceFilter,
-                           boolean errorIfMissing,
+                           boolean errorIfMissingOrEmpty,
                            Comparator<String> resourceComparator,
                            ResourceAccessor resourceAccessor,
                            ContextExpression includeContextFilter,
@@ -722,7 +722,7 @@ public void includeAll(String pathName,
 
                 unsortedResources = resourceAccessor.search(path, searchOptions);
             } catch (IOException e) {
-                if (errorIfMissing) {
+                if (errorIfMissingOrEmpty) {
                     throw new IOException(String.format("Could not find/read changelogs from %s directory", pathName));
                 }
             }
@@ -735,15 +735,15 @@ public void includeAll(String pathName,
                 }
             }
 
-            if (resources.isEmpty() && errorIfMissing) {
+            if (resources.isEmpty() && errorIfMissingOrEmpty) {
                 throw new SetupException(
                         "Could not find directory or directory was empty for includeAll '" + pathName + "'");
             }
 
             Scope.child(Collections.singletonMap(SEEN_CHANGELOGS_PATHS_SCOPE_KEY, seenChangelogPaths), () -> {
                 for (Resource resource : resources) {
                     Scope.getCurrentScope().getLog(getClass()).info("Reading resource: " + resource);
-                    include(resource.getPath(), false, errorIfMissing, resourceAccessor, includeContextFilter,
+                    include(resource.getPath(), false, errorIfMissingOrEmpty, resourceAccessor, includeContextFilter,
                             labels, ignore, OnUnknownFileFormat.WARN, modifyChangeSets);
                 }
             });

diff --git a/...ase-standard/src/main/resources/www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.23.xsd b/...ase-standard/src/main/resources/www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.23.xsd
@@ -104,7 +104,6 @@
             <xsd:attribute name="path" type="xsd:string" use="required"/>
             <xsd:attribute name="errorIfMissingOrEmpty" type="booleanExp" default="true"/>
             <xsd:attribute name="relativeToChangelogFile" type="booleanExp"/>
-            <xsd:attribute name="errorIfMissing" type="booleanExp" default="true"/>
             <xsd:attribute name="resourceComparator" type="xsd:string"/>
             <xsd:attribute name="filter" type="xsd:string"/>
             <xsd:attribute name="context" type="xsd:string"/>

diff --git a/...e-standard/src/main/resources/www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd b/...e-standard/src/main/resources/www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd
@@ -104,7 +104,6 @@
             <xsd:attribute name="path" type="xsd:string" use="required"/>
             <xsd:attribute name="errorIfMissingOrEmpty" type="booleanExp" default="true"/>
             <xsd:attribute name="relativeToChangelogFile" type="booleanExp"/>
-            <xsd:attribute name="errorIfMissing" type="booleanExp" default="true"/>
             <xsd:attribute name="resourceComparator" type="xsd:string"/>
             <xsd:attribute name="filter" type="xsd:string"/>
             <xsd:attribute name="context" type="xsd:string"/>

diff --git a/liquibase-standard/src/test/groovy/liquibase/changelog/DatabaseChangeLogTest.groovy b/liquibase-standard/src/test/groovy/liquibase/changelog/DatabaseChangeLogTest.groovy
@@ -687,7 +687,7 @@ http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbch
 
         def rootChangeLog = new DatabaseChangeLog(rootChangeLogPath)
         rootChangeLog.load(new ParsedNode(null, "databaseChangeLog")
-                .addChildren([includeAll: [path: includedAllChangeLogPath, minDepth:minDepth, maxDepth:maxDepth, errorIfMissing:false]]), resourceAccessor)
+                .addChildren([includeAll: [path: includedAllChangeLogPath, minDepth:minDepth, maxDepth:maxDepth, errorIfMissingOrEmpty:false]]), resourceAccessor)
 
         then:
         rootChangeLog.getChangeSets().size() == expectedIncludeAllChangesetsToDeploy