From 4ba5a6516b841e706620287a248e8a03d02cdb19 Mon Sep 17 00:00:00 2001
From: Kay0u <pierre@kayou.io>
Date: Thu, 18 Mar 2021 14:50:44 +0100
Subject: [PATCH] fix helpers

---
 scripts/_ynh_mysql_connect_as.sh |  2 ++
 scripts/_ynh_mysql_dump_db.sh    | 13 ++++++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/scripts/_ynh_mysql_connect_as.sh b/scripts/_ynh_mysql_connect_as.sh
index 0176800..a22963e 100644
--- a/scripts/_ynh_mysql_connect_as.sh
+++ b/scripts/_ynh_mysql_connect_as.sh
@@ -28,6 +28,8 @@ ynh_mysql_connect_as() {
     if [ -n "$default_character_set" ]
     then
         default_character_set="--default-character-set=$default_character_set"
+    else
+        default_character_set="--default-character-set=latin1"
     fi
 
     mysql --user="$user" --password="$password" "$default_character_set" --batch "$database"
diff --git a/scripts/_ynh_mysql_dump_db.sh b/scripts/_ynh_mysql_dump_db.sh
index 743c96a..387a7e3 100644
--- a/scripts/_ynh_mysql_dump_db.sh
+++ b/scripts/_ynh_mysql_dump_db.sh
@@ -5,7 +5,7 @@
 # example: ynh_mysql_dump_db --database=roundcube --default_character_set="utf8mb4" > ./dump.sql
 #
 # usage: ynh_mysql_dump_db --database=database
-# | arg: -d, --database=    - the database name to dump
+# | arg: -d, --database=                    - the database name to dump
 # | arg: -c, --default_character_set=       - the charset to use
 # | ret: the mysqldump output
 #
@@ -23,7 +23,14 @@ ynh_mysql_dump_db() {
     if [ -n "$default_character_set" ]
     then
         default_character_set="--default-character-set=$default_character_set"
+    else
+        # By default, default character set is "latin1"
+        default_character_set="--default-character-set=latin1"
+    fi
+    
+    if [ -f "$MYSQL_ROOT_PWD_FILE" ]; then
+        mysqldump --user="root" --password="$(cat $MYSQL_ROOT_PWD_FILE)" --single-transaction --skip-dump-date "$default_character_set" "$database"
+    else
+        mysqldump --single-transaction --skip-dump-date "$default_character_set" "$database"
     fi
-
-    mysqldump --user="root" --password="$(cat $MYSQL_ROOT_PWD_FILE)" --single-transaction --skip-dump-date "$default_character_set" "$database"
 }
\ No newline at end of file