CRM-14843 - fixes for upgrade script including INSERT IGNORE usage.

----------------------------------------
* CRM-14843:
  https://issues.civicrm.org/jira/browse/CRM-14843

diff --git a/CRM/Upgrade/Incremental/sql/4.5.alpha2.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.5.alpha2.mysql.tpl
index 7cc32cc7829497afeea0a8fb8547d6594775cfc4..053d253230b27bcb26bb1e5c0bed6c322ddfa9e5 100644 (file)
--- a/CRM/Upgrade/Incremental/sql/4.5.alpha2.mysql.tpl
+++ b/CRM/Upgrade/Incremental/sql/4.5.alpha2.mysql.tpl
@@ -15,9 +15,10 @@ UPDATE civicrm_dashboard
        WHERE civicrm_dashboard.fullscreen_url LIKE "%&%" AND civicrm_dashboard.fullscreen_url NOT LIKE "%?%";
 
 -- CRM-14843 Added States for Chile and Modify Santiago Metropolitan for consistency
-INSERT INTO civicrm_state_province (id, country_id, abbreviation, name) VALUES
-       (NULL, 1044, "LR", "Los Rios"),
-       (NULL, 1044, "AP", "Arica y Parinacota");
+INSERT IGNORE INTO civicrm_state_province (id, country_id, abbreviation, name) VALUES
+       (NULL, 1044, "LR",  "Los Rios"),
+       (NULL, 1044, "AP",  "Arica y Parinacota"),
+       (NULL, 1169, "AMA", "Amazonas");
 
 UPDATE civicrm_state_province
        SET name = "Santiago Metropolitan", abbreviation = "SM"