diff options
| author | vipsoft <vipsoft@59fd770c-687e-43c8-a1e3-f5a4ff64c105> | 2009-12-12 01:53:55 +0300 |
|---|---|---|
| committer | vipsoft <vipsoft@59fd770c-687e-43c8-a1e3-f5a4ff64c105> | 2009-12-12 01:53:55 +0300 |
| commit | 82eae1fb7760f75ce92cf61848d9a197d8171549 (patch) | |
| tree | 07a64748315e49b09dc03d1ca7ef691fa646e867 /core/Updates | |
| parent | c9e093dbac84a3bdce920e4296575eb9ad1b4f86 (diff) | |
ignore 'ADD COLUMN' 1060 errors (column already exists) where user re-runs updater
Diffstat (limited to 'core/Updates')
| -rw-r--r-- | core/Updates/0.5.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/Updates/0.5.php b/core/Updates/0.5.php index 1ab94f1e98..ae80824df6 100644 --- a/core/Updates/0.5.php +++ b/core/Updates/0.5.php @@ -18,12 +18,12 @@ class Piwik_Updates_0_5 implements Piwik_iUpdate static function update() { Piwik_Updater::updateDatabase(__FILE__, array( - 'ALTER TABLE ' . Piwik::prefixTable('log_action') . ' ADD COLUMN `hash` INTEGER(10) UNSIGNED NOT NULL AFTER `name`;' => false, + 'ALTER TABLE ' . Piwik::prefixTable('log_action') . ' ADD COLUMN `hash` INTEGER(10) UNSIGNED NOT NULL AFTER `name`;' => '1060', 'ALTER TABLE ' . Piwik::prefixTable('log_visit') . ' CHANGE visit_exit_idaction visit_exit_idaction_url INTEGER(11) NOT NULL;' => false, 'ALTER TABLE ' . Piwik::prefixTable('log_visit') . ' CHANGE visit_entry_idaction visit_entry_idaction_url INTEGER(11) NOT NULL;' => false, 'ALTER TABLE ' . Piwik::prefixTable('log_link_visit_action') . ' CHANGE `idaction_ref` `idaction_url_ref` INTEGER(10) UNSIGNED NOT NULL;' => false, 'ALTER TABLE ' . Piwik::prefixTable('log_link_visit_action') . ' CHANGE `idaction` `idaction_url` INTEGER(10) UNSIGNED NOT NULL;' => false, - 'ALTER TABLE ' . Piwik::prefixTable('log_link_visit_action') . ' ADD COLUMN `idaction_name` INTEGER(10) UNSIGNED AFTER `idaction_url_ref`;' => false, + 'ALTER TABLE ' . Piwik::prefixTable('log_link_visit_action') . ' ADD COLUMN `idaction_name` INTEGER(10) UNSIGNED AFTER `idaction_url_ref`;' => '1060', 'ALTER TABLE ' . Piwik::prefixTable('log_conversion') . ' CHANGE `idaction` `idaction_url` INTEGER(11) UNSIGNED NOT NULL;' => false, 'UPDATE ' . Piwik::prefixTable('log_action') . ' SET `hash` = CRC32(name);' => false, 'CREATE INDEX index_type_hash ON ' . Piwik::prefixTable('log_action') . ' (type, hash);' => false, |