CRM-16846 - Fix upgrade sql file skippage

diff --git a/CRM/Upgrade/Incremental/php/FourFour.php b/CRM/Upgrade/Incremental/php/FourFour.php
index c7a2f4c611bad05f0f554333c4bae9f8e53bfa1b..c6357d1cb3d464d75f36a745eac1d606ce818f18 100644 (file)
--- a/CRM/Upgrade/Incremental/php/FourFour.php
+++ b/CRM/Upgrade/Incremental/php/FourFour.php
@@ -307,6 +307,7 @@ ALTER TABLE civicrm_dashboard
 
     $dashboard = new CRM_Core_DAO_Dashboard();
     $dashboard->find();
+    $values = '';
     while ($dashboard->fetch()) {
       $urlElements = explode('/', $dashboard->url);
       if ($urlElements[1] == 'dashlet') {

diff --git a/CRM/Upgrade/Incremental/php/FourSix.php b/CRM/Upgrade/Incremental/php/FourSix.php
index ad644809f60375693d5b534552ee0711f1722ca9..f450153203202d7f7b76d92bdeb904517057ad2a 100644 (file)
--- a/CRM/Upgrade/Incremental/php/FourSix.php
+++ b/CRM/Upgrade/Incremental/php/FourSix.php
@@ -113,7 +113,11 @@ class CRM_Upgrade_Incremental_php_FourSix {
   }
 
   /**
-   * Upgrade function.
+   * CRM-16846 - This function incorrectly omits running the 4.6.alpha3 sql file.
+   *
+   * Instead of correcting it here (which would not run again for sites already on 4.6),
+   * the file is re-run conditionally during 4.6.6
+   * @see upgrade_4_6_6
    *
    * @param string $rev
    */
@@ -193,6 +197,22 @@ class CRM_Upgrade_Incremental_php_FourSix {
     $this->addTask(ts('Cleanup case type id data in log table.'), 'fixCaseLog');
   }
 
+  /**
+   * Upgrade function.
+   *
+   * @param string $rev
+   */
+  public function upgrade_4_6_6($rev) {
+    // CRM-16846 - This sql file may have been previously skipped. Conditionally run it again if it doesn't appear to have run before.
+    if (!CRM_Core_DAO::singleValueQuery("SELECT id FROM civicrm_state_province WHERE abbreviation = '100' AND country_id = 1193")) {
+      $this->addTask('Update Slovenian municipalities', 'task_4_6_x_runSql', '4.6.alpha3');
+    }
+    // CRM-16846 - This sql file may have been previously skipped. No harm in running it again because it's just UPDATE statements.
+    $this->addTask('State-province update from 4.4.7', 'task_4_6_x_runSql', '4.4.7');
+
+    $this->addTask(ts('Upgrade DB to %1: SQL', array(1 => $rev)), 'task_4_6_x_runSql', $rev);
+  }
+
   /**
    * Remove special characters from case_type_id column in log_civicrm_case.
    *

diff --git a/CRM/Upgrade/Incremental/sql/4.4.6.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.4.6.mysql.tpl
index ac6524d738bad0f3d2582124986bb65b3e9089dd..82916b9041a81261fc280cf1c0f09c964543727d 100644 (file)
--- a/CRM/Upgrade/Incremental/sql/4.4.6.mysql.tpl
+++ b/CRM/Upgrade/Incremental/sql/4.4.6.mysql.tpl
@@ -1,4 +1,5 @@
-{* file to handle db changes in 4.4.6 during upgrade *}
+{* CRM-16846 - This file is never run, but it doesn't matter because the below query is undone by another alteration to the same column in 4.5.alpha1 *}
+
 -- CRM-14903
 ALTER TABLE `civicrm_mapping_field`
 CHANGE COLUMN `operator` `operator` ENUM('=','!=','>','<','>=','<=','IN','NOT IN','LIKE','NOT LIKE','IS NULL','IS NOT NULL', 'IS EMPTY', 'IS NOT EMPTY', 'RLIKE');

diff --git a/CRM/Upgrade/Incremental/sql/4.5.9.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.5.9.mysql.tpl
index 7b1e227b2b0dc59640c26d918be0d9cd0307ff30..232ca048ac170fb6e89e1ca44e4e7333ec3fb989 100644 (file)
--- a/CRM/Upgrade/Incremental/sql/4.5.9.mysql.tpl
+++ b/CRM/Upgrade/Incremental/sql/4.5.9.mysql.tpl
@@ -1 +1 @@
-{* file to handle db changes in 4.5.9 during upgrade *}
+{* CRM-16846 - This file is never run, but it doesn't matter because it's empty *}

diff --git a/CRM/Upgrade/Incremental/sql/4.6.1.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.6.1.mysql.tpl
index a6fcc72357ac4b6020acb0e832cc23ada950cce8..232ca048ac170fb6e89e1ca44e4e7333ec3fb989 100644 (file)
--- a/CRM/Upgrade/Incremental/sql/4.6.1.mysql.tpl
+++ b/CRM/Upgrade/Incremental/sql/4.6.1.mysql.tpl
@@ -1 +1 @@
-{* file to handle db changes in 4.6.1 during upgrade *}
+{* CRM-16846 - This file is never run, but it doesn't matter because it's empty *}

diff --git a/CRM/Upgrade/Incremental/sql/4.6.6.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.6.6.mysql.tpl
index 32f4ceb709f4325721b8c1829f8a4ba904ca0b32..3da4eb64e2e37a9068e1df0b197eebef777b9099 100644 (file)
--- a/CRM/Upgrade/Incremental/sql/4.6.6.mysql.tpl
+++ b/CRM/Upgrade/Incremental/sql/4.6.6.mysql.tpl
@@ -1 +1,11 @@
 {* file to handle db changes in 4.6.6 during upgrade *}
+
+-- CRM-16846 - This upgrade may have been previously skipped so moving it to 4.6.6
+-- update permission for editing message templates (CRM-15819)
+
+SELECT @messages_menu_id := id FROM civicrm_navigation WHERE name = 'Mailings';
+
+UPDATE `civicrm_navigation`
+SET `permission` = 'edit message templates'
+WHERE `parent_id` = @messages_menu_id
+AND name = 'Message Templates';

diff --git a/CRM/Upgrade/Incremental/sql/4.6.alpha3.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.6.alpha3.mysql.tpl
index c1c1ec418c2a9628574e50388b9ae63c7b29d139..db3e8011428d7aed3fb1da003551026651eb9e42 100644 (file)
--- a/CRM/Upgrade/Incremental/sql/4.6.alpha3.mysql.tpl
+++ b/CRM/Upgrade/Incremental/sql/4.6.alpha3.mysql.tpl
@@ -1,12 +1,4 @@
-{* file to handle db changes in 4.6.alpha3 during upgrade *}
--- update permission for editing message templates (CRM-15819)
-
-SELECT @messages_menu_id := id FROM civicrm_navigation WHERE name = 'Mailings';
-
-UPDATE `civicrm_navigation` 
-SET `permission` = 'edit message templates'
-WHERE `parent_id` = @messages_menu_id
-AND name = 'Message Templates';
+{* CRM-16846 - This file may have been accidentally skipped and so is conditionally re-run during 4.6.6 upgrade *}
 
 -- Use proper names for Slovenian municipalities
 UPDATE `civicrm_state_province` SET `name` = (N'Ajdovščina') WHERE `id` = 4383;
@@ -70,63 +62,65 @@ UPDATE `civicrm_state_province` SET `name` = (N'Žirovnica') WHERE `id` = 4533;
 UPDATE `civicrm_state_province` SET `name` = (N'Žužemberk') WHERE `id` = 4534;
 
 -- Add missing Slovenian municipalities
-INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES (1193, "86", (N'Ankaran'));
-INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES (1193, "87", (N'Apače'));
-INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES (1193, "88", (N'Cirkulane'));
-INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES (1193, "89", (N'Gorje'));
-INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES (1193, "90", (N'Kostanjevica na Krki'));
-INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES (1193, "91", (N'Log-Dragomer'));
-INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES (1193, "92", (N'Makole'));
-INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES (1193, "93", (N'Mirna'));
-INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES (1193, "94", (N'Mokronog-Trebelno'));
-INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES (1193, "95", (N'Odranci'));
-INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES (1193, "96", (N'Oplotnica'));
-INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES (1193, "97", (N'Ormož'));
-INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES (1193, "98", (N'Osilnica'));
-INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES (1193, "99", (N'Pesnica'));
-INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES (1193, "100", (N'Piran'));
-INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES (1193, "101", (N'Pivka'));
-INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES (1193, "102", (N'Podčetrtek'));
-INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES (1193, "103", (N'Podlehnik'));
-INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES (1193, "104", (N'Podvelka'));
-INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES (1193, "105", (N'Poljčane'));
-INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES (1193, "106", (N'Polzela'));
-INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES (1193, "107", (N'Postojna'));
-INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES (1193, "108", (N'Prebold'));
-INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES (1193, "109", (N'Preddvor'));
-INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES (1193, "110", (N'Prevalje'));
-INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES (1193, "111", (N'Ptuj'));
-INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES (1193, "112", (N'Puconci'));
-INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES (1193, "113", (N'Rače-Fram'));
-INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES (1193, "114", (N'Radeče'));
-INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES (1193, "115", (N'Radenci'));
-INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES (1193, "139", (N'Radlje ob Dravi'));
-INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES (1193, "145", (N'Radovljica'));
-INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES (1193, "171", (N'Ravne na Koroškem'));
-INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES (1193, "172", (N'Razkrižje'));
-INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES (1193, "173", (N'Rečica ob Savinji'));
-INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES (1193, "174", (N'Renče-Vogrsko'));
-INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES (1193, "175", (N'Ribnica'));
-INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES (1193, "176", (N'Ribnica na Pohorju'));
-INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES (1193, "177", (N'Rogaška Slatina'));
-INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES (1193, "178", (N'Rogašovci'));
-INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES (1193, "179", (N'Rogatec'));
-INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES (1193, "180", (N'Ruše'));
-INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES (1193, "195", (N'Selnica ob Dravi'));
-INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES (1193, "196", (N'Semič'));
-INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES (1193, "197", (N'Šentrupert'));
-INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES (1193, "198", (N'Sevnica'));
-INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES (1193, "199", (N'Sežana'));
-INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES (1193, "200", (N'Slovenj Gradec'));
-INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES (1193, "201", (N'Slovenska Bistrica'));
-INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES (1193, "202", (N'Slovenske Konjice'));
-INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES (1193, "203", (N'Šmarješke Toplice'));
-INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES (1193, "204", (N'Sodražica'));
-INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES (1193, "205", (N'Solčava'));
-INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES (1193, "206", (N'Središče ob Dravi'));
-INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES (1193, "207", (N'Starše'));
-INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES (1193, "208", (N'Straža'));
-INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES (1193, "209", (N'Sveta Trojica v Slovenskih goricah'));
-INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES (1193, "210", (N'Sveti Jurij v Slovenskih goricah'));
-INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES (1193, "211", (N'Sveti Tomaž'));
-INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES (1193, "212", (N'Vodice'));
+INSERT INTO civicrm_state_province (country_id, abbreviation, name)
+VALUES
+  (1193, "86", "Ankaran"),
+  (1193, "87", "Apače"),
+  (1193, "88", "Cirkulane"),
+  (1193, "89", "Gorje"),
+  (1193, "90", "Kostanjevica na Krki"),
+  (1193, "91", "Log-Dragomer"),
+  (1193, "92", "Makole"),
+  (1193, "93", "Mirna"),
+  (1193, "94", "Mokronog-Trebelno"),
+  (1193, "95", "Odranci"),
+  (1193, "96", "Oplotnica"),
+  (1193, "97", "Ormož"),
+  (1193, "98", "Osilnica"),
+  (1193, "99", "Pesnica"),
+  (1193, "100", "Piran"),
+  (1193, "101", "Pivka"),
+  (1193, "102", "Podčetrtek"),
+  (1193, "103", "Podlehnik"),
+  (1193, "104", "Podvelka"),
+  (1193, "105", "Poljčane"),
+  (1193, "106", "Polzela"),
+  (1193, "107", "Postojna"),
+  (1193, "108", "Prebold"),
+  (1193, "109", "Preddvor"),
+  (1193, "110", "Prevalje"),
+  (1193, "111", "Ptuj"),
+  (1193, "112", "Puconci"),
+  (1193, "113", "Rače-Fram"),
+  (1193, "114", "Radeče"),
+  (1193, "115", "Radenci"),
+  (1193, "139", "Radlje ob Dravi"),
+  (1193, "145", "Radovljica"),
+  (1193, "171", "Ravne na Koroškem"),
+  (1193, "172", "Razkrižje"),
+  (1193, "173", "Rečica ob Savinji"),
+  (1193, "174", "Renče-Vogrsko"),
+  (1193, "175", "Ribnica"),
+  (1193, "176", "Ribnica na Pohorju"),
+  (1193, "177", "Rogaška Slatina"),
+  (1193, "178", "Rogašovci"),
+  (1193, "179", "Rogatec"),
+  (1193, "180", "Ruše"),
+  (1193, "195", "Selnica ob Dravi"),
+  (1193, "196", "Semič"),
+  (1193, "197", "Šentrupert"),
+  (1193, "198", "Sevnica"),
+  (1193, "199", "Sežana"),
+  (1193, "200", "Slovenj Gradec"),
+  (1193, "201", "Slovenska Bistrica"),
+  (1193, "202", "Slovenske Konjice"),
+  (1193, "203", "Šmarješke Toplice"),
+  (1193, "204", "Sodražica"),
+  (1193, "205", "Solčava"),
+  (1193, "206", "Središče ob Dravi"),
+  (1193, "207", "Starše"),
+  (1193, "208", "Straža"),
+  (1193, "209", "Sveta Trojica v Slovenskih goricah"),
+  (1193, "210", "Sveti Jurij v Slovenskih goricah"),
+  (1193, "211", "Sveti Tomaž"),
+  (1193, "212", "Vodice");