Shift upgrade script to 4.7.10

Re run regen.sh

diff --git a/CRM/Upgrade/Incremental/sql/4.7.10.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.10.mysql.tpl
index 52e04cca5f9dfab2ea9e3faf83bc2644279d211c..a08076a12db9e91ff2c1523758ea4a9ca2a12879 100644 (file)
--- a/CRM/Upgrade/Incremental/sql/4.7.10.mysql.tpl
+++ b/CRM/Upgrade/Incremental/sql/4.7.10.mysql.tpl
@@ -21,3 +21,10 @@ 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-18651 Add in Data Type colum to option group table and set for some option groups
+ALTER TABLE civicrm_option_group
+ADD `data_type` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT 'Data Type of Option Group.';
+UPDATE civicrm_option_group SET `data_type` = 'Integer'
+WHERE name in ('activity_type', 'gender', 'payment_instrument', 'participant_role', 'event_type',
+  'activity_status',);

diff --git a/CRM/Upgrade/Incremental/sql/4.7.9.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.9.mysql.tpl
index 661d2b5766c133fa73ae278cf8300462fd0e170f..3be47b33cb8cb7c58a1467b34defa973c08fc571 100644 (file)
--- a/CRM/Upgrade/Incremental/sql/4.7.9.mysql.tpl
+++ b/CRM/Upgrade/Incremental/sql/4.7.9.mysql.tpl
@@ -62,10 +62,3 @@ INSERT INTO
   `civicrm_option_value` (`option_group_id`, {localize field='label'}label{/localize}, `value`, `name`, `grouping`, `filter`, `is_default`, `weight`, {localize field='description'}`description`{/localize}, `is_optgroup`, `is_reserved`, `is_active`, `component_id`, `visibility_id`)
 VALUES
 (@option_group_id_act, {localize}'{ts escape="sql"}Close Accounting Period{/ts}'{/localize}, @option_group_id_act_val+1, 'Close Accounting Period', NULL, 0, 0, @option_group_id_act_wt+1, {localize}'Close Accounting Period'{/localize}, 0, 1, 1, 2, NULL);
-
---CRM-18651 Add in Data Type colum to option group table and set for some option groups
-ALTER TABLE civicrm_option_group
-ADD `data_type` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT 'Data Type of Option Group.';
-UPDATE civicrm_option_group SET `data_type` = 'Integer'
-WHERE name in ('activity_type', 'gender', 'payment_instrument', 'participant_role', 'event_type',
-  'activity_status',);

diff --git a/sql/civicrm_generated.mysql b/sql/civicrm_generated.mysql
index b3e1698c2a3dd3c6f49e21d3c037ed7d0de24082..8740f203362736dc8a8dc6771e3bf5f23254c5be 100644 (file)
--- a/sql/civicrm_generated.mysql
+++ b/sql/civicrm_generated.mysql
@@ -1,9 +1,8 @@
 -- MySQL dump 10.13  Distrib 5.7.13, for Linux (x86_64)
 --
--- Host: 127.0.0.1    Database: 47democivi_u3rht
+-- Host: 127.0.0.1    Database: demodevciv_xcptl
 -- ------------------------------------------------------
 -- Server version      5.7.13-0ubuntu0.16.04.2
--- Server version      5.7.12-0ubuntu1
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;