CRM-14903 fix REGEX to RLIKE

diff --git a/CRM/Upgrade/Incremental/sql/4.4.6.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.4.6.mysql.tpl
index 2641d8fcdad95b12cf73bda8064d5cecb1a6372c..ac6524d738bad0f3d2582124986bb65b3e9089dd 100644 (file)
--- a/CRM/Upgrade/Incremental/sql/4.4.6.mysql.tpl
+++ b/CRM/Upgrade/Incremental/sql/4.4.6.mysql.tpl
@@ -1,4 +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');
+CHANGE COLUMN `operator` `operator` ENUM('=','!=','>','<','>=','<=','IN','NOT IN','LIKE','NOT LIKE','IS NULL','IS NOT NULL', 'IS EMPTY', 'IS NOT EMPTY', 'RLIKE');

diff --git a/xml/schema/Core/MappingField.xml b/xml/schema/Core/MappingField.xml
index a2701795f2291782a0348e9cf9b1a1a80abbb175..6be8455784b5bf8f0542d4576b1428d32257bf64 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, IS EMPTY, IS NOT EMPTY, REGEX</values>
+       IN, NOT IN, LIKE, NOT LIKE, IS NULL, IS NOT NULL, IS EMPTY, IS NOT EMPTY, RLIKE</values>
        <comment>SQL WHERE operator for search-builder mapping fields (search criteria).</comment>
       <add>1.5</add>
   </field>