From: Grzegorz Grzywna <grzywna.g@gmail.com>
Date: Thu, 28 Jul 2016 10:34:35 +0000 (+0200)
Subject: CRM-19134 - Missing French overseas departments.
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=55cdf47d7b82a09687414bb724b6f71f61e5c5e3;p=civicrm-core.git

CRM-19134 - Missing French overseas departments.
Moved db upgrade script to 4.7.11
---

diff --git a/CRM/Upgrade/Incremental/sql/4.7.10.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.10.mysql.tpl
index 1ac25be56c..844f3e4cef 100644
--- a/CRM/Upgrade/Incremental/sql/4.7.10.mysql.tpl
+++ b/CRM/Upgrade/Incremental/sql/4.7.10.mysql.tpl
@@ -21,11 +21,3 @@ INSERT INTO
    `civicrm_option_value` (`option_group_id`, {localize field='label'}label{/localize}, `value`, `name`, `grouping`, `filter`, `is_default`, `weight`, `is_optgroup`, `is_reserved`, `is_active`)
 VALUES
    (@option_group_id_ext, {localize}'{ts escape="sql"}odt{/ts}'{/localize}, @option_group_id_ext_val+1, 'odt', NULL, 0, 0, @option_group_id_ext_wt+1, 0, 1, 1);
-
--- CRM-19134 Missing French overseas departments.
-INSERT INTO civicrm_state_province (id, country_id, abbreviation, name) VALUES
-  (NULL, 1076, "GP", "Guadeloupe"),
-  (NULL, 1076, "MQ", "Martinique"),
-  (NULL, 1076, "GF", "Guyane"),
-  (NULL, 1076, "RE", "La Réunion"),
-  (NULL, 1076, "YT", "Mayotte");
diff --git a/CRM/Upgrade/Incremental/sql/4.7.11.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.11.mysql.tpl
index 2b22747a23..cec120984c 100644
--- a/CRM/Upgrade/Incremental/sql/4.7.11.mysql.tpl
+++ b/CRM/Upgrade/Incremental/sql/4.7.11.mysql.tpl
@@ -1 +1,9 @@
 {* file to handle db changes in 4.7.11 during upgrade *}
+
+-- CRM-19134 Missing French overseas departments.
+INSERT INTO civicrm_state_province (id, country_id, abbreviation, name) VALUES
+  (NULL, 1076, "GP", "Guadeloupe"),
+  (NULL, 1076, "MQ", "Martinique"),
+  (NULL, 1076, "GF", "Guyane"),
+  (NULL, 1076, "RE", "La Réunion"),
+  (NULL, 1076, "YT", "Mayotte");