From be622acad23608da42b82f2df8690926d2b5f156 Mon Sep 17 00:00:00 2001 From: kurund Date: Fri, 7 Feb 2014 16:41:18 -0800 Subject: [PATCH] CRM-14181 fixes - migrate enums to varchar in schema for all tables http://issues.civicrm.org/jira/browse/CRM-14181 --- CRM/Campaign/BAO/Campaign.php | 2 +- CRM/Upgrade/Incremental/sql/4.5.alpha1.mysql.tpl | 14 ++++++++++++++ xml/schema/ACL/ACL.xml | 4 ++-- xml/schema/Campaign/CampaignGroup.xml | 4 ++-- xml/schema/Contact/ACLContactCache.xml | 4 ++-- xml/schema/Member/MembershipStatus.xml | 16 ++++++++-------- xml/schema/Member/MembershipType.xml | 8 ++++---- xml/schema/Pledge/Pledge.xml | 4 ++-- xml/schema/Price/PriceField.xml | 4 ++-- 9 files changed, 37 insertions(+), 23 deletions(-) diff --git a/CRM/Campaign/BAO/Campaign.php b/CRM/Campaign/BAO/Campaign.php index f3f227989c..9f5ad1a0b2 100644 --- a/CRM/Campaign/BAO/Campaign.php +++ b/CRM/Campaign/BAO/Campaign.php @@ -82,7 +82,7 @@ Class CRM_Campaign_BAO_Campaign extends CRM_Campaign_DAO_Campaign { $dao->campaign_id = $campaign->id; $dao->entity_table = $groupTableName; $dao->entity_id = $entityId; - $dao->group_type = 'include'; + $dao->group_type = 'Include'; $dao->save(); $dao->free(); } diff --git a/CRM/Upgrade/Incremental/sql/4.5.alpha1.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.5.alpha1.mysql.tpl index 4d90fd0547..f0ce4787e0 100644 --- a/CRM/Upgrade/Incremental/sql/4.5.alpha1.mysql.tpl +++ b/CRM/Upgrade/Incremental/sql/4.5.alpha1.mysql.tpl @@ -195,3 +195,17 @@ VALUES -- CRM-13970 UPDATE civicrm_navigation set url = 'civicrm/admin/options/from_email_address&reset=1' WHERE url LIKE 'civicrm/admin/options/from_email%'; UPDATE civicrm_navigation set url = CONCAT(SUBSTRING_INDEX(url, '&', 1), '&reset=1') WHERE url LIKE 'civicrm/admin/options/%'; + +-- CRM-14181 +ALTER TABLE civicrm_acl CHANGE operation operation VARCHAR( 8 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL COMMENT 'What operation does this ACL entry control?'; +ALTER TABLE civicrm_campaign_group CHANGE group_type group_type VARCHAR( 8 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL COMMENT 'Type of Group.'; +ALTER TABLE `civicrm_acl_contact_cache` CHANGE `operation` `operation` VARCHAR( 8 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL COMMENT 'What operation does this user have permission on?'; +ALTER TABLE `civicrm_price_field` CHANGE `html_type` `html_type` VARCHAR( 12 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL; +ALTER TABLE `civicrm_pledge` CHANGE `frequency_unit` `frequency_unit` VARCHAR( 8 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT 'month' COMMENT 'Time units for recurrence of pledge payments.'; +ALTER TABLE `civicrm_membership_type` CHANGE `duration_unit` `duration_unit` VARCHAR( 8 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL COMMENT 'Unit in which membership period is expressed.'; +ALTER TABLE `civicrm_membership_type` CHANGE `period_type` `period_type` VARCHAR( 8 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL COMMENT 'Rolling membership period starts on signup date. Fixed membership periods start on fixed_period_start_day.'; +ALTER TABLE `civicrm_membership_status` CHANGE `start_event` `start_event` VARCHAR( 12 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL COMMENT 'Event when this status starts.'; +ALTER TABLE `civicrm_membership_status` CHANGE `start_event_adjust_unit` `start_event_adjust_unit` VARCHAR( 8 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL COMMENT 'Unit used for adjusting from start_event.'; +ALTER TABLE `civicrm_membership_status` CHANGE `end_event` `end_event` VARCHAR( 12 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL COMMENT 'Event after which this status ends.'; +ALTER TABLE `civicrm_membership_status` CHANGE `end_event_adjust_unit` `end_event_adjust_unit` VARCHAR( 8 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL COMMENT 'Unit used for adjusting from the ending event.'; + diff --git a/xml/schema/ACL/ACL.xml b/xml/schema/ACL/ACL.xml index e555468ec4..fc00731c7e 100644 --- a/xml/schema/ACL/ACL.xml +++ b/xml/schema/ACL/ACL.xml @@ -61,8 +61,8 @@ operation - enum - All,View,Edit,Create,Delete,Grant,Revoke,Search + varchar + 8 true What operation does this ACL entry control? diff --git a/xml/schema/Campaign/CampaignGroup.xml b/xml/schema/Campaign/CampaignGroup.xml index a964d68c62..907b3d381e 100644 --- a/xml/schema/Campaign/CampaignGroup.xml +++ b/xml/schema/Campaign/CampaignGroup.xml @@ -40,8 +40,8 @@ group_type - enum - Include, Exclude + varchar + 8 NULL Type of Group. diff --git a/xml/schema/Contact/ACLContactCache.xml b/xml/schema/Contact/ACLContactCache.xml index 0dd4183d7c..a09df70e21 100644 --- a/xml/schema/Contact/ACLContactCache.xml +++ b/xml/schema/Contact/ACLContactCache.xml @@ -46,8 +46,8 @@ operation - enum - All,View,Edit,Create,Delete,Grant,Revoke + varchar + 8 true What operation does this user have permission on? 1.6 diff --git a/xml/schema/Member/MembershipStatus.xml b/xml/schema/Member/MembershipStatus.xml index 406947f67f..d214c4ed79 100644 --- a/xml/schema/Member/MembershipStatus.xml +++ b/xml/schema/Member/MembershipStatus.xml @@ -38,8 +38,8 @@ start_event - enum - start_date, end_date, join_date + varchar + 12 Event when this status starts. 1.5 @@ -48,8 +48,8 @@ start_event_adjust_unit - enum - day, month, year + varchar + 8 Unit used for adjusting from start_event. 1.5 @@ -64,8 +64,8 @@ end_event - enum - start_date, end_date, join_date + varchar + 12 Event after which this status ends. 1.5 @@ -74,8 +74,8 @@ end_event_adjust_unit - enum - day, month, year + varchar + 8 Unit used for adjusting from the ending event. 1.5 diff --git a/xml/schema/Member/MembershipType.xml b/xml/schema/Member/MembershipType.xml index 750f1cb122..8722b3ed02 100644 --- a/xml/schema/Member/MembershipType.xml +++ b/xml/schema/Member/MembershipType.xml @@ -106,8 +106,8 @@ duration_unit - enum - day, month, year, lifetime + varchar + 8 Unit in which membership period is expressed. 1.5 @@ -122,8 +122,8 @@ period_type - enum - rolling, fixed + varchar + 8 Rolling membership period starts on signup date. Fixed membership periods start on fixed_period_start_day. 1.5 diff --git a/xml/schema/Pledge/Pledge.xml b/xml/schema/Pledge/Pledge.xml index d4cd98446b..f6e4c6c20d 100644 --- a/xml/schema/Pledge/Pledge.xml +++ b/xml/schema/Pledge/Pledge.xml @@ -134,8 +134,8 @@ frequency_unit pledge_frequency_unit Pledge Frequency Unit - enum - day,week,month,year + varchar + 8 'month' Time units for recurrence of pledge payments. 2.1 diff --git a/xml/schema/Price/PriceField.xml b/xml/schema/Price/PriceField.xml index b57b459b9c..0e8e47b371 100644 --- a/xml/schema/Price/PriceField.xml +++ b/xml/schema/Price/PriceField.xml @@ -62,8 +62,8 @@ html_type - enum - Text, Select, Radio, CheckBox + varchar + 12 true 1.8 -- 2.25.1