Merge pull request #258 from trilogy-libraries/ci-coverage

CI: test again MySQL 9.6 (innovation release)

Author: byroot

.github/workflows/ci.yml

@@ -18,7 +18,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        mysql: ["8.0", "8.4"]
+        mysql: ["8.0", "8.4", "9.5"]
         distribution: ["debian:bookworm", "ubuntu:noble", "ubuntu:jammy", "ubuntu:focal"]
         ruby: ["3.3", "3.4", "4.0"]
     steps:

.github/workflows/macos.yml

@@ -15,17 +15,24 @@ jobs:
     name: Test
     runs-on: macos-latest
     strategy:
+      fail-fast: false
       matrix:
-        mysql: ["8.0", "8.4"]
+        mysql: ["8.0", "8.4", "9.6"]
     steps:
     - uses: actions/checkout@v6
     - name: Setup MySQL
       run: |
         brew install mysql@${{ matrix.mysql }}
+        # Apply macOS-specific config if it exists (e.g., 8.4 needs mysql_native_password=ON)
+        # Homebrew MySQL reads config from $(brew --prefix)/etc/my.cnf
+        if [[ -f "test/mysql/conf.d/${{ matrix.mysql }}/macos.cnf" ]]; then
+          cat test/mysql/conf.d/${{ matrix.mysql }}/macos.cnf >> $(brew --prefix)/etc/my.cnf
+        fi
         (unset CI; brew postinstall mysql@${{ matrix.mysql }})
         brew services start mysql@${{ matrix.mysql }}
         sleep 5
         $(brew --prefix mysql@${{ matrix.mysql }})/bin/mysql -uroot -e 'CREATE DATABASE test'
+        $(brew --prefix mysql@${{ matrix.mysql }})/bin/mysql -uroot < test/mysql/docker-entrypoint-initdb.d/caching_sha2_password_user.sql
     - name: Build
       run: CFLAGS="-I$(brew --prefix openssl@1.1)/include" LDFLAGS="-L$(brew --prefix openssl@1.1)/lib" make all test/test
     - name: test
@@ -34,8 +41,9 @@ jobs:
     name: Test Ruby
     runs-on: macos-latest
     strategy:
+      fail-fast: false
       matrix:
-        mysql: ["8.0"]
+        mysql: ["8.0", "8.4", "9.6"]
         ruby: ["3.0", "3.1", "3.2", "3.3", "3.4", "4.0"]
     steps:
     - uses: actions/checkout@v6
@@ -47,12 +55,20 @@ jobs:
         MYSQL_VERSION: ${{ matrix.mysql }}
       run: |
         brew install mysql@${{ matrix.mysql }}
+        # Apply macOS-specific config if it exists (e.g., 8.4 needs mysql_native_password=ON)
+        # Homebrew MySQL reads config from $(brew --prefix)/etc/my.cnf
+        if [[ -f "test/mysql/conf.d/${{ matrix.mysql }}/macos.cnf" ]]; then
+          cat test/mysql/conf.d/${{ matrix.mysql }}/macos.cnf >> $(brew --prefix)/etc/my.cnf
+        fi
         (unset CI; brew postinstall mysql@${{ matrix.mysql }})
         brew services start mysql@${{ matrix.mysql }}
         sleep 5
         $(brew --prefix mysql@${{ matrix.mysql }})/bin/mysql -uroot -e 'CREATE DATABASE test'
-        [[ "$MYSQL_VERSION" == "8.0" ]] && $(brew --prefix mysql@${{ matrix.mysql }})/bin/mysql -uroot < test/mysql/docker-entrypoint-initdb.d/caching_sha2_password_user.sql
-        $(brew --prefix mysql@${{ matrix.mysql }})/bin/mysql -uroot < test/mysql/docker-entrypoint-initdb.d/native_password_user.sql
+        $(brew --prefix mysql@${{ matrix.mysql }})/bin/mysql -uroot < test/mysql/docker-entrypoint-initdb.d/caching_sha2_password_user.sql
+        # mysql_native_password plugin was removed in MySQL 9.x
+        if [[ ! "${{ matrix.mysql }}" =~ ^9 ]]; then
+          $(brew --prefix mysql@${{ matrix.mysql }})/bin/mysql -uroot -e "CREATE USER 'native'@'%'; GRANT ALL PRIVILEGES ON test.* TO 'native'@'%'; ALTER USER 'native'@'%' IDENTIFIED WITH mysql_native_password BY 'password';"
+        fi
         $(brew --prefix mysql@${{ matrix.mysql }})/bin/mysql -uroot < test/mysql/docker-entrypoint-initdb.d/x509_user.sql
         $(brew --prefix mysql@${{ matrix.mysql }})/bin/mysql -uroot < test/mysql/docker-entrypoint-initdb.d/cleartext_user.sql
     - name: Install dependencies

contrib/ruby/test/auth_test.rb

@@ -17,7 +17,14 @@ def has_caching_sha2?
     server_version.split(".", 2)[0].to_i >= 8
   end
 
+  def has_native_password_plugin?
+    new_tcp_client.query("SELECT PLUGIN_NAME FROM information_schema.plugins WHERE PLUGIN_NAME = 'mysql_native_password'").count > 0
+  rescue Trilogy::Error
+    false
+  end
+
   def test_connect_native_with_password
+    return skip unless has_native_password_plugin?
     create_and_delete_test_user(username: "native", auth_plugin: "mysql_native_password") do
       client = new_tcp_client username: "native", password: "password"
 
@@ -86,6 +93,7 @@ def test_connect_without_ssl_or_unix_socket_caching_sha2_raises
   end
 
   def test_connection_error_native
+    return skip unless has_native_password_plugin?
     create_and_delete_test_user(username: "native", auth_plugin: "mysql_native_password") do
 
       err = assert_raises Trilogy::ConnectionError do

test/mysql/conf.d/8.4/macos.cnf

@@ -0,0 +1,5 @@
+# macOS-specific MySQL configuration (used by brew)
+# Docker uses build.cnf which has additional SSL paths
+
+[mysqld]
+mysql_native_password=ON

test/mysql/conf.d/9.5/build.cnf

@@ -0,0 +1,21 @@
+# This MySQL configuration file is mounted into the Database container (/etc/mysql/conf.d)
+# at boot and is picked up automatically.
+
+[mysqld]
+
+sql_mode = NO_ENGINE_SUBSTITUTION
+
+server_id = 1
+gtid_mode = ON
+enforce_gtid_consistency = ON
+log_bin = mysql-bin.log
+
+# Since we generate our own certificates for testing purposes, we need to instruct MySQL
+# on where to find them. The certifcates are generated as an entrypoint script located at:
+# mysql/docker-entrypoint-initdb.d/generate_keys.sh
+# The /mysql-certs directory is mounted into both the database container and the app
+# container so that they both can have access to the generated certificates.
+# --
+ssl_ca = /mysql-certs/ca.pem
+ssl_cert = /mysql-certs/server-cert.pem
+ssl_key = /mysql-certs/server-key.pem

test/mysql/docker-entrypoint-initdb.d/native_password_user.sh

@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+
+# Create native password user only if MySQL version < 9.
+# MySQL 9.x completely removed the mysql_native_password plugin.
+
+set -euo pipefail
+
+# Get MySQL major version (use -h localhost to avoid MYSQL_HOST env var)
+MYSQL_MAJOR_VERSION=$(mysql -h localhost -uroot -N -e "SELECT SUBSTRING_INDEX(VERSION(), '.', 1)")
+
+if [[ "$MYSQL_MAJOR_VERSION" -lt 9 ]]; then
+    echo "MySQL $MYSQL_MAJOR_VERSION.x detected, creating native password user..."
+    mysql -h localhost -uroot <<EOF
+CREATE USER 'native'@'%';
+GRANT ALL PRIVILEGES ON test.* TO 'native'@'%';
+ALTER USER 'native'@'%' IDENTIFIED WITH mysql_native_password BY 'password';
+EOF
+    echo "native user created successfully"
+else
+    echo "MySQL $MYSQL_MAJOR_VERSION.x detected, mysql_native_password not available, skipping native user creation"
+fi