RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-04-03 13:23:37 +03:00
Code Issues Projects Releases Wiki Activity

[2.0] Removed *where*In methods from QueryBuilder. Finished decouple of QueryBuilder and Expr. Updated docs.

Browse source
This commit is contained in:
guilhermeblanco 2009-08-20 03:21:39 +00:00
parent 842267c11c
commit 74af8a28ae
2 changed files with 15 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
lib/Doctrine/ORM/QueryBuilder.php
View file

@ -27,15 +27,13 @@ use Doctrine\ORM\Query\Expr;
* This class is responsible for building DQL query strings via an object oriented * This class is responsible for building DQL query strings via an object oriented
* PHP interface. * PHP interface.
* *
* TODO: I don't like the API of using the Expr::*() syntax inside of the QueryBuilder * @license http://www.opensource.org/licenses/lgpl-license.php LGPL
* methods. What can we do to allow them to do it more fluently with the QueryBuilder. * @link www.doctrine-project.org
* * @since 2.0
* @author Jonathan H. Wage <jonwage@gmail.com> * @version $Revision$
* @author Roman Borschel <roman@code-factory.org> * @author Guilherme Blanco <guilhermeblanco@hotmail.com>
* @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @author Jonathan Wage <jonwage@gmail.com>
* @link http://www.doctrine-project.org * @author Roman Borschel <roman@code-factory.org>
* @since 2.0
* @version $Revision$
*/ */
class QueryBuilder class QueryBuilder
{ {
@ -313,34 +311,14 @@ class QueryBuilder
return $this->add('where', $where); return $this->add('where', $where);
} }
public function andWhereIn($expr, $params)
{
return $this->andWhere(Expr::in($expr, $params));
}
public function orWhereIn($expr, $params = array())
{
return $this->orWhere(Expr::in($expr, $params));
}
public function andWhereNotIn($expr, $params = array())
{
return $this->andWhere(Expr::notIn($expr, $params));
}
public function orWhereNotIn($expr, $params = array())
{
return $this->orWhere(Expr::notIn($expr, $params));
}
public function groupBy($groupBy) public function groupBy($groupBy)
{ {
return $this->add('groupBy', Expr::groupBy($groupBy), false); return $this->add('groupBy', new Expr\GroupBy(func_get_args()));
} }
public function addGroupBy($groupBy) public function addGroupBy($groupBy)
{ {
return $this->add('groupBy', Expr::groupBy($groupBy), true); return $this->add('groupBy', new Expr\GroupBy(func_get_args()), true);
} }
public function having($having) public function having($having)
@ -384,12 +362,12 @@ class QueryBuilder
public function orderBy($sort, $order = null) public function orderBy($sort, $order = null)
{ {
return $this->add('orderBy', Expr::orderBy($sort, $order), false); return $this->add('orderBy', new Expr\OrderBy($sort, $order));
} }
public function addOrderBy($sort, $order = null) public function addOrderBy($sort, $order = null)
{ {
return $this->add('orderBy', Expr::orderBy($sort, $order), true); return $this->add('orderBy', new Expr\OrderBy($sort, $order), true);
} }
/** /**

8
tests/Doctrine/Tests/ORM/QueryBuilderTest.php
View file

@ -187,7 +187,7 @@ class QueryBuilderTest extends \Doctrine\Tests\OrmTestCase
->select('u') ->select('u')
->from('Doctrine\Tests\Models\CMS\CmsUser', 'u') ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u')
->where('u.id = :uid') ->where('u.id = :uid')
->andWhereIn('u.id', array(1, 2, 3)); ->andWhere(Expr::in('u.id', array(1, 2, 3)));
$this->assertValidQueryBuilder($qb, 'SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE (u.id = :uid) AND (u.id IN(1, 2, 3))'); $this->assertValidQueryBuilder($qb, 'SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE (u.id = :uid) AND (u.id IN(1, 2, 3))');
} }
@ -198,7 +198,7 @@ class QueryBuilderTest extends \Doctrine\Tests\OrmTestCase
->select('u') ->select('u')
->from('Doctrine\Tests\Models\CMS\CmsUser', 'u') ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u')
->where('u.id = :uid') ->where('u.id = :uid')
->orWhereIn('u.id', array(1, 2, 3)); ->orWhere(Expr::in('u.id', array(1, 2, 3)));
$this->assertValidQueryBuilder($qb, 'SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE (u.id = :uid) OR (u.id IN(1, 2, 3))'); $this->assertValidQueryBuilder($qb, 'SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE (u.id = :uid) OR (u.id IN(1, 2, 3))');
} }
@ -209,7 +209,7 @@ class QueryBuilderTest extends \Doctrine\Tests\OrmTestCase
->select('u') ->select('u')
->from('Doctrine\Tests\Models\CMS\CmsUser', 'u') ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u')
->where('u.id = :uid') ->where('u.id = :uid')
->andWhereNotIn('u.id', array(1, 2, 3)); ->andWhere(Expr::notIn('u.id', array(1, 2, 3)));
$this->assertValidQueryBuilder($qb, 'SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE (u.id = :uid) AND (u.id NOT IN(1, 2, 3))'); $this->assertValidQueryBuilder($qb, 'SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE (u.id = :uid) AND (u.id NOT IN(1, 2, 3))');
} }
@ -220,7 +220,7 @@ class QueryBuilderTest extends \Doctrine\Tests\OrmTestCase
->select('u') ->select('u')
->from('Doctrine\Tests\Models\CMS\CmsUser', 'u') ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u')
->where('u.id = :uid') ->where('u.id = :uid')
->OrWhereNotIn('u.id', array(1, 2, 3)); ->OrWhere(Expr::notIn('u.id', array(1, 2, 3)));
$this->assertValidQueryBuilder($qb, 'SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE (u.id = :uid) OR (u.id NOT IN(1, 2, 3))'); $this->assertValidQueryBuilder($qb, 'SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE (u.id = :uid) OR (u.id NOT IN(1, 2, 3))');
} }