From fbe9dde4a11b845d6b1a7b94a9a4c11bb61f09a9 Mon Sep 17 00:00:00 2001
From: Dave Conroy <dave@tiredofit.ca>
Date: Wed, 23 Mar 2022 07:57:28 -0700
Subject: [PATCH] Release 3.0.16 - See CHANGELOG.md

---
 CHANGELOG.md                          |  6 ++++++
 install/assets/functions/10-db-backup | 15 +++++++--------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 904f7a9..a638b7a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 3.0.16 2022-03-23 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Fix for SPLIT_DB not looping through all databse names properly
+
+
 ## 3.0.15 2022-03-22 <dave at tiredofit dot ca>
 
    ### Changed
diff --git a/install/assets/functions/10-db-backup b/install/assets/functions/10-db-backup
index a0faed0..775fb1f 100755
--- a/install/assets/functions/10-db-backup
+++ b/install/assets/functions/10-db-backup
@@ -139,16 +139,15 @@ backup_mysql() {
     fi
     if var_true "${SPLIT_DB}" ; then
         DATABASES=$(mysql -h ${dbhost} -P $dbport -u$dbuser --batch -e "SHOW DATABASES;" | grep -v Database | grep -v schema)
-        for db in "${DATABASES}" ; do
+        print_debug "Backing up everything except for information_schema and _* prefixes"
+        print_debug "Databases Found: ${DATABASES}"
+        for db in ${DATABASES} ; do
                 if [[ "$db" != "information_schema" ]] && [[ "$db" != _* ]] ; then
-                    print_debug "Backing up everything except for information_schema and _* prefixes"
                     print_notice "Dumping MySQL/MariaDB database: '${db}'"
                     target=mysql_${db}_${dbhost}_${now}.sql
                     compression
-                    set -x
                     mysqldump --max-allowed-packet=${MYSQL_MAX_ALLOWED_PACKET} -h $dbhost -P $dbport -u$dbuser ${single_transaction} ${stored_procedures} ${EXTRA_OPTS} --databases $db | $compress_cmd > "${TEMP_LOCATION}"/"${target}"
                     exit_code=$?
-                    set +x
                     check_exit_code
                     generate_checksum
                     move_backup
@@ -168,11 +167,11 @@ backup_mysql() {
 backup_pgsql() {
   export PGPASSWORD=${dbpass}
   if var_true "${SPLIT_DB}" ; then
-
       authdb=${DB_USER}
       [ -n "${DB_NAME}" ] && authdb=${DB_NAME}
-      DATABASES=$(psql -h $dbhost -U $dbuser -p ${dbport} -d ${authdb} -c 'COPY (SELECT datname FROM pg_database WHERE datistemplate = false) TO STDOUT;' )
-            for db in "${DATABASES}"; do
+            DATABASES=$(psql -h $dbhost -U $dbuser -p ${dbport} -d ${authdb} -c 'COPY (SELECT datname FROM pg_database WHERE datistemplate = false) TO STDOUT;' )
+            print_debug "Databases Found: ${DATABASES}"
+            for db in $DATABASES ; do
                 print_notice "Dumping Postgresql database: $db"
                 target=pgsql_${db}_${dbhost}_${now}.sql
                 compression
@@ -184,7 +183,7 @@ backup_pgsql() {
             done
   else
       compression
-      print_notice "Dumping PostgreSQL: '${DB_NAME}'"
+      print_notice "Dumping PostgreSQL database: '${DB_NAME}'"
       pg_dump -h ${dbhost} -U ${dbuser} -p ${dbport} ${dbname} ${EXTRA_OPTS} | $compress_cmd > ${TEMP_LOCATION}/${target}
       exit_code=$?
       check_exit_code