From 708e2cb3ec4c6c19491b4f2c98ac342ded2324cb Mon Sep 17 00:00:00 2001
From: Ciro Spaciari <ciro.spaciari@gmail.com>
Date: Fri, 26 Sep 2025 18:43:10 -0700
Subject: [PATCH] more fixes

---
 test/docker/docker-compose.yml | 18 ++++++++++++++++++
 test/harness.ts                |  7 +++++--
 test/js/sql/sql-mysql.test.ts  |  3 ---
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/test/docker/docker-compose.yml b/test/docker/docker-compose.yml
index fa8357af04..aca4f36463 100644
--- a/test/docker/docker-compose.yml
+++ b/test/docker/docker-compose.yml
@@ -95,6 +95,24 @@ services:
       retries: 30
       start_period: 10s
 
+  mysql_plain_9:
+    image: mysql:9
+    environment:
+      MYSQL_ROOT_PASSWORD: "bun123456@#$%^&*()"
+      MYSQL_DATABASE: bun_sql_test
+    ports:
+      - target: 3306
+        published: 0
+        protocol: tcp
+    tmpfs:
+      - /var/lib/mysql
+    healthcheck:
+      test: ["CMD", "mysqladmin", "ping", "-h", "localhost"]
+      interval: 1h # Effectively disable after startup
+      timeout: 5s
+      retries: 30
+      start_period: 10s
+
   mysql_plain_empty_password:
     image: mysql:8.4
     environment:
diff --git a/test/harness.ts b/test/harness.ts
index 5f4ae0f926..8dec5552a6 100644
--- a/test/harness.ts
+++ b/test/harness.ts
@@ -938,7 +938,8 @@ export async function describeWithContainer(
       "mysql_plain": 3306,
       "mysql_tls": 3306,
       "mysql:8": 3306, // Map mysql:8 to mysql_plain
-      "mysql:9": 3306, // Map mysql:9 to mysql_native_password
+      "mysql:9": 3306, // Map mysql:9 to mysql_plain_9
+      "mysql_native_password": 3306, // mysql_native_password
       "redis_plain": 6379,
       "redis_unified": 6379,
       "minio": 9000,
@@ -952,8 +953,10 @@ export async function describeWithContainer(
       if (image === "mysql:8" || image === "mysql:9") {
         if (env.MYSQL_ALLOW_EMPTY_PASSWORD === "yes") {
           actualService = "mysql_plain_empty_password"; // No password
+        } else if (image === "mysql:9") {
+          actualService = "mysql_plain_9";
         } else {
-          actualService = "mysql_plain"; // Default to no password
+          actualService = "mysql_plain";
         }
       }
 
diff --git a/test/js/sql/sql-mysql.test.ts b/test/js/sql/sql-mysql.test.ts
index b9647cc051..75928e250d 100644
--- a/test/js/sql/sql-mysql.test.ts
+++ b/test/js/sql/sql-mysql.test.ts
@@ -24,9 +24,6 @@ if (isDockerEnabled()) {
     process.arch === "x64" && {
       name: "MySQL 9",
       image: "mysql:9",
-      env: {
-        MYSQL_ROOT_PASSWORD: "bun123456@#$%^&*()",
-      },
     },
   ].filter(Boolean);