Merge pull request #16293 from famod/liquibase-includeAll

Extend Liquibase IT with includeAll
quarkusio · Apr 6, 2021 · c801723 · c801723
2 parents e4e7e17 + 5aa7d0d
commit c801723
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 0 deletions.
diff --git a/integration-tests/liquibase/src/main/resources/db/xml/changeLog.xml b/integration-tests/liquibase/src/main/resources/db/xml/changeLog.xml
@@ -9,4 +9,6 @@
     <include relativeToChangelogFile="true" file="test/test.xml" />
 
     <include relativeToChangelogFile="true" file="create-views.xml" />
+
+    <includeAll relativeToChangelogFile="true" path="includeAll" />
 </databaseChangeLog>
diff --git a/integration-tests/liquibase/src/main/resources/db/xml/includeAll/test1.xml b/integration-tests/liquibase/src/main/resources/db/xml/includeAll/test1.xml
@@ -0,0 +1,16 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.5.xsd">
+
+    <changeSet author="dev (generated)" id="includeAll-1">
+        <createTable tableName="INCLUDEALL_1">
+            <column name="ID" type="VARCHAR(255)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="NAME" type="VARCHAR(255)"/>
+        </createTable>
+    </changeSet>
+
+</databaseChangeLog>
diff --git a/integration-tests/liquibase/src/main/resources/db/xml/includeAll/test2.xml b/integration-tests/liquibase/src/main/resources/db/xml/includeAll/test2.xml
@@ -0,0 +1,16 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.5.xsd">
+
+    <changeSet author="dev (generated)" id="includeAll-2">
+        <createTable tableName="INCLUDEALL_2">
+            <column name="ID" type="VARCHAR(255)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="NAME" type="VARCHAR(255)"/>
+        </createTable>
+    </changeSet>
+
+</databaseChangeLog>
diff --git a/...tests/liquibase/src/test/java/io/quarkus/it/liquibase/LiquibaseFunctionalityNativeIT.java b/...tests/liquibase/src/test/java/io/quarkus/it/liquibase/LiquibaseFunctionalityNativeIT.java
@@ -4,4 +4,9 @@
 
 @NativeImageTest
 public class LiquibaseFunctionalityNativeIT extends LiquibaseFunctionalityTest {
+
+    @Override
+    protected boolean isIncludeAllExpectedToWork() {
+        return false;
+    }
 }
diff --git a/...ion-tests/liquibase/src/test/java/io/quarkus/it/liquibase/LiquibaseFunctionalityTest.java b/...ion-tests/liquibase/src/test/java/io/quarkus/it/liquibase/LiquibaseFunctionalityTest.java
@@ -20,11 +20,15 @@ public void testLiquibaseQuarkusFunctionality() {
                 .then()
                 .body(is(
                         "create-tables-1,test-1,create-view-inline,create-view-file-abs,create-view-file-rel,"
+                                + (isIncludeAllExpectedToWork() ? "includeAll-1,includeAll-2," : "")
                                 + "json-create-tables-1,json-test-1,"
                                 + "sql-create-tables-1,sql-test-1,"
                                 + "yaml-create-tables-1,yaml-test-1,"
                                 + "00000000000000,00000000000001,00000000000002,"
                                 + "1613578374533-1,1613578374533-2,1613578374533-3"));
     }
 
+    protected boolean isIncludeAllExpectedToWork() {
+        return true;
+    }
 }