From bfac24170eee54f72214790d85c2cbd64120f0e6 Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Sun, 2 Mar 2025 21:30:16 +0100
Subject: [PATCH] Use mariadb client

---
 photoprism/rootfs/etc/cont-init.d/99-run.sh | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/photoprism/rootfs/etc/cont-init.d/99-run.sh b/photoprism/rootfs/etc/cont-init.d/99-run.sh
index eeb4172b1..ebd1d71b0 100755
--- a/photoprism/rootfs/etc/cont-init.d/99-run.sh
+++ b/photoprism/rootfs/etc/cont-init.d/99-run.sh
@@ -29,8 +29,10 @@ case $(bashio::config 'DB_TYPE') in
         pip install pymysql &>/dev/null || true
 
         # Use values
+        mariadb_host="$(bashio::services 'mysql' 'host')"
+        mariadb_port="$(bashio::services 'mysql' 'port')"
         PHOTOPRISM_DATABASE_DRIVER="mysql"
-        PHOTOPRISM_DATABASE_SERVER="$(bashio::services 'mysql' 'host'):$(bashio::services 'mysql' 'port')"
+        PHOTOPRISM_DATABASE_SERVER="$mariadb_host:$mariadb_port"
         PHOTOPRISM_DATABASE_NAME="photoprism"
         PHOTOPRISM_DATABASE_USER="$(bashio::services 'mysql' 'username')"
         PHOTOPRISM_DATABASE_PASSWORD="$(bashio::services 'mysql' 'password')"
@@ -58,9 +60,18 @@ case $(bashio::config 'DB_TYPE') in
         bashio::log.warning "Uninstalling the MariaDB addon will remove any data"
 
         # Create database
-        mysql ----ssl=0 --host="$(bashio::services 'mysql' 'host')" --port="$(bashio::services 'mysql' 'port')" --user="$PHOTOPRISM_DATABASE_USER" --password="$PHOTOPRISM_DATABASE_PASSWORD" -e"CREATE DATABASE IF NOT EXISTS $PHOTOPRISM_DATABASE_NAME;"
+        /usr/bin/mariadb \
+        -u "$PHOTOPRISM_DATABASE_USER" -p "$PHOTOPRISM_DATABASE_PASSWORD" \
+        -h "${mariadb_host}" -P "${mariadb_port}" \
+        --skip-ssl \
+        -e "CREATE DATABASE IF NOT EXISTS $PHOTOPRISM_DATABASE_NAME;"
+        
         # Force character set
-        mysql ----ssl=0 --host="$(bashio::services 'mysql' 'host')" --port="$(bashio::services 'mysql' 'port')" --user="$PHOTOPRISM_DATABASE_USER" --password="$PHOTOPRISM_DATABASE_PASSWORD" -e"ALTER DATABASE $PHOTOPRISM_DATABASE_NAME CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci;" || true
+        /usr/bin/mariadb \
+        -u "$PHOTOPRISM_DATABASE_USER" -p "$PHOTOPRISM_DATABASE_PASSWORD" \
+        -h "${mariadb_host}" -P "${mariadb_port}" \
+        --skip-ssl \
+        -e "ALTER DATABASE $PHOTOPRISM_DATABASE_NAME CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci;" || true
         ;;
 esac