From 0e0d2541889ad552f22b0b06e96583e8861ba830 Mon Sep 17 00:00:00 2001 From: Eric Date: Wed, 28 Nov 2018 14:41:08 +0100 Subject: [PATCH] =?UTF-8?q?:white=5Fcheck=5Fmark:=20N=C2=B01783=20-=20fix?= =?UTF-8?q?=20unit=20tests?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../search/criterionconversion/criteriontooql.class.inc.php | 2 +- test/application/search/CriterionConversionTest.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sources/application/search/criterionconversion/criteriontooql.class.inc.php b/sources/application/search/criterionconversion/criteriontooql.class.inc.php index ebc6a5b05..e3f9da26e 100644 --- a/sources/application/search/criterionconversion/criteriontooql.class.inc.php +++ b/sources/application/search/criterionconversion/criteriontooql.class.inc.php @@ -110,7 +110,7 @@ class CriterionToOQL extends CriterionConversionAbstract return null; } - return \CMDBSource::Quote($aValues[$iIndex]['value']); + return addslashes($aValues[$iIndex]['value']); } protected static function ContainsToOql($oSearch, $sRef, $aCriteria) diff --git a/test/application/search/CriterionConversionTest.php b/test/application/search/CriterionConversionTest.php index ccda37dfe..138f23d95 100644 --- a/test/application/search/CriterionConversionTest.php +++ b/test/application/search/CriterionConversionTest.php @@ -359,7 +359,7 @@ class CriterionConversionTest extends ItopDataTestCase ), 'string regexp' => array( 'OQL' => "SELECT Server WHERE name REGEXP '^dbserver[0-9]+\\\\\\\\..+\\\\\\\\.[a-z]{2,3}$'", - 'ExpectedOQL' => "SELECT `Server` FROM Server AS `Server` WHERE (`Server`.`name` REGEXP '^dbserver[0-9]+\\\\..+\\\\.[a-z]{2,3}$')", + 'ExpectedOQL' => "SELECT `Server` FROM Server AS `Server` WHERE (`Server`.`name` REGEXP '^dbserver[0-9]+\\\\\\\\..+\\\\\\\\.[a-z]{2,3}$')", 'ExpectedCriterion' => array(array('widget' => 'string', 'operator' => 'REGEXP')), ), 'enum + key =' => array(