From e567b7937740b953d1cd811149940099735245f8 Mon Sep 17 00:00:00 2001 From: Seamus Lee Date: Thu, 21 Jul 2016 09:25:01 +1000 Subject: [PATCH] Shift upgrade script to 4.7.10 Re run regen.sh --- CRM/Upgrade/Incremental/sql/4.7.10.mysql.tpl | 7 +++++++ CRM/Upgrade/Incremental/sql/4.7.9.mysql.tpl | 7 ------- sql/civicrm_generated.mysql | 3 +-- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/CRM/Upgrade/Incremental/sql/4.7.10.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.10.mysql.tpl index 52e04cca5f..a08076a12d 100644 --- 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 661d2b5766..3be47b33cb 100644 --- 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 b3e1698c2a..8740f20336 100644 --- 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 */; -- 2.25.1