From 4cf63a4e83665ab674c2e95630f031490d6c42a6 Mon Sep 17 00:00:00 2001
From: Alexander <iam.asm89@gmail.com>
Date: Fri, 22 Jul 2011 14:48:20 +0200
Subject: [PATCH] [DDC-551] Fixed the escaping of filter parameters

---
 lib/Doctrine/ORM/Query/Filter/SQLFilter.php           | 3 +--
 tests/Doctrine/Tests/ORM/Functional/SQLFilterTest.php | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/Doctrine/ORM/Query/Filter/SQLFilter.php b/lib/Doctrine/ORM/Query/Filter/SQLFilter.php
index 16887fd4d..4ca31d64d 100644
--- a/lib/Doctrine/ORM/Query/Filter/SQLFilter.php
+++ b/lib/Doctrine/ORM/Query/Filter/SQLFilter.php
@@ -59,8 +59,7 @@ abstract class SQLFilter
             throw new \InvalidArgumentException("Parameter '" . $name . "' does not exist.");
         }
 
-        // @todo: espace the parameter
-        return $this->conn->convertToDatabaseValue($this->parameters[$name]['value'], $this->parameters[$name]['type']);
+        return $this->conn->quote($this->parameters[$name]['value'], $this->parameters[$name]['type']);
     }
 
     abstract function addFilterConstraint(ClassMetadata $targetEntity, $targetTableAlias);
diff --git a/tests/Doctrine/Tests/ORM/Functional/SQLFilterTest.php b/tests/Doctrine/Tests/ORM/Functional/SQLFilterTest.php
index 482ddb534..a58fef3bf 100644
--- a/tests/Doctrine/Tests/ORM/Functional/SQLFilterTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/SQLFilterTest.php
@@ -144,7 +144,7 @@ class SQLFilterTest extends \Doctrine\Tests\OrmFunctionalTestCase
         // Setup mock connection
         $conn = $this->getMockConnection();
         $conn->expects($this->once())
-            ->method('convertToDatabaseValue')
+            ->method('quote')
             ->with($this->equalTo('en'))
             ->will($this->returnValue("'en'"));