diff options
| -rw-r--r-- | classes/dbupdater.php | 14 | ||||
| -rwxr-xr-x | update.php | 17 |
2 files changed, 16 insertions, 15 deletions
diff --git a/classes/dbupdater.php b/classes/dbupdater.php index 70cea881b..94307aea0 100644 --- a/classes/dbupdater.php +++ b/classes/dbupdater.php @@ -41,20 +41,20 @@ class DbUpdater { $this->pdo->beginTransaction(); foreach ($lines as $line) { + if (strpos($line, "--") !== 0 && $line) { - if ($html_output) - print "<pre>$line</pre>"; - else - print " * $line\n"; + if ($html_output) + print "<pre>$line</pre>"; + else + Debug::log("> $line"); - if (strpos($line, "--") !== 0 && $line) { try { $this->pdo->query($line); // PDO returns errors as exceptions now } catch (PDOException $e) { if ($html_output) { - print "<div class='text-error'>Error: " . implode(", ", $this->pdo->errorInfo()) . "</div>"; + print "<div class='text-error'>Error: " . $e->getMessage() . "</div>"; } else { - Debug::log("Error: " . implode(", ", $this->pdo->errorInfo())); + Debug::log("Error: " . $e->getMessage()); } $this->pdo->rollBack(); diff --git a/update.php b/update.php index 9526c839b..81a0ec725 100755 --- a/update.php +++ b/update.php @@ -320,40 +320,41 @@ } if (isset($options["update-schema"])) { - Debug::log("checking for updates (" . DB_TYPE . ")..."); + Debug::log("Checking for updates (" . DB_TYPE . ")..."); $updater = new DbUpdater(Db::pdo(), DB_TYPE, SCHEMA_VERSION); if ($updater->isUpdateRequired()) { - Debug::log("schema update required, version " . $updater->getSchemaVersion() . " to " . SCHEMA_VERSION); + Debug::log("Schema update required, version " . $updater->getSchemaVersion() . " to " . SCHEMA_VERSION); if (DB_TYPE == "mysql") Debug::Log("READ THIS: Due to MySQL limitations, your database is not completely protected while updating.\n". "Errors may put it in an inconsistent state requiring manual rollback.\nBACKUP YOUR DATABASE BEFORE CONTINUING."); + else + Debug::log("WARNING: please backup your database before continuing."); - Debug::log("WARNING: please backup your database before continuing."); Debug::log("Type 'yes' to continue."); if (read_stdin() != 'yes') exit; - print "Performing updates to version " . SCHEMA_VERSION . "...\n"; + Debug::log("Performing updates to version " . SCHEMA_VERSION); for ($i = $updater->getSchemaVersion() + 1; $i <= SCHEMA_VERSION; $i++) { - Debug::log(" * Updating to version $i..."); + Debug::log("* Updating to version $i..."); $result = $updater->performUpdateTo($i, false); if ($result) { - print " * Completed."; + Debug::log("* Completed."); } else { - print "One of the updates failed. Either retry the process or perform updates manually."; + Debug::log("One of the updates failed. Either retry the process or perform updates manually."); return; } } } else { - Debug::log("update not required."); + Debug::log("Update not required."); } } |