Merge pull request #1929 from monishdeb/CRM-13712

CRM-13712 fix - DB Error on creating Smart Group with Is Empty and/or Not Empty operators via search builder

CRM/Upgrade/Incremental/sql/4.5.alpha1.mysql.tpl

@@ -49,3 +49,7 @@ VALUES
   (@option_group_id_contact_edit_options, {localize}'{ts escape="sql"}Middle Name{/ts}'{/localize} , 15, 'Middle Name' , NULL, 2, NULL, 15, NULL, 0, 0, 1, NULL, NULL),
   (@option_group_id_contact_edit_options, {localize}'{ts escape="sql"}Last Name{/ts}'{/localize}   , 16, 'Last Name'   , NULL, 2, NULL, 16, NULL, 0, 0, 1, NULL, NULL),
   (@option_group_id_contact_edit_options, {localize}'{ts escape="sql"}Suffix{/ts}'{/localize}      , 17, 'Suffix'      , NULL, 2, NULL, 17, NULL, 0, 0, 1, NULL, NULL);
+
+-- CRM-13712 Include IS NOT EMPTY and IS EMPTY operators in operator column of civicrm_mapping_field table
+ALTER TABLE `civicrm_mapping_field`
+  MODIFY `operator` ENUM('=','!=','>','<','>=','<=','IN','NOT IN','LIKE','NOT LIKE', 'IS NOT EMPTY', 'IS EMPTY') DEFAULT NULL COMMENT 'SQL WHERE operator for search-builder mapping fields (search criteria).';

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 NOT EMPTY, IS EMPTY</values>
        <comment>SQL WHERE operator for search-builder mapping fields (search criteria).</comment>
       <add>1.5</add>
   </field>