Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordiosmosis <benaka@piwik.pro>2015-03-02 07:10:36 +0300
committerdiosmosis <benaka@piwik.pro>2015-03-02 07:10:36 +0300
commitffb3390d93e623d632fc2ce2a6a4cc2927b1395a (patch)
tree5643c1c4ce8e48a40b901f99342113056a5d3991 /core/Columns
parented3917deb266e059f3b25937feba0b442298a231 (diff)
Rename UpdateListener to UpdateObserver and use in CLI update command to show progress of update. Also remove CLI output code from CoreUpdater\Controller::runUpdaterAndExit.
Diffstat (limited to 'core/Columns')
-rw-r--r--core/Columns/Updater.php8
1 files changed, 1 insertions, 7 deletions
diff --git a/core/Columns/Updater.php b/core/Columns/Updater.php
index 3de83592e8..093910a0f2 100644
--- a/core/Columns/Updater.php
+++ b/core/Columns/Updater.php
@@ -56,13 +56,7 @@ class Updater extends \Piwik\Updates
public static function doUpdate(PiwikUpdater $updater)
{
foreach (self::getMigrationQueries($updater) as $sql => $errorCode) {
- try {
- Db::exec($sql);
- } catch (\Exception $e) {
- if (!Db::get()->isErrNo($e, '1091') && !Db::get()->isErrNo($e, '1060')) {
- $updater->handleUpdateQueryError($e, $sql, false, __FILE__);
- }
- }
+ $updater->executeMigrationQuery($sql, $errorsToIgnore = array('1091', '1060'), __FILE__);
}
}