CRM-14903 alter enum field on civicrm_mapping_field to reflect allowed operators

diff --git a/CRM/Upgrade/Incremental/sql/4.4.6.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.4.6.mysql.tpl
index aff565eb13b5e786aacacf3f3799403caac2d533..2641d8fcdad95b12cf73bda8064d5cecb1a6372c 100644 (file)
--- a/CRM/Upgrade/Incremental/sql/4.4.6.mysql.tpl
+++ b/CRM/Upgrade/Incremental/sql/4.4.6.mysql.tpl
@@ -1 +1,4 @@
 {* file to handle db changes in 4.4.6 during upgrade *}
+-- CRM-14903
+ALTER TABLE `civicrm_mapping_field`
+CHANGE COLUMN `operator` `operator` ENUM('=','!=','>','<','>=','<=','IN','NOT IN','LIKE','NOT LIKE','IS NULL','IS NOT NULL', 'IS EMPTY', 'IS NOT EMPTY', 'REGEX');

diff --git a/xml/schema/Core/MappingField.xml b/xml/schema/Core/MappingField.xml
index 21882a9ee4611a6608fd02d41484828b0f1d2314..a2701795f2291782a0348e9cf9b1a1a80abbb175 100644 (file)
--- a/xml/schema/Core/MappingField.xml
+++ b/xml/schema/Core/MappingField.xml
@@ -130,7 +130,7 @@
        <name>operator</name>
        <type>enum</type>
        <values>&#61;, !&#61;, &#62;, &#60;, &#62;&#61;, &#60;&#61;,
-       IN, NOT IN, LIKE, NOT LIKE, IS NULL, IS NOT NULL</values>
+       IN, NOT IN, LIKE, NOT LIKE, IS NULL, IS NOT NULL, IS EMPTY, IS NOT EMPTY, REGEX</values>
        <comment>SQL WHERE operator for search-builder mapping fields (search criteria).</comment>
       <add>1.5</add>
   </field>