From f3800cf8c585be80abdd661b5b3366df577d26b4 Mon Sep 17 00:00:00 2001 From: kurund Date: Fri, 7 Feb 2014 17:02:41 -0800 Subject: [PATCH] CRM-14181 fixes - migrate enums to varchar in schema for all tables http://issues.civicrm.org/jira/browse/CRM-14181 --- CRM/Upgrade/Incremental/sql/4.5.alpha1.mysql.tpl | 5 +++++ xml/schema/Mailing/BounceType.xml | 4 ++-- xml/schema/Mailing/Component.xml | 4 ++-- xml/schema/Mailing/Mailing.xml | 4 ++-- xml/schema/Mailing/MailingGroup.xml | 4 ++-- xml/schema/Mailing/MailingJob.xml | 4 ++-- 6 files changed, 15 insertions(+), 10 deletions(-) diff --git a/CRM/Upgrade/Incremental/sql/4.5.alpha1.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.5.alpha1.mysql.tpl index f0ce4787e0..ce7c4305c0 100644 --- a/CRM/Upgrade/Incremental/sql/4.5.alpha1.mysql.tpl +++ b/CRM/Upgrade/Incremental/sql/4.5.alpha1.mysql.tpl @@ -208,4 +208,9 @@ ALTER TABLE `civicrm_membership_status` CHANGE `start_event` `start_event` VA 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.'; +ALTER TABLE `civicrm_mailing_job` CHANGE `status` `status` VARCHAR( 12 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL COMMENT 'The state of this job'; +ALTER TABLE `civicrm_mailing_group` CHANGE `group_type` `group_type` VARCHAR( 8 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL COMMENT 'Are the members of the group included or excluded?.'; +ALTER TABLE `civicrm_mailing` CHANGE `visibility` `visibility` VARCHAR( 40 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT 'User and User Admin Only' COMMENT 'In what context(s) is the mailing contents visible (online viewing)'; +ALTER TABLE `civicrm_mailing_component` CHANGE `component_type` `component_type` VARCHAR( 12 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL COMMENT 'Type of Component.'; +ALTER TABLE `civicrm_mailing_bounce_type` CHANGE `name` `name` VARCHAR( 8 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL COMMENT 'Type of bounce'; diff --git a/xml/schema/Mailing/BounceType.xml b/xml/schema/Mailing/BounceType.xml index e061e12725..913194885e 100644 --- a/xml/schema/Mailing/BounceType.xml +++ b/xml/schema/Mailing/BounceType.xml @@ -16,8 +16,8 @@ name - enum - AOL, Away, DNS, Host, Inactive, Invalid, Loop, Quota, Relay, Spam, Syntax, Unknown + varchar + 8 true Type of bounce diff --git a/xml/schema/Mailing/Component.xml b/xml/schema/Mailing/Component.xml index e3158182f0..63e94a7085 100644 --- a/xml/schema/Mailing/Component.xml +++ b/xml/schema/Mailing/Component.xml @@ -23,8 +23,8 @@ component_type - enum - Header, Footer, Subscribe, Welcome, Unsubscribe, OptOut, Reply, Resubscribe + varchar + 12 Type of Component. Select diff --git a/xml/schema/Mailing/Mailing.xml b/xml/schema/Mailing/Mailing.xml index 720a457ba5..21eead08d7 100644 --- a/xml/schema/Mailing/Mailing.xml +++ b/xml/schema/Mailing/Mailing.xml @@ -298,8 +298,8 @@ visibility - enum - User and User Admin Only,Public Pages + varchar + 40 'User and User Admin Only' In what context(s) is the mailing contents visible (online viewing) 3.3 diff --git a/xml/schema/Mailing/MailingGroup.xml b/xml/schema/Mailing/MailingGroup.xml index ea71720b08..cab52163dc 100644 --- a/xml/schema/Mailing/MailingGroup.xml +++ b/xml/schema/Mailing/MailingGroup.xml @@ -29,8 +29,8 @@ group_type - enum - Include, Exclude, Base + varchar + 8 Are the members of the group included or excluded?. Select diff --git a/xml/schema/Mailing/MailingJob.xml b/xml/schema/Mailing/MailingJob.xml index d4f4663cac..51dc63ff93 100644 --- a/xml/schema/Mailing/MailingJob.xml +++ b/xml/schema/Mailing/MailingJob.xml @@ -44,8 +44,8 @@ status - enum - Scheduled, Running, Complete, Paused, Canceled + varchar + 12 The state of this job Select -- 2.25.1