[2.0] DDC-478 - Fix QueryBuilder Expr\Between Support

lib/Doctrine/ORM/Query/Expr.php

@@ -544,7 +544,7 @@ class Expr
      */
     public function between($val, $x, $y)
     {
-        return new Expr\Func('BETWEEN', array($val, $x, $y));
+        return $val . ' BETWEEN ' . $x . ' AND ' . $y;
     }
 
     /**

tests/Doctrine/Tests/ORM/Query/ExprTest.php

@@ -232,7 +232,7 @@ class ExprTest extends \Doctrine\Tests\OrmTestCase
 
     public function testBetweenExpr()
     {
-        $this->assertEquals('BETWEEN(u.id, 3, 6)', (string) $this->_expr->between('u.id', 3, 6));
+        $this->assertEquals('u.id BETWEEN 3 AND 6', (string) $this->_expr->between('u.id', 3, 6));
     }
 
     public function testTrimExpr()