[DAT-18992] 2025 :: Q1 :: Interop :: MySQL 8.4 on-prem support (#961)

* DAT-18992 adding MySQL 8.4
liquibase · Jan 10, 2025 · 59eca43 · 59eca43
1 parent a53e907
commit 59eca43
Show file tree

Hide file tree

Showing 13 changed files with 171 additions and 4 deletions.
diff --git a/.github/workflows/advanced.yml b/.github/workflows/advanced.yml
@@ -25,7 +25,7 @@ on:
       databases:
         description: Databases to start up. Comma separated list of "name"
         required: true
-        default: "[\"mysql-5.6\",\"mysql-5.7\",\"mysql-8\",\"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\",
+        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\",
         \"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\"]"
@@ -49,7 +49,7 @@ jobs:
       useLiquibaseSnapshot: ${{ steps.configure-build.outputs.useLiquibaseSnapshot }}
       liquibaseBranch: ${{ steps.configure-build.outputs.liquibaseBranch }}
       liquibaseRepo: ${{ steps.configure-build.outputs.liquibaseRepo }}
-      databases: ${{ github.event.inputs.databases || '["mysql-5.6","mysql-5.7","mysql-8",
+      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",
         "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",

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -57,6 +57,7 @@ on:
             "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",          
@@ -118,7 +119,7 @@ jobs:
       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","percona-xtradb-cluster-8.4",
+      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",
         "edb-postgres-12","edb-postgres-13","edb-postgres-14","edb-postgres-15","edb-postgres-16",

diff --git a/src/main/resources/liquibase/harness/change/changelogs/mysql/8.4/createFunction.xml b/src/main/resources/liquibase/harness/change/changelogs/mysql/8.4/createFunction.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<databaseChangeLog
+        xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+        xmlns:pro="http://www.liquibase.org/xml/ns/pro"
+        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 author="as" id="1">
+        <sql>SET GLOBAL log_bin_trust_function_creators = 1;</sql>
+        <rollback/>
+    </changeSet>
+    <changeSet author="as" id="2">
+        <pro:createFunction
+                encoding="UTF-8"
+                replaceIfExists="true"
+                functionName="test_function">CREATE FUNCTION test_function()
+                                                RETURNS VARCHAR(20)
+                                                BEGIN
+                                                RETURN 'Hello';
+                                                END
+        </pro:createFunction>
+        <rollback>
+            <pro:dropFunction functionName="test_function"/>
+        </rollback>
+    </changeSet>
+</databaseChangeLog>
diff --git a/src/main/resources/liquibase/harness/change/changelogs/mysql/8.4/createPackage.xml b/src/main/resources/liquibase/harness/change/changelogs/mysql/8.4/createPackage.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<databaseChangeLog
+        xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+        xmlns:pro="http://www.liquibase.org/xml/ns/pro"
+        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 author="as" id="1">
+        <sql>SET GLOBAL log_bin_trust_function_creators = 1;</sql>
+        <rollback/>
+    </changeSet>
+    <changeSet  author="as" id="2">
+        <pro:createPackage encoding="UTF-8"
+                           packageName="Test package">CREATE FUNCTION test_function()
+                                                      RETURNS VARCHAR(20)
+                                                      BEGIN
+                                                      RETURN 'Hello';
+                                                      END</pro:createPackage>
+        <rollback>
+            <pro:dropFunction functionName="test_function"/>
+        </rollback>
+    </changeSet>
+</databaseChangeLog>
diff --git a/src/main/resources/liquibase/harness/change/changelogs/mysql/8.4/createPackageBody.xml b/src/main/resources/liquibase/harness/change/changelogs/mysql/8.4/createPackageBody.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<databaseChangeLog
+        xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+        xmlns:pro="http://www.liquibase.org/xml/ns/pro"
+        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 author="as" id="1">
+        <sql>SET GLOBAL log_bin_trust_function_creators = 1;</sql>
+        <rollback/>
+    </changeSet>
+    <changeSet  author="as" id="2">
+        <pro:createPackageBody encoding="UTF-8"
+                           packageBodyName="Test package">CREATE FUNCTION test_function()
+                                                      RETURNS VARCHAR(20)
+                                                      BEGIN
+                                                      RETURN 'Hello';
+                                                      END</pro:createPackageBody>
+        <rollback>
+            <pro:dropFunction functionName="test_function"/>
+        </rollback>
+    </changeSet>
+</databaseChangeLog>
diff --git a/src/main/resources/liquibase/harness/change/changelogs/mysql/8.4/dropFunction.xml b/src/main/resources/liquibase/harness/change/changelogs/mysql/8.4/dropFunction.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<databaseChangeLog
+        xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+        xmlns:pro="http://www.liquibase.org/xml/ns/pro"
+        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 author="as" id="1">
+        <sql>SET GLOBAL log_bin_trust_function_creators = 1;</sql>
+        <rollback/>
+    </changeSet>
+    <changeSet author="as" id="2">
+        <pro:createFunction
+                encoding="UTF-8"
+                replaceIfExists="true"
+                functionName="test_function">CREATE FUNCTION test_function()
+                                                RETURNS VARCHAR(20)
+                                                BEGIN
+                                                RETURN 'Hello';
+                                                END
+        </pro:createFunction>
+        <rollback/>
+    </changeSet>
+    <changeSet author="as" id="3">
+        <pro:dropFunction functionName="test_function"/>
+        <rollback/>
+    </changeSet>
+</databaseChangeLog>
diff --git a/src/main/resources/liquibase/harness/change/expectedSnapshot/mysql/8.4/createFunction.json b/src/main/resources/liquibase/harness/change/expectedSnapshot/mysql/8.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\nBEGIN\n                                                RETURN 'Hello';\n                                                END",
+            "name": "test_function"
+          }
+        }]
+    }
+  }
+}
diff --git a/src/main/resources/liquibase/harness/change/expectedSnapshot/mysql/8.4/createPackage.json b/src/main/resources/liquibase/harness/change/expectedSnapshot/mysql/8.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\nBEGIN\n                                                      RETURN 'Hello';\n                                                      END",
+            "name": "test_function"
+          }
+        }]
+    }
+  }
+}
diff --git a/...main/resources/liquibase/harness/change/expectedSnapshot/mysql/8.4/createPackageBody.json b/...main/resources/liquibase/harness/change/expectedSnapshot/mysql/8.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\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
@@ -20,6 +20,9 @@ case $db in
   "mysql-8" )
     test_command mvn -ntp -Dtest=$tc -DdbName=mysql -DdbVersion=8 test
     ;;
+  "mysql-8.4" )
+    test_command mvn -ntp -Dtest=$tc -DdbName=mysql -DdbVersion=8.4 test
+    ;;
   "percona-xtradb-cluster-5.7" )
     test_command mvn -ntp -Dtest=$tc -DdbName=percona-xtradb-cluster -DdbVersion=5.7 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 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 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
@@ -44,6 +44,21 @@ services:
     volumes:
     - "./mysql-init.sql:/docker-entrypoint-initdb.d/mysql-init.sql"
 
+  mysql-8.4:
+    platform: linux/x86_64
+    image: mysql:8.4
+    ports:
+      - "33065:3306"
+    restart: always
+    environment:
+      MYSQL_ROOT_PASSWORD: LbRootPass1
+      MYSQL_DATABASE: lbcat
+      MYSQL_USER: lbuser
+      MYSQL_PASSWORD: LiquibasePass1
+    volumes:
+      - "./mysql-init.sql:/docker-entrypoint-initdb.d/mysql-init.sql"
+
+
   percona-xtradb-cluster-5.7:
     image: percona/percona-xtradb-cluster:5.7
     ports:

diff --git a/src/test/resources/harness-config.yml b/src/test/resources/harness-config.yml
@@ -65,6 +65,13 @@ databasesUnderTest:
     username: lbuser
     password: LiquibasePass1
 
+  - name: mysql
+    prefix: docker
+    version: 8.4
+    url: jdbc:mysql://localhost:33065/lbcat
+    username: lbuser
+    password: LiquibasePass1
+
   - name: percona-xtradb-cluster
     version: 5.7
     url: jdbc:mysql://localhost:33070/lbcat