From 24a2e537ceedded5a658ab36363d4c82998669bb Mon Sep 17 00:00:00 2001 From: John Kingsnorth Date: Mon, 23 Jul 2018 17:01:22 +0100 Subject: [PATCH] dev/core#131 Stop Monmouthshire from breaking upgrades --- CRM/Upgrade/Incremental/sql/5.3.alpha1.mysql.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CRM/Upgrade/Incremental/sql/5.3.alpha1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.3.alpha1.mysql.tpl index cb1a7511c1..7c05f9ecaa 100644 --- a/CRM/Upgrade/Incremental/sql/5.3.alpha1.mysql.tpl +++ b/CRM/Upgrade/Incremental/sql/5.3.alpha1.mysql.tpl @@ -11,7 +11,7 @@ UPDATE civicrm_custom_field SET is_searchable = 0 WHERE is_required IS NULL; ALTER TABLE civicrm_custom_field ALTER column is_active SET DEFAULT 1; SET @UKCountryId = (SELECT id FROM civicrm_country cc WHERE cc.name = 'United Kingdom'); -INSERT INTO civicrm_state_province (country_id, abbreviation, name) +INSERT IGNORE INTO civicrm_state_province (country_id, abbreviation, name) VALUES (@UKCountryId, 'MON', 'Monmouthshire'); {* dev/core/#152 *} -- 2.25.1