From 5559162a97d504b2f8c0541d6ce5ee78f3cfaadc Mon Sep 17 00:00:00 2001 From: Dave Greenberg Date: Fri, 20 Jun 2014 09:24:35 -0700 Subject: [PATCH] CRM-14843 - fixes for upgrade script including INSERT IGNORE usage. ---------------------------------------- * CRM-14843: https://issues.civicrm.org/jira/browse/CRM-14843 --- CRM/Upgrade/Incremental/sql/4.5.alpha2.mysql.tpl | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/CRM/Upgrade/Incremental/sql/4.5.alpha2.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.5.alpha2.mysql.tpl index 7cc32cc782..053d253230 100644 --- 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" -- 2.25.1