RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-01-30 20:11:49 +03:00
Code Issues Projects Releases Wiki Activity

[2.0] More documentation and fixes to QueryBuilder and Expr classes.

Browse Source
This commit is contained in:
guilhermeblanco 2009-08-17 23:30:41 +00:00
parent 3d17cb0d60
commit e5a95bf363
3 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/Doctrine/ORM/Query/Expr.php
View File

@ -53,11 +53,6 @@ class Expr
return new Expr\From($from, $alias);
}
public static function join($joinType, $join, $alias = null, $conditionType = null, $condition = null)
{
return new Expr\Join($joinType, $join, $alias, $conditionType, $condition);
}
public static function leftJoin($join, $alias = null, $conditionType = null, $condition = null)
{
return new Expr\Join(Expr\Join::LEFT_JOIN, $join, $alias, $conditionType, $condition);

2
lib/Doctrine/ORM/Query/Expr/Base.php
View File

@ -42,7 +42,7 @@ abstract class Base
public function __construct($args = array())
{
foreach ($args as $arg) {
foreach ((array) $args as $arg) {
$this->add($arg);
}
}

14
lib/Doctrine/ORM/QueryBuilder.php
View File

@ -259,19 +259,11 @@ class QueryBuilder
public function innerJoin($join, $alias = null, $conditionType = null, $condition = null)
{
/*$join = 'INNER JOIN ' . $parentAlias . '.' . $join . ' '
. $alias . (isset($condition) ? ' ' . $condition : null);
return $this->add('from', $join, true);*/
return $this->add('from', Expr::innerJoin($join, $alias, $conditionType, $condition), true);
}
public function leftJoin($join, $alias = null, $conditionType = null, $condition = null)
{
/*$join = 'LEFT JOIN ' . $parentAlias . '.' . $join . ' '
. $alias . (isset($condition) ? ' ' . $condition : null);
return $this->add('from', $join, true);*/
return $this->add('from', Expr::leftJoin($join, $alias, $conditionType, $condition), true);
}
@ -310,7 +302,7 @@ class QueryBuilder
return $this->add('where', Expr::in($expr, $params), true);
}
public function orWhereIn($expr, $params = array(), $not = false)
public function orWhereIn($expr, $params = array())
{
if (count($this->_getDqlQueryPart('where')) > 0) {
$this->add('where', 'OR', true);
@ -370,12 +362,12 @@ class QueryBuilder
return $this->add('having', Expr::having($having), true);
}
public function orderBy($sort, $order)
public function orderBy($sort, $order = null)
{
return $this->add('orderBy', Expr::orderBy($sort, $order), false);
}
public function addOrderBy($sort, $order)
public function addOrderBy($sort, $order = null)
{
return $this->add('orderBy', Expr::orderBy($sort, $order), true);
}