add ignore property to includeAll XSD (DAT-14921) (#5686)

The ignore code has existed for a long time for includeAll, but it was not part of the XSD.
liquibase · Mar 21, 2024 · 2060779 · 2060779
1 parent 14288cf
commit 2060779
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 0 deletions.
diff --git a/...s/src/test/resources/changelogs/common/includerelative/pathinclude1.ignored.changelog.xml b/...s/src/test/resources/changelogs/common/includerelative/pathinclude1.ignored.changelog.xml
@@ -0,0 +1,15 @@
+<?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="nvoxland">
+        <createTable tableName="relpathinclude1">
+            <column name="id" type="int"/>
+        </createTable>
+    </changeSet>
+
+    <includeAll path="changelogs/common/includerelative/includeAll" ignore="true"/>
+</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
@@ -520,4 +520,35 @@ Total change sets:            0
         ]
         expectedException = CommandExecutionException
     }
+
+    run "Ignore on includeAll", {
+        arguments = [
+                url          : { it.url },
+                username     : { it.username },
+                password     : { it.password },
+                changelogFile: "changelogs/common/includerelative/pathinclude1.ignored.changelog.xml",
+                showSummary: "VERBOSE"
+        ]
+
+        expectedOutput = """
+UPDATE SUMMARY
+Run:                          1
+Previously run:               0
+Filtered out:                 1
+-------------------------------
+Total change sets:            2
+
+
+FILTERED CHANGE SETS SUMMARY
+Ignored:                      1
+
++--------------------------------------------------------------+----------------------+
+| Changeset Info                                               | Reason Skipped       |
++--------------------------------------------------------------+----------------------+
+|                                                              | Changeset is ignored |
+| changelogs/common/includerelative/includeAll/pathinclude2.ch |                      |
+| angelog.xml::1::nvoxland                                     |                      |
++--------------------------------------------------------------+----------------------+
+"""
+    }
 }
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
@@ -112,6 +112,7 @@
             <xsd:attribute name="minDepth" type="integerExp"/>
             <xsd:attribute name="maxDepth" type="integerExp"/>
             <xsd:attribute name="endsWithFilter" type="xsd:string"/>
+            <xsd:attribute name="ignore" type="xsd:string"/>
             <xsd:anyAttribute namespace="##other" processContents="lax"/>
         </xsd:complexType>
     </xsd:element>