[2.0] DDC-325 - Fix Order of LOCATE to be LOCATE(needle, haystack [, offset])

lib/Doctrine/ORM/Query/AST/Functions/LocateFunction.php

@@ -47,8 +47,8 @@ class LocateFunction extends FunctionNode
     {
 
         return $sqlWalker->getConnection()->getDatabasePlatform()->getLocateExpression(
+            $sqlWalker->walkStringPrimary($this->secondStringPrimary), // its the other way around in platform
             $sqlWalker->walkStringPrimary($this->firstStringPrimary),
-            $sqlWalker->walkStringPrimary($this->secondStringPrimary),
             (($this->simpleArithmeticExpression)
                 ? $sqlWalker->walkSimpleArithmeticExpression($this->simpleArithmeticExpression)
                 : false

tests/Doctrine/Tests/ORM/Functional/QueryDqlFunctionTest.php

@@ -99,7 +99,7 @@ class QueryDqlFunctionTest extends \Doctrine\Tests\OrmFunctionalTestCase
 
     public function testFunctionLocate()
     {
-        $dql = "SELECT m, LOCATE(LOWER(m.name), 'e') AS loc, LOCATE(LOWER(m.name), 'e', 7) AS loc2 ".
+        $dql = "SELECT m, LOCATE('e', LOWER(m.name)) AS loc, LOCATE('e', LOWER(m.name), 7) AS loc2 ".
                "FROM Doctrine\Tests\Models\Company\CompanyManager m";
 
         $result = $this->_em->createQuery($dql)