DAT-16963. added mariadb 11.4 support (#977)

* DAT-16963. added mariadb 11.4 support * DAT-16963. added test data for the mariadb 11.4 * DAT-16963. refactored test data for the mariadb 11.4
liquibase · Jan 24, 2025 · e64baa2 · e64baa2
1 parent 45d261c
commit e64baa2
Show file tree

Hide file tree

Showing 9 changed files with 68 additions and 4 deletions.
diff --git a/.github/workflows/advanced.yml b/.github/workflows/advanced.yml
@@ -26,7 +26,7 @@ on:
         description: Databases to start up. Comma separated list of "name"
         required: true
         default: "[\"mysql-5.6\",\"mysql-5.7\",\"mysql-8\",\"mysql-8.4\",\"postgres-12\",\"postgres-13\",\"postgres-14\",\"postgres-15\",\"postgres-16\",\"postgres-17\",\"mariadb-10.2\",\"mariadb-10.3\",\"mariadb-10.4\",\"mariadb-10.5\",\"mariadb-10.6\",
-        \"mariadb-10.7\",\"mssql-2017\",\"mssql-2019\",\"mssql-2022\",\"crdb-23.1\",\"crdb-23.2\",\"crdb-24.1\",\"percona-xtradb-cluster-5.7\",\"percona-xtradb-cluster-8.0\",
+        \"mariadb-10.7\",\"mariadb-11.4\",\"mssql-2017\",\"mssql-2019\",\"mssql-2022\",\"crdb-23.1\",\"crdb-23.2\",\"crdb-24.1\",\"percona-xtradb-cluster-5.7\",\"percona-xtradb-cluster-8.0\",
         \"edb-edb-12\",\"edb-edb-13\",\"edb-edb-14\",\"edb-edb-15\",\"edb-edb-16\",\"db2-luw\",\"H2Database-2.2\",\"sqlite\",\"derby\",
         \"firebird-3\",\"firebird-4\",\"hsqldb-2.4\",\"hsqldb-2.5\",\"diff\",\"tidb\"]"
 
@@ -51,7 +51,7 @@ jobs:
       liquibaseRepo: ${{ steps.configure-build.outputs.liquibaseRepo }}
       databases: ${{ github.event.inputs.databases || '["mysql-5.6","mysql-5.7","mysql-8","mysql-8.4",
         "postgres-12","postgres-13","postgres-14","postgres-15","postgres-16","postgres-17","mariadb-10.2","mariadb-10.3","mariadb-10.4","mariadb-10.5","mariadb-10.6",
-        "mariadb-10.7","mssql-2017","mssql-2019","mssql-2022","crdb-23.1","crdb-23.2","crdb-24.1","percona-xtradb-cluster-5.7","percona-xtradb-cluster-8.0",
+        "mariadb-10.7","mariadb-11.4","mssql-2017","mssql-2019","mssql-2022","crdb-23.1","crdb-23.2","crdb-24.1","percona-xtradb-cluster-5.7","percona-xtradb-cluster-8.0",
         "edb-edb-12","edb-edb-13","edb-edb-14","edb-edb-15","edb-edb-16","db2-luw","H2Database-2.2","sqlite","derby","firebird-3","firebird-4",
         "hsqldb-2.4","hsqldb-2.5","diff","tidb"]' }}
       testClasses: ${{ 'AdvancedHarnessSuiteTest' }}

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -73,6 +73,7 @@ on:
             "mariadb-10.5",
             "mariadb-10.6",
             "mariadb-10.7",
+            "mariadb-11.4",          
             "mssql-2017",
             "mssql-2019",
             "mssql-2022",
@@ -122,7 +123,7 @@ jobs:
       liquibaseSha: ${{ steps.configure-build.outputs.liquibaseSha }}
       databases: ${{ github.event.inputs.databases || '["mysql-5.6","mysql-5.7","mysql-8","mysql-8.4","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","postgres-17","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","mariadb-11.4","mssql-2017","mssql-2019","mssql-2022","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","informix-12.10","informix-14.10","tidb"]' }}
       testClasses: ${{ inputs.testClasses || 'LiquibaseHarnessSuiteTest' }}

diff --git a/...main/resources/liquibase/harness/change/expectedSnapshot/mariadb/11.4/createFunction.json b/...main/resources/liquibase/harness/change/expectedSnapshot/mariadb/11.4/createFunction.json
@@ -0,0 +1,13 @@
+{
+  "snapshot": {
+    "objects": {
+      "com.datical.liquibase.ext.storedlogic.function.Function": [
+        {
+          "function": {
+            "body": "CREATE FUNCTION `test_function`() RETURNS varchar(20) CHARSET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci\nBEGIN\n                                                RETURN 'Hello';\n                                                END",
+            "name": "test_function"
+          }
+        }]
+    }
+  }
+}
diff --git a/src/main/resources/liquibase/harness/change/expectedSnapshot/mariadb/11.4/createPackage.json b/src/main/resources/liquibase/harness/change/expectedSnapshot/mariadb/11.4/createPackage.json
@@ -0,0 +1,13 @@
+{
+  "snapshot": {
+    "objects": {
+      "com.datical.liquibase.ext.storedlogic.function.Function": [
+        {
+          "function": {
+            "body": "CREATE FUNCTION `test_function`() RETURNS varchar(20) CHARSET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci\nBEGIN\n                                                      RETURN 'Hello';\n                                                      END",
+            "name": "test_function"
+          }
+        }]
+    }
+  }
+}
diff --git a/...n/resources/liquibase/harness/change/expectedSnapshot/mariadb/11.4/createPackageBody.json b/...n/resources/liquibase/harness/change/expectedSnapshot/mariadb/11.4/createPackageBody.json
@@ -0,0 +1,13 @@
+{
+  "snapshot": {
+    "objects": {
+      "com.datical.liquibase.ext.storedlogic.function.Function": [
+        {
+          "function": {
+            "body": "CREATE FUNCTION `test_function`() RETURNS varchar(20) CHARSET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci\nBEGIN\n                                                      RETURN 'Hello';\n                                                      END",
+            "name": "test_function"
+          }
+        }]
+    }
+  }
+}
diff --git a/src/test/resources/automation-runner.sh b/src/test/resources/automation-runner.sh
@@ -68,6 +68,9 @@ case $db in
   "mariadb-10.7" )
     test_command mvn -ntp -Dtest=$tc -DdbName=mariadb -DdbVersion=10.7 test
     ;;
+  "mariadb-11.4" )
+    test_command mvn -ntp -Dtest=$tc -DdbName=mariadb -DdbVersion=11.4 test
+    ;;
   "mssql-2017" )
     test_command mvn -ntp -Dtest=$tc -DdbName=mssql -DdbVersion=2017 test
     ;;

diff --git a/src/test/resources/docker/create-infra.sh b/src/test/resources/docker/create-infra.sh
@@ -20,7 +20,7 @@ case $db in
     ;;
 
   "diff")
-    docker compose up -d postgres-17 postgres-16 postgres-15 postgres-14 postgres-13 postgres-12 mysql-5.7 mysql-8 mysql-8.4 mariadb-10.2 mariadb-10.3 mariadb-10.4 mariadb-10.5 mariadb-10.6 mariadb-10.7 mssql-2017 mssql-2019 mssql-2022
+    docker compose up -d postgres-17 postgres-16 postgres-15 postgres-14 postgres-13 postgres-12 mysql-5.7 mysql-8 mysql-8.4 mariadb-10.2 mariadb-10.3 mariadb-10.4 mariadb-10.5 mariadb-10.6 mariadb-10.7 mariadb-11.4 mssql-2017 mssql-2019 mssql-2022
     sleep 40
     docker ps -a
     ;;

diff --git a/src/test/resources/docker/docker-compose.yml b/src/test/resources/docker/docker-compose.yml
@@ -249,6 +249,20 @@ services:
     volumes:
       - "./mariadb-init.sql:/docker-entrypoint-initdb.d/mariadb-init.sql"
 
+  mariadb-11.4:
+    image: mariadb:11.4
+    ports:
+      - "33073:3306"
+    restart: always
+    environment:
+      MYSQL_ROOT_PASSWORD: LbRootPass1
+      MYSQL_DATABASE: lbcat
+      MYSQL_USER: lbuser
+      MYSQL_PASSWORD: LiquibasePass1
+    volumes:
+      - "./mariadb-init.sql:/docker-entrypoint-initdb.d/mariadb-init.sql"
+
+
   mssql-2017:
     container_name: sql-server-db-2017
     image: mcr.microsoft.com/mssql/server:2017-latest

diff --git a/src/test/resources/harness-config.yml b/src/test/resources/harness-config.yml
@@ -138,6 +138,13 @@ databasesUnderTest:
     username: lbuser
     password: LiquibasePass1
 
+  - name: mariadb
+    prefix: docker
+    version: 11.4
+    url: jdbc:mariadb://localhost:33073/lbcat
+    username: lbuser
+    password: LiquibasePass1
+
   - name: oracle
     version: 18.4.0
     url: 'jdbc:oracle:thin:@localhost:1522/xe'