feat: include libmysql plugins in macOS app bundle

ansgarbecker · ansgarbecker · commit 85a15f839ae1 · 2025-12-17T10:27:23.000+01:00
diff --git a/create-macos-app.sh b/create-macos-app.sh
@@ -44,16 +44,15 @@ MYSQL_LIB_DIR="${BREW_PREFIX}/opt/mysql-client/lib"
 PG_LIB_DIR="${BREW_PREFIX}/opt/libpq/lib"
 SQLITE_LIB_DIR="${BREW_PREFIX}/opt/sqlite/lib"
 MARIADB_LIB_DIR="${BREW_PREFIX}/opt/mariadb-connector-c/lib"
+MYSQL_PLUGIN_DIR="${MYSQL_LIB_DIR}/plugin"
 MARIADB_PLUGIN_DIR="${MARIADB_LIB_DIR}/mariadb/plugin"
-MARIADB_PLUGIN_DEST="${APP_DIR}/Contents/Frameworks/plugins"
 
 ### PREPARE APP BUNDLE STRUCTURE
 
 rm -rf "${APP_DIR}"
 mkdir -p "${APP_DIR}/Contents/MacOS"
 mkdir -p "${APP_DIR}/Contents/Resources"
-mkdir -p "${APP_DIR}/Contents/Frameworks"   # where we will put .dylib files
-mkdir -p "${MARIADB_PLUGIN_DEST}"
+mkdir -p "${APP_DIR}/Contents/Frameworks"   # where we will put .dylib and .so files
 
 # Copy main executable
 cp "${EXECUTABLE_SRC}" "${EXECUTABLE_TRG}"
@@ -196,27 +195,26 @@ else
 fi
 
 # MARIADB PLUGIN .so FILES
-if [[ -d "${MARIADB_PLUGIN_DIR}" ]]; then
-  echo "Copying MariaDB plugins from ${MARIADB_PLUGIN_DIR}..."
-  mkdir -p "${MARIADB_PLUGIN_DEST}"
-
-  # Copy all .so plugins into the app plugin directory
-  for so in "${MARIADB_PLUGIN_DIR}"/*.so; do
-    [[ -f "${so}" ]] || continue
-    base="$(basename "${so}")"
-    dest_so="${MARIADB_PLUGIN_DEST}/${base}"
-
-    echo "  Copying plugin ${so} -> ${dest_so}"
-    cp "${so}" "${dest_so}"
-    chmod u+w "${dest_so}"
-
-    # Fix plugin’s own deps and copy any non-system libs into Frameworks
-    copy_and_rewrite_dylib "${dest_so}"
+if ls "${MARIADB_PLUGIN_DIR}"/*.so >/dev/null 2>&1; then
+  for f in "${MARIADB_PLUGIN_DIR}"/*.so; do
+    [[ -f "${f}" ]] || continue
+    copy_and_rewrite_dylib "${f}"
   done
 else
   echo "WARNING: MariaDB plugin directory not found: ${MARIADB_PLUGIN_DIR}" >&2
 fi
 
+# MYSQL PLUGIN .so FILES
+if ls "${MYSQL_PLUGIN_DIR}"/*.so >/dev/null 2>&1; then
+  for f in "${MYSQL_PLUGIN_DIR}"/*.so; do
+    [[ -f "${f}" ]] || continue
+    copy_and_rewrite_dylib "${f}"
+  done
+else
+  echo "WARNING: MySQL plugin directory not found: ${MYSQL_PLUGIN_DIR}" >&2
+fi
+
+
 ### FIX MAIN EXECUTABLE’S REFERENCES TO CLIENT LIBS
 
 # Helper: rewrite dependency of the main executable to bundled Frameworks
@@ -238,7 +236,7 @@ rewrite_exe_dep "libmysqlclient"
 rewrite_exe_dep "libpq"
 rewrite_exe_dep "libsqlite3"
 rewrite_exe_dep "libmariadb"
-
+rewrite_exe_dep "libssl.3"
 
 ### DOWNLOAD AND EXTRACT LOCALE FILES
 
diff --git a/source/dbconnection.pas b/source/dbconnection.pas
@@ -2456,7 +2456,7 @@ procedure TMySQLConnection.SetActive( Value: Boolean );
 
     if not GetLibDir.IsEmpty then begin
       // Point libmysql to the folder with client plugins
-      PluginDir := AnsiString(GetLibDir+'plugins');
+      PluginDir := AnsiString(GetLibDir);
       SetOption(FLib.MYSQL_PLUGIN_DIR, PAnsiChar(PluginDir));
     end;
 
diff --git a/source/dbstructures.mysql.pas b/source/dbstructures.mysql.pas
@@ -3134,6 +3134,8 @@ implementation
 
 
 constructor TMySQLLib.Create(UsedDllFile, HintDefaultDll: String);
+var
+  LibMajorVer: String;
 begin
   inherited;
   // MYSQL_OPT_* constants
@@ -3161,17 +3163,20 @@ constructor TMySQLLib.Create(UsedDllFile, HintDefaultDll: String);
     MYSQL_OPT_SSL_VERIFY_SERVER_CERT := 21;
     MARIADB_OPT_TLS_VERSION := 7005;
   end
-  else if String(mysql_get_client_info).StartsWith('8.') then begin
-    // Some constants were removed in MySQL 8.0, so the offsets differ
-    MYSQL_PLUGIN_DIR := 16;
-    MYSQL_OPT_SSL_KEY := 19;
-    MYSQL_OPT_SSL_CERT := 20;
-    MYSQL_OPT_SSL_CA := 21;
-    MYSQL_OPT_SSL_CIPHER := 23;
-    MYSQL_OPT_CONNECT_ATTR_ADD := 27;
-    MYSQL_ENABLE_CLEARTEXT_PLUGIN := 30;
-    MYSQL_OPT_TLS_VERSION := 34;
-    MYSQL_OPT_SSL_MODE := 35;
+  else begin
+    LibMajorVer := String(mysql_get_client_info);
+    if LibMajorVer.StartsWith('8.') or LibMajorVer.StartsWith('9.') then begin
+      // Some constants were removed in MySQL 8.0, so the offsets differ
+      MYSQL_PLUGIN_DIR := 16;
+      MYSQL_OPT_SSL_KEY := 19;
+      MYSQL_OPT_SSL_CERT := 20;
+      MYSQL_OPT_SSL_CA := 21;
+      MYSQL_OPT_SSL_CIPHER := 23;
+      MYSQL_OPT_CONNECT_ATTR_ADD := 27;
+      MYSQL_ENABLE_CLEARTEXT_PLUGIN := 30;
+      MYSQL_OPT_TLS_VERSION := 34;
+      MYSQL_OPT_SSL_MODE := 35;
+    end;
   end;
 end;
 
