Merge branch 'main' into DAT-16713

liquibase · Jan 7, 2025 · 34715f1 · 34715f1
2 parents 9c40bf4 + beb55ed
commit 34715f1
Show file tree

Hide file tree

Showing 110 changed files with 1,119 additions and 271 deletions.
diff --git a/.github/workflows/aws-weekly.yml b/.github/workflows/aws-weekly.yml
@@ -23,14 +23,14 @@ on:
       databases:
         description: Databases to start up. Comma separated list of "name:version"
         required: true
-        default: "[\"postgresql:12\",\"postgresql:13\",\"postgresql:14\",\"oracle:aws_19\",\"mariadb:aws_10.6\",\"mysql:aws\",\"mysql:aurora\",\"mssql:2019\",\"postgresql:aurora\"]"
+        default: "[\"postgresql:12\",\"postgresql:13\",\"postgresql:14\",\"oracle:aws_19\",\"mariadb:aws_10.6\",\"mysql:aws\",\"mysql:aurora\",\"mssql:aws_2019\",\"postgresql:aurora\"]"
 
 jobs:
   setup:
     name: Setup
     runs-on: ubuntu-latest
     outputs:
-      databases: ${{ github.event.inputs.databases || '["postgresql:12","postgresql:13","postgresql:14","oracle:aws_19","mariadb:aws_10.6","mysql:aws","mysql:aurora","mssql:2019","postgresql:aurora"]' }}
+      databases: ${{ github.event.inputs.databases || '["postgresql:12","postgresql:13","postgresql:14","oracle:aws_19","mariadb:aws_10.6","mysql:aws","mysql:aurora","mssql:aws_2019","postgresql:aurora"]' }}
       testClasses: ${{ inputs.testClasses  || 'LiquibaseHarnessSuiteTest' }}
     steps:
       - name: Checkout

diff --git a/.github/workflows/aws.yml b/.github/workflows/aws.yml
@@ -23,15 +23,15 @@ on:
       databases:
         description: Databases to start up. Comma separated list of "name:version"
         required: true
-        default: "[\"postgresql:12\",\"postgresql:13\",\"postgresql:14\",\"postgresql:16\",\"oracle:aws_19\",\"mariadb:aws_10.6\",\"mysql:aws\",\"mysql:aurora\",\"mssql:2019\",\"postgresql:aurora\"]"
+        default: "[\"postgresql:12\",\"postgresql:13\",\"postgresql:14\",\"postgresql:16\",\"oracle:aws_19\",\"mariadb:aws_10.6\",\"mysql:aws\",\"mysql:aurora\",\"mssql:aws_2019\",\"postgresql:aurora\"]"
 
 jobs:
   setup:
     name: Setup
     runs-on: ubuntu-latest
     outputs:
       databases: ${{ github.event.inputs.databases || '["postgresql:12","postgresql:13","postgresql:14","postgresql:16","oracle:aws_19",
-        "mariadb:aws_10.6","mysql:aws","mysql:aurora","mssql:2019","postgresql:aurora"]' }}
+        "mariadb:aws_10.6","mysql:aws","mysql:aurora","mssql:aws_2019","postgresql:aurora"]' }}
       testClasses: ${{ inputs.testClasses  || 'LiquibaseHarnessSuiteTest' }}
     steps:
       - name: Checkout
@@ -52,7 +52,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup Python
-        uses: actions/setup-python@v5.2.0
+        uses: actions/setup-python@v5.3.0
         with:
           python-version: '3.11.5'
 
@@ -195,7 +195,7 @@ jobs:
           sleep 30
           liquibase --classpath="src/test/resources/init-changelogs/aws" --changeLogFile="${{ steps.setup.outputs.databasePlatform }}.sql" --username="root" --password="${{ env.TH_DB_PASSWD }}" --url="$mysql_url" update
 
-      - uses: liquibase-github-actions/drop-all@v4.29.2
+      - uses: liquibase-github-actions/drop-all@v4.30.0
         if: ${{ steps.setup.outputs.databasePlatform == 'oracle' }}
         with:
           url: "${{ secrets.TH_ORACLEURL_19 }}"

diff --git a/.github/workflows/azure.yml b/.github/workflows/azure.yml
@@ -56,7 +56,7 @@ jobs:
         run: lpm update && lpm add mysql
 
       - name: Clean Azure MySQL Database
-        uses: liquibase-github-actions/drop-all@v4.29.2
+        uses: liquibase-github-actions/drop-all@v4.30.0
         if: ${{ matrix.database == 'mysql' }}
         with:
           url: "${{secrets.TH_AZURE_MYSQL_URL}}"
@@ -98,7 +98,7 @@ jobs:
             core.setOutput("databaseVersion", splitValues[1]);
 
       - name: Azure MSSQL dropAll
-        uses: liquibase-github-actions/drop-all@v4.29.2
+        uses: liquibase-github-actions/drop-all@v4.30.0
         if: ${{ steps.setup.outputs.databasePlatform == 'mssql' && steps.setup.outputs.databaseVersion == 'azure' }}
         with:
           url: "${{secrets.TH_AZURE_URL}}"
@@ -120,7 +120,7 @@ jobs:
           url: "${{secrets.TH_AZURE_URL}}"
 
       - name: Azure MSSQL MI dropAll
-        uses: liquibase-github-actions/drop-all@v4.29.2
+        uses: liquibase-github-actions/drop-all@v4.30.0
         if: ${{ steps.setup.outputs.databasePlatform == 'mssql' && steps.setup.outputs.databaseVersion == 'mi' }}
         with:
           url: "${{secrets.TH_AZURE_MSSQL_MI_URL}}"
@@ -142,7 +142,7 @@ jobs:
           url: "${{secrets.TH_AZURE_MSSQL_MI_URL}}"
 
       - name: Azure PostgreSQL Single Server dropAll
-        uses: liquibase-github-actions/drop-all@v4.29.2
+        uses: liquibase-github-actions/drop-all@v4.30.0
         if: ${{ steps.setup.outputs.databasePlatform == 'postgresql' && steps.setup.outputs.databaseVersion == 'azure' }}
         with:
           url: "${{secrets.TH_AZURE_POSTGRESQL_URL}}"
@@ -209,7 +209,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Azure PostgreSQL Flexible Server dropAll
-        uses: liquibase-github-actions/drop-all@v4.29.2
+        uses: liquibase-github-actions/drop-all@v4.30.0
         with:
           url: ${{ secrets[env.TH_AZURE_POSTGRESQL_FLEXIBLE_SERVER_URL] }}
           username: "${{secrets.TH_DB_ADMIN}}"

diff --git a/.github/workflows/gcp.yml b/.github/workflows/gcp.yml
@@ -57,7 +57,7 @@ jobs:
         run: lpm update && lpm add mysql
 
       - name: Clean GCP MySQL Database
-        uses: liquibase-github-actions/drop-all@v4.29.2
+        uses: liquibase-github-actions/drop-all@v4.30.0
         if: ${{ matrix.version == 'gcp' }}
         with:
           url: "${{ secrets.TH_GCP_MYSQL_8_0_URL }}"
@@ -92,7 +92,7 @@ jobs:
             core.setOutput("databasePlatform", splitValues[0]);
             core.setOutput("databaseVersion", splitValues[1]);
 
-      - uses: liquibase-github-actions/drop-all@v4.29.2
+      - uses: liquibase-github-actions/drop-all@v4.30.0
         if: ${{ steps.setup.outputs.databasePlatform == 'postgresql' }}
         with:
           url: "${{ secrets[format('TH_GCP_POSTGRESQL_{0}_URL', steps.setup.outputs.databaseVersion)] }}"
@@ -112,7 +112,7 @@ jobs:
           password: "${{secrets.TH_DB_PASSWD}}"
           url: "${{ secrets[format('TH_GCP_POSTGRESQL_{0}_URL', steps.setup.outputs.databaseVersion)] }}"
 
-      - uses: liquibase-github-actions/drop-all@v4.29.2
+      - uses: liquibase-github-actions/drop-all@v4.30.0
         if: ${{ steps.setup.outputs.databasePlatform == 'mssql' }}
         with:
           url: "${{ secrets.TH_GCP_MSSQL_2019_URL }}"
@@ -156,6 +156,7 @@ jobs:
         if: ${{ steps.setup.outputs.databasePlatform == 'mssql' }}
         env:
           LIQUIBASE_PRO_LICENSE_KEY: ${{ secrets.LICENSE_KEY }}
+          LIQUIBASE_LIQUIBASE_SCHEMA_NAME: lbuser
         run: mvn -Dtest=${{ needs.setup.outputs.testClasses }} -DconfigFile=/harness-config-cloud.yml -DdbName=${{ steps.setup.outputs.databasePlatform }} -DdbVersion=${{ steps.setup.outputs.databaseVersion }} -Dprefix=gcp -DdbUsername=${{secrets.TH_DB_ADMIN}} -DdbPassword=${{secrets.TH_DB_PASSWD}} -DdbUrl='${{ secrets.TH_GCP_MSSQL_2019_URL }}' test
 
       - name: Archive GCP ${{ steps.setup.outputs.databasePlatform }}-${{ steps.setup.outputs.databaseVersion }} Test Results

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -59,6 +59,7 @@ on:
             "mysql-8",
             "percona-xtradb-cluster-5.7",
             "percona-xtradb-cluster-8.0",
+            "percona-xtradb-cluster-8.4",          
             "postgres-12",
             "postgres-13",
             "postgres-14",
@@ -93,7 +94,9 @@ on:
             "hsqldb-2.5",
             "firebird-3",
             "firebird-4",
-            "db2-luw"
+            "db2-luw",
+            "informix-12.10",
+            "informix-14.10"
           ]
 
 jobs:
@@ -106,19 +109,19 @@ jobs:
   setup:
     name: Setup
     needs: authorize
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     env:
       GITHUB_TOKEN: ${{ secrets.INSTALL_SNAPSHOT_LIQUIBASE }}
     outputs:
       liquibaseOwner: ${{ steps.configure-build.outputs.liquibaseOwner }}
       liquibaseBranch: ${{ steps.configure-build.outputs.liquibaseBranch }}
       liquibaseRepo: ${{ steps.configure-build.outputs.liquibaseRepo }}
       liquibaseSha: ${{ steps.configure-build.outputs.liquibaseSha }}
-      databases: ${{ github.event.inputs.databases || '["mysql-5.6","mysql-5.7","mysql-8","percona-xtradb-cluster-5.7","percona-xtradb-cluster-8.0",
+      databases: ${{ github.event.inputs.databases || '["mysql-5.6","mysql-5.7","mysql-8","percona-xtradb-cluster-5.7","percona-xtradb-cluster-8.0","percona-xtradb-cluster-8.4",
         "postgres-12","postgres-13","postgres-14","postgres-15","postgres-16","mariadb-10.2","mariadb-10.3","mariadb-10.4","mariadb-10.5","mariadb-10.6",
-        "mariadb-10.7","mssql-2017","mssql-2019","mssql-2022","H2Database-2.2","crdb-23.1","crdb-23.2","crdb-24.1",
+        "mariadb-10.7","mssql-2017","H2Database-2.2","crdb-23.1","crdb-23.2","crdb-24.1",
         "edb-postgres-12","edb-postgres-13","edb-postgres-14","edb-postgres-15","edb-postgres-16",
-        "edb-edb-12","edb-edb-13","edb-edb-14","edb-edb-15","edb-edb-16","derby","sqlite","hsqldb-2.4","hsqldb-2.5","firebird-3","firebird-4","db2-luw"]' }}
+        "edb-edb-12","edb-edb-13","edb-edb-14","edb-edb-15","edb-edb-16","derby","sqlite","hsqldb-2.4","hsqldb-2.5","firebird-3","firebird-4","db2-luw","informix-12.10","informix-14.10"]' }}
       testClasses: ${{ inputs.testClasses || 'LiquibaseHarnessSuiteTest' }}
     steps:
       - uses: actions/checkout@v4

diff --git a/README.extensions.md b/README.extensions.md
@@ -53,6 +53,11 @@ This suite will run the Base Harness Test Suite. Please note the name of the tes
 
 - If you are creating a new extension to work with Liquibase, it is advisable to start with the Foundational Level Test. 
   - See https://github.com/liquibase/liquibase-test-harness#foundationaltest for a description of what this test validates.
+- Override input files if needed.
+  - to override input changelog put it into the path like src/test/resources/liquibase/harness/compatibility/foundational/changelogs/{database_name}/createTable.xml
+  - to override checkingSql for 'createTable' changelog, put it into the path like src/test/resources/liquibase/harness/compatibility/foundational/checkingSql/createTable/{database_name}/createTableXml.sql
+  - to override expected snapshot of DBCL table data for 'createTable' put it into the path like src/test/resources/liquibase/harness/compatibility/foundational/expectedResultSet/{database_name}/createTable.json
+  - *{database_name}* represent value for database_name from harness-config.yml
 - In your `src/test/groovy/ext` directory, create a file with this inclusion:   
 
 ```

diff --git a/README.md b/README.md
@@ -119,7 +119,7 @@ it is not present in test**)
 As far as this test validates work of basic Liquibase functions it is essential to keep its configuration as simple as possible:
 1. If you have your database instance up and running you need to just add appropriate configuration details to `src/test/resources/harness-config.yml` file.
 Following the example:
-   - **name**: `database_name` (**mandatory**) </br>
+   - **name**: `database_name` (**mandatory**)  - is used in test input files structure to override default files </br>
      **version**: `database_version` (optional) </br>
      **prefix**: `local` (optional parameter required for CI/CD tests, leave it empty or set `local`) </br>
      **url**: `db_connection_url` (**mandatory**) </br>

diff --git a/pom.xml b/pom.xml
@@ -17,9 +17,9 @@
         <liquibase-core.version>[4.26.0,)</liquibase-core.version>
         <!-- `[X,)` syntax means open-ended version range, version X or higher -->
         <maven-source-plugin.version>3.3.1</maven-source-plugin.version>
-        <gmavenplus-plugin.version>4.0.1</gmavenplus-plugin.version>
-        <junit.version>5.11.2</junit.version>
-        <junit-platform.version>1.11.2</junit-platform.version>
+        <gmavenplus-plugin.version>4.1.1</gmavenplus-plugin.version>
+        <junit.version>5.11.4</junit.version>
+        <junit-platform.version>1.11.4</junit-platform.version>
     </properties>
     <organization>
         <name>Liquibase.org</name>
@@ -89,7 +89,7 @@
         <dependency> <!-- use a specific Groovy version rather than the one specified by spock-core -->
             <groupId>org.apache.groovy</groupId>
             <artifactId>groovy-all</artifactId>
-            <version>4.0.23</version>
+            <version>4.0.24</version>
             <type>pom</type>
             <exclusions>
                 <exclusion>
@@ -157,7 +157,7 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.17.0</version>
+            <version>2.18.0</version>
         </dependency>
         <dependency>
             <groupId>org.postgresql</groupId>
@@ -174,19 +174,24 @@
         <dependency>
             <groupId>org.mariadb.jdbc</groupId>
             <artifactId>mariadb-java-client</artifactId>
-            <version>3.4.1</version>
+            <version>3.5.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.oracle.database.jdbc</groupId>
             <artifactId>ojdbc8</artifactId>
-            <version>19.24.0.0</version>
+            <version>19.25.0.0</version>
         </dependency>
         <dependency>
             <groupId>com.microsoft.sqlserver</groupId>
             <artifactId>mssql-jdbc</artifactId>
             <version>12.8.1.jre11</version>
         </dependency>
+        <dependency>
+            <groupId>com.ibm.informix</groupId>
+            <artifactId>jdbc</artifactId>
+            <version>4.50.11</version>
+        </dependency>
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
@@ -196,7 +201,7 @@
         <dependency>
             <groupId>org.xerial</groupId>
             <artifactId>sqlite-jdbc</artifactId>
-            <version>3.46.1.3</version>
+            <version>3.47.2.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -217,19 +222,19 @@
         <dependency>
             <groupId>org.hsqldb</groupId>
             <artifactId>hsqldb</artifactId>
-            <version>2.7.3</version>
+            <version>2.7.4</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>net.snowflake</groupId>
             <artifactId>snowflake-jdbc</artifactId>
-            <version>3.19.0</version>
+            <version>3.21.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.firebirdsql.jdbc</groupId>
             <artifactId>jaybird</artifactId>
-            <version>5.0.5.java11</version>
+            <version>5.0.6.java11</version>
         </dependency>
 
         <dependency>
@@ -291,14 +296,19 @@
             <artifactId>dom</artifactId>
             <version>2.3.0-jaxb-1.0.6</version>
         </dependency>
-
+        <dependency>
+            <groupId>org.liquibase.ext</groupId>
+            <artifactId>liquibase-disable-analytics</artifactId>
+            <version>1.0.0</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
     <build>
         <plugins>
             <plugin>
                 <groupId>org.liquibase.ext</groupId>
                 <artifactId>liquibase-sdk-maven-plugin</artifactId>
-                <version>0.10.23</version>
+                <version>0.10.25</version>
                 <configuration>
                     <githubToken>${env.GITHUB_TOKEN}</githubToken>
                     <liquibaseHome>bin</liquibaseHome>
@@ -309,7 +319,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>versions-maven-plugin</artifactId>
-                <version>2.17.1</version>
+                <version>2.18.0</version>
                 <configuration>
                     <generateBackupPoms>false</generateBackupPoms>
                 </configuration>
@@ -373,12 +383,12 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>
-                <version>3.5.1</version>
+                <version>3.5.2</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.10.1</version>
+                <version>3.11.2</version>
                 <configuration>
                     <author>false</author>
                     <doctitle>Liquibase Test Harness ${project.version}</doctitle>
@@ -432,7 +442,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.5.1</version>
+                <version>3.5.2</version>
                 <configuration>
                     <includes>
                         <!-- By default, only files ending in 'Test' will be included, so also include support for Spock style naming convention -->