From c3fe4b0224859fbdc8d1109e93dbefb1c401a2b5 Mon Sep 17 00:00:00 2001 From: Sarjuuk Date: Sat, 16 Jan 2016 10:34:57 +0100 Subject: [PATCH] Setup/Update * get files/tables, which need to be regenerated after! applying sql updates * small wording change, to make exiting dbConfig feel less like an error occured --- setup/tools/clisetup/dbconfig.func.php | 2 +- setup/tools/clisetup/update.func.php | 17 ++++++++++++++--- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/setup/tools/clisetup/dbconfig.func.php b/setup/tools/clisetup/dbconfig.func.php index 9227e30a..c6e4c679 100644 --- a/setup/tools/clisetup/dbconfig.func.php +++ b/setup/tools/clisetup/dbconfig.func.php @@ -146,7 +146,7 @@ function dbconfig() else { CLISetup::log(); - CLISetup::log("db setup aborted", CLISetup::LOG_INFO); + CLISetup::log("leaving db setup...", CLISetup::LOG_INFO); break 2; } } diff --git a/setup/tools/clisetup/update.func.php b/setup/tools/clisetup/update.func.php index f2db5cd6..a67e7031 100644 --- a/setup/tools/clisetup/update.func.php +++ b/setup/tools/clisetup/update.func.php @@ -13,7 +13,7 @@ if (!CLI) function update() { - list($date, $part, $sql, $build) = array_values(DB::Aowow()->selectRow('SELECT `date`, `part`, `sql`, `build` FROM ?_dbversion')); + list($date, $part) = array_values(DB::Aowow()->selectRow('SELECT `date`, `part` FROM ?_dbversion')); CLISetup::log('checking sql updates'); @@ -56,8 +56,19 @@ function update() CLISetup::log($nFiles ? 'applied '.$nFiles.' update(s)' : 'db is already up to date', CLISetup::LOG_OK); - $sql = trim($sql) ? explode(' ', trim($sql)) : []; - $build = trim($build) ? explode(' ', trim($build)) : []; + // fetch sql/build after applying updates, as they may contain sync-prompts + list($sql, $build) = array_values(DB::Aowow()->selectRow('SELECT `sql`, `build` FROM ?_dbversion')); + + sleep(1); + + $sql = array_unique(explode(' ', trim($sql))); + $build = array_unique(explode(' ', trim($build))); + + if ($sql) + CLISetup::log('The following table(s) require syncing: '.implode(', ', $sql)); + + if ($build) + CLISetup::log('The following file(s) require syncing: '.implode(', ', $build)); return [$sql, $build]; }