From 02ae7511070515bfcafe9090f8c8b7ca976236c3 Mon Sep 17 00:00:00 2001 From: "Matthew Wire (MJW Consulting)" Date: Fri, 1 Mar 2019 19:39:33 +0000 Subject: [PATCH] Don't abort if state_province already exists when upgrading --- CRM/Upgrade/Incremental/sql/4.7.30.mysql.tpl | 2 +- CRM/Upgrade/Incremental/sql/4.7.32.mysql.tpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CRM/Upgrade/Incremental/sql/4.7.30.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.30.mysql.tpl index bd097d6381..e9a748170c 100644 --- a/CRM/Upgrade/Incremental/sql/4.7.30.mysql.tpl +++ b/CRM/Upgrade/Incremental/sql/4.7.30.mysql.tpl @@ -12,5 +12,5 @@ INSERT INTO civicrm_mailing_bounce_pattern (bounce_type_id, pattern) VALUES (@bo -- CRM-21532 Add French state/departments SELECT @country_id := id from civicrm_country where name = 'France' AND iso_code = 'FR'; -INSERT INTO `civicrm_state_province` (`id`, `country_id`, `abbreviation`, `name`) VALUES +INSERT IGNORE INTO `civicrm_state_province` (`id`, `country_id`, `abbreviation`, `name`) VALUES (NULL, @country_id, "52", "Haute-Marne"); \ No newline at end of file diff --git a/CRM/Upgrade/Incremental/sql/4.7.32.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.32.mysql.tpl index 08267008b5..b542246f42 100644 --- a/CRM/Upgrade/Incremental/sql/4.7.32.mysql.tpl +++ b/CRM/Upgrade/Incremental/sql/4.7.32.mysql.tpl @@ -2,7 +2,7 @@ -- CRM-21837 - Missing states for Gabon SELECT @country_id := id from civicrm_country where name = 'Gabon' AND iso_code = 'GA'; -INSERT INTO `civicrm_state_province` (`id`, `country_id`, `abbreviation`, `name`) VALUES +INSERT IGNORE INTO `civicrm_state_province` (`id`, `country_id`, `abbreviation`, `name`) VALUES (NULL, @country_id, "01", "Estuaire"), (NULL, @country_id, "02", "Haut-Ogooué"), (NULL, @country_id, "03", "Moyen-Ogooué"), -- 2.25.1