projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b1a243c)
CRM-14181 fixes - migrate enums to varchar in schema for all tables
authorkurund <kurund@civicrm.org>
Sat, 8 Feb 2014 06:54:41 +0000 (22:54 -0800)
committerkurund <kurund@civicrm.org>
Sat, 8 Feb 2014 06:54:41 +0000 (22:54 -0800)
http://issues.civicrm.org/jira/browse/CRM-14181

CRM/Upgrade/Incremental/sql/4.5.alpha1.mysql.tpl patch | blob | blame | history
xml/schema/Core/MappingField.xml patch | blob | blame | history
xml/schema/Core/UFField.xml patch | blob | blame | history
xml/schema/Core/WordReplacement.xml patch | blob | blame | history
xml/schema/Dedupe/RuleGroup.xml patch | blob | blame | history
xml/schema/Event/ParticipantStatusType.xml patch | blob | blame | history

diff --git a/CRM/Upgrade/Incremental/sql/4.5.alpha1.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.5.alpha1.mysql.tpl
index 8d5d0584dc6362d3312183dcd521c22a4bc3af8b..4d1d1f9a99ce256b0312fd5444b40ba0f4b82e29 100644 (file)
--- a/CRM/Upgrade/Incremental/sql/4.5.alpha1.mysql.tpl
+++ b/CRM/Upgrade/Incremental/sql/4.5.alpha1.mysql.tpl
@@ -213,4 +213,11 @@ ALTER TABLE  `civicrm_mailing_group` CHANGE  `group_type`  `group_type` VARCHAR(
 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( 12 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL COMMENT  'Type of bounce';
+ALTER TABLE  `civicrm_participant_status_type` CHANGE  `class`  `class` VARCHAR( 8 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL COMMENT  'the general group of status type this one belongs to';
+ALTER TABLE  `civicrm_dedupe_rule_group` CHANGE  `contact_type`  `contact_type` VARCHAR( 12 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL COMMENT  'The type of contacts this group applies to';
+ALTER TABLE  `civicrm_dedupe_rule_group` CHANGE  `used`  `used` VARCHAR( 12 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL COMMENT 'Whether the rule should be used for cases where usage is Unsupervised, Supervised OR General(programatically)';
+ALTER TABLE  `civicrm_word_replacement` CHANGE  `match_type`  `match_type` VARCHAR( 16 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT  'wildcardMatch';
+ALTER TABLE  `civicrm_uf_field` CHANGE  `visibility`  `visibility` VARCHAR( 32 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT  'User and User Admin Only' COMMENT  'In what context(s) is this field visible.';
+ALTER TABLE  `civicrm_mapping_field` CHANGE  `operator`  `operator` VARCHAR( 16 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL COMMENT  'SQL WHERE operator for search-builder mapping fields (search criteria).';
+
 
diff --git a/xml/schema/Core/MappingField.xml b/xml/schema/Core/MappingField.xml
index 1094e08af1cf38d9ed14d4607c8844112ca44ff7..f679d844fde77bc00f809a11997d4f13b3eea38e 100644 (file)
--- a/xml/schema/Core/MappingField.xml
+++ b/xml/schema/Core/MappingField.xml
@@ -137,9 +137,9 @@
   </field>
   <field>
        <name>operator</name>
+       <type>varchar</type>
+       <length>16</length>
        <type>enum</type>
-       <values>&#61;, !&#61;, &#62;, &#60;, &#62;&#61;, &#60;&#61;,
-       IN, NOT IN, LIKE, NOT LIKE, IS NULL, IS NOT NULL, IS NOT EMPTY, IS EMPTY</values>
        <comment>SQL WHERE operator for search-builder mapping fields (search criteria).</comment>
       <add>1.5</add>
       <html>
diff --git a/xml/schema/Core/UFField.xml b/xml/schema/Core/UFField.xml
index c2ca6d33df9674ba7b9a463c67192f9d2d613cb0..ac7e5abc18f0a2bdbfac8924d239f1db27136202 100644 (file)
--- a/xml/schema/Core/UFField.xml
+++ b/xml/schema/Core/UFField.xml
@@ -109,8 +109,8 @@
   </field>
   <field>
        <name>visibility</name>
-       <type>enum</type>
-       <values>User and User Admin Only,Public Pages,Public Pages and Listings</values>
+       <type>varchar</type>
+       <length>32</length>
        <default>'User and User Admin Only'</default>
        <comment>In what context(s) is this field visible.</comment>
        <add>1.1</add>
diff --git a/xml/schema/Core/WordReplacement.xml b/xml/schema/Core/WordReplacement.xml
index 573579c1aa210764ce6a06bb91e5b6041aa7e46b..012c51adaf20cedc8ba7cd77096bf7e03b2f11cd 100644 (file)
--- a/xml/schema/Core/WordReplacement.xml
+++ b/xml/schema/Core/WordReplacement.xml
@@ -50,8 +50,8 @@
   </index>
   <field>
        <name>match_type</name>
-       <type>enum</type>
-       <values>wildcardMatch, exactMatch</values>
+       <type>varchar</type>
+       <length>16</length>
        <default>"wildcardMatch"</default>
        <add>4.4</add>
        <html>
diff --git a/xml/schema/Dedupe/RuleGroup.xml b/xml/schema/Dedupe/RuleGroup.xml
index 979c732e3ee92309307b426d96de2d66bf88ddcb..6ec09dce6730d0d2d0715f8e5f7b724fa80d4e42 100644 (file)
--- a/xml/schema/Dedupe/RuleGroup.xml
+++ b/xml/schema/Dedupe/RuleGroup.xml
@@ -18,8 +18,8 @@
   </primaryKey>
   <field>
     <name>contact_type</name>
-    <type>enum</type>
-    <values>Individual, Organization, Household</values>
+    <type>varchar</type>
+    <length>12</length>
     <comment>The type of contacts this group applies to</comment>
     <add>1.8</add>
     <html>
@@ -43,8 +43,8 @@
   </field>
   <field>
     <name>used</name>
-    <type>enum</type>
-    <values>Unsupervised, Supervised, General</values>
+    <type>varchar</type>
+    <length>12</length>
     <required>true</required>
     <comment>Whether the rule should be used for cases where usage is Unsupervised, Supervised OR General(programatically)</comment>
     <add>4.3</add>
diff --git a/xml/schema/Event/ParticipantStatusType.xml b/xml/schema/Event/ParticipantStatusType.xml
index 4bae143710f62f3c6d60de62c5a513fe2767a14b..c1449baa80d3868f57e8cc16c8e31d40f3864e7e 100644 (file)
--- a/xml/schema/Event/ParticipantStatusType.xml
+++ b/xml/schema/Event/ParticipantStatusType.xml
@@ -39,8 +39,8 @@
   </field>
   <field>
     <name>class</name>
-    <type>enum</type>
-    <values>Positive, Pending, Waiting, Negative</values>
+    <type>varchar</type>
+    <length>8</length>
     <comment>the general group of status type this one belongs to</comment>
     <add>3.0</add>
     <html>