From: Eileen McNaughton <eileen@fuzion.co.nz>
Date: Tue, 24 Jun 2014 01:44:28 +0000 (+1200)
Subject: CRM-14903 fix REGEX to RLIKE
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=181842442dfb9a90196fe0027163c399af30adb8;p=civicrm-core.git

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 2641d8fcda..ac6524d738 100644
--- 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 a2701795f2..6be8455784 100644
--- 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>