From d98d1ae59928ba3239a73bab600e9308f4e05e74 Mon Sep 17 00:00:00 2001 From: Daniele Scasciafratte Date: Mon, 27 Jun 2022 15:52:58 +0200 Subject: [PATCH 1/5] feat(db): more verbosity on importing --- database/sql/import-sql.sh | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/database/sql/import-sql.sh b/database/sql/import-sql.sh index f4e9eeb62..cf8d899c5 100755 --- a/database/sql/import-sql.sh +++ b/database/sql/import-sql.sh @@ -72,6 +72,7 @@ IFS=$(echo -en "\n\b") # Parse through each file in the directory and use the file name to # import the SQL file into the database of the same name sql_count=$(ls -1 ./*.sql* 2>/dev/null | wc -l) +vvv_info " * Found ${sql_count} database dumps" if [ "$sql_count" != 0 ] then for file in $( ls ./*.sql* ) @@ -82,6 +83,15 @@ then db_name=$(basename "${file}" .sql.gz) fi + # skip these databases + [ "${db_name}" == "mysql" ] && continue; + [ "${db_name}" == "information_schema" ] && continue; + [ "${db_name}" == "performance_schema" ] && continue; + [ "${db_name}" == "sys" ] && continue; + [ "${db_name}" == "test" ] && continue; + + vvv_info " * Processing ${db_name} dump" + # if we specified databases, only restore specified ones if [[ "${#@}" -gt 0 ]]; then FOUND=0 @@ -96,13 +106,6 @@ then fi fi - # skip these databases - [ "${db_name}" == "mysql" ] && continue; - [ "${db_name}" == "information_schema" ] && continue; - [ "${db_name}" == "performance_schema" ] && continue; - [ "${db_name}" == "sys" ] && continue; - [ "${db_name}" == "test" ] && continue; - if [ "1" == "${FORCE_RESTORE}" ]; then vvv_info " * Forcing restore of ${db_name} database, and granting the wp user access" mysql -e "DROP DATABASE IF EXISTS \`${db_name}\`" @@ -121,6 +124,7 @@ then skip="true" fi done + for include in ${include_list[@]}; do if [ "${include}" == "${db_name}" ]; then skip="false" @@ -160,4 +164,6 @@ else vvv_success " * No custom databases to import" fi +vvv_success " * Database importing finished" + IFS=$SAVEIFS From b6d5fd4462cb8e3c84b142b348003435c1b3674f Mon Sep 17 00:00:00 2001 From: Daniele Scasciafratte Date: Mon, 27 Jun 2022 16:07:03 +0200 Subject: [PATCH 2/5] feat(db): more verbosity on importing --- config/homebin/db_backup | 4 +++- database/sql/import-sql.sh | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/config/homebin/db_backup b/config/homebin/db_backup index 43f6a6dd4..d66619d28 100755 --- a/config/homebin/db_backup +++ b/config/homebin/db_backup @@ -6,7 +6,9 @@ set -eo pipefail set -u -export VVV_LOG="" +if [ ! -v "$VVV_LOG" ]; then + export VVV_LOG="" +fi trap 'rm -rf $TMPFIFODIR' EXIT; TMPFIFODIR=$(mktemp -d); mkfifo $TMPFIFODIR/dbnames diff --git a/database/sql/import-sql.sh b/database/sql/import-sql.sh index cf8d899c5..0d1adcb4b 100755 --- a/database/sql/import-sql.sh +++ b/database/sql/import-sql.sh @@ -20,7 +20,9 @@ set -eo pipefail set -u -export VVV_LOG="" +if [ ! -v "$VVV_LOG" ]; then + export VVV_LOG="" +fi source /srv/provision/provision-helpers.sh From a47fb41e33c4c4e3fcdc076cbcaa41fda531364a Mon Sep 17 00:00:00 2001 From: Daniele Scasciafratte Date: Mon, 27 Jun 2022 16:12:14 +0200 Subject: [PATCH 3/5] feat(db): more verbosity on importing --- config/homebin/db_backup | 2 +- database/sql/import-sql.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/homebin/db_backup b/config/homebin/db_backup index d66619d28..92669d485 100755 --- a/config/homebin/db_backup +++ b/config/homebin/db_backup @@ -6,7 +6,7 @@ set -eo pipefail set -u -if [ ! -v "$VVV_LOG" ]; then +if [ -z "${VVV_LOG+x}" ]; then export VVV_LOG="" fi diff --git a/database/sql/import-sql.sh b/database/sql/import-sql.sh index 0d1adcb4b..3b87606da 100755 --- a/database/sql/import-sql.sh +++ b/database/sql/import-sql.sh @@ -20,7 +20,7 @@ set -eo pipefail set -u -if [ ! -v "$VVV_LOG" ]; then +if [ -z "${VVV_LOG+x}" ]; then export VVV_LOG="" fi From f5db4042d5f3a369ce7747188d147d394eec43f2 Mon Sep 17 00:00:00 2001 From: Daniele Scasciafratte Date: Mon, 11 Jul 2022 11:52:47 +0200 Subject: [PATCH 4/5] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7ca48daae..affca2b65 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ permalink: /docs/en-US/changelog/ * Improved provisioning output * VVV will now attempt to test Nginx configs on installation and recover ( #2604 ) * Switched to new launchpad PPA domains with HTTPS ( #2586 ) +* Improved verbosing in DB import ( #2621 ) ### Bug Fixes From 7db48c24d02571e9e5b7e2c0fe51dfc6f429b2f6 Mon Sep 17 00:00:00 2001 From: Tom J Nowell Date: Mon, 11 Jul 2022 12:23:42 +0100 Subject: [PATCH 5/5] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index affca2b65..b0ddc6e88 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,7 +13,7 @@ permalink: /docs/en-US/changelog/ * Improved provisioning output * VVV will now attempt to test Nginx configs on installation and recover ( #2604 ) * Switched to new launchpad PPA domains with HTTPS ( #2586 ) -* Improved verbosing in DB import ( #2621 ) +* Improved the verboseness of the DB import scripts ( #2621 ) ### Bug Fixes