From 2977b4c0dc420acf102e051c000a6807fc97a928 Mon Sep 17 00:00:00 2001
From: Marcel <ms290498@gmail.com>
Date: Thu, 24 Oct 2024 20:02:59 +0200
Subject: [PATCH 1/2] Update database.sh

replaced mysql command with mariadb command because mariadb docker image doesnt ship with mysql anymore
---
 bin/database.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/database.sh b/bin/database.sh
index a40de61..c04e2ae 100755
--- a/bin/database.sh
+++ b/bin/database.sh
@@ -83,7 +83,7 @@ EOT
 }
 
 check_db_access(){
-    docker compose exec -T mysql su -c "mysql -uroot -p${MYSQL_ROOT_PASSWORD} -e 'status'" >/dev/null 2>&1
+    docker compose exec -T mysql su -c "mariadb -uroot --password=${MYSQL_ROOT_PASSWORD} -e 'status'" >/dev/null 2>&1
     if [ ${?} != 0 ]; then
         echo '[X] DB access failed, please check!'
         exit 1
@@ -107,7 +107,7 @@ check_db_not_exist(){
 }
 
 db_setup(){  
-    docker compose exec -T mysql su -c 'mysql -uroot -p${MYSQL_ROOT_PASSWORD} \
+    docker compose exec -T mysql su -c 'mariadb -uroot --password=${MYSQL_ROOT_PASSWORD} \
     -e "CREATE DATABASE '${SQL_DB}';" \
     -e "GRANT ALL PRIVILEGES ON '${SQL_DB}'.* TO '${SQL_USER}'@'${ANY}' IDENTIFIED BY '${SQL_PASS}';" \
     -e "FLUSH PRIVILEGES;"'
@@ -123,7 +123,7 @@ db_delete(){
         SQL_USER="${SQL_DB}"
     fi
     check_db_not_exist ${SQL_DB}
-    docker compose exec -T mysql su -c 'mysql -uroot -p${MYSQL_ROOT_PASSWORD} \
+    docker compose exec -T mysql su -c 'mariadb -uroot --password=${MYSQL_ROOT_PASSWORD} \
         -e "DROP DATABASE IF EXISTS '${SQL_DB}';" \
         -e "DROP USER IF EXISTS '${SQL_USER}'@'${ANY}';" \
         -e "FLUSH PRIVILEGES;"'

From e2f3df1867387637b19105bbdab555a95385a609 Mon Sep 17 00:00:00 2001
From: "E.L." <eric780217@gmail.com>
Date: Fri, 25 Oct 2024 13:49:59 +0800
Subject: [PATCH 2/2] Revert "Update database.sh"

---
 bin/database.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/database.sh b/bin/database.sh
index c04e2ae..a40de61 100755
--- a/bin/database.sh
+++ b/bin/database.sh
@@ -83,7 +83,7 @@ EOT
 }
 
 check_db_access(){
-    docker compose exec -T mysql su -c "mariadb -uroot --password=${MYSQL_ROOT_PASSWORD} -e 'status'" >/dev/null 2>&1
+    docker compose exec -T mysql su -c "mysql -uroot -p${MYSQL_ROOT_PASSWORD} -e 'status'" >/dev/null 2>&1
     if [ ${?} != 0 ]; then
         echo '[X] DB access failed, please check!'
         exit 1
@@ -107,7 +107,7 @@ check_db_not_exist(){
 }
 
 db_setup(){  
-    docker compose exec -T mysql su -c 'mariadb -uroot --password=${MYSQL_ROOT_PASSWORD} \
+    docker compose exec -T mysql su -c 'mysql -uroot -p${MYSQL_ROOT_PASSWORD} \
     -e "CREATE DATABASE '${SQL_DB}';" \
     -e "GRANT ALL PRIVILEGES ON '${SQL_DB}'.* TO '${SQL_USER}'@'${ANY}' IDENTIFIED BY '${SQL_PASS}';" \
     -e "FLUSH PRIVILEGES;"'
@@ -123,7 +123,7 @@ db_delete(){
         SQL_USER="${SQL_DB}"
     fi
     check_db_not_exist ${SQL_DB}
-    docker compose exec -T mysql su -c 'mariadb -uroot --password=${MYSQL_ROOT_PASSWORD} \
+    docker compose exec -T mysql su -c 'mysql -uroot -p${MYSQL_ROOT_PASSWORD} \
         -e "DROP DATABASE IF EXISTS '${SQL_DB}';" \
         -e "DROP USER IF EXISTS '${SQL_USER}'@'${ANY}';" \
         -e "FLUSH PRIVILEGES;"'