php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-15 22:09:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3114 from thiagotalma/patch-1

Browse Source 
Update ActiveQuery.php
This commit is contained in:
Qiang Xue
2014-04-15 19:35:52 -04:00
parent c3f4e0057d 563e7e0174
commit 46cbe63cc7
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
framework/db/ActiveQuery.php
View File

@@ -416,7 +416,7 @@ class ActiveQuery extends Query implements ActiveQueryInterface
// remove duplicated joins added by joinWithRelations that may be added // remove duplicated joins added by joinWithRelations that may be added
// e.g. when joining a relation and a via relation at the same time // e.g. when joining a relation and a via relation at the same time
$uniqueJoins = []; $uniqueJoins = [];
foreach($this->join as $j) { foreach ($this->join as $j) {
$uniqueJoins[serialize($j)] = $j; $uniqueJoins[serialize($j)] = $j;
} }
$this->join = array_values($uniqueJoins); $this->join = array_values($uniqueJoins);
@@ -641,6 +641,7 @@ class ActiveQuery extends Query implements ActiveQueryInterface
* The new condition and the existing one will be joined using the 'AND' operator. * The new condition and the existing one will be joined using the 'AND' operator.
* @param string|array $condition the new ON condition. Please refer to [[where()]] * @param string|array $condition the new ON condition. Please refer to [[where()]]
* on how to specify this parameter. * on how to specify this parameter.
* @param array $params the parameters (name => value) to be bound to the query.
* @return static the query object itself * @return static the query object itself
* @see onCondition() * @see onCondition()
* @see orOnCondition() * @see orOnCondition()
@@ -661,6 +662,7 @@ class ActiveQuery extends Query implements ActiveQueryInterface
* The new condition and the existing one will be joined using the 'OR' operator. * The new condition and the existing one will be joined using the 'OR' operator.
* @param string|array $condition the new ON condition. Please refer to [[where()]] * @param string|array $condition the new ON condition. Please refer to [[where()]]
* on how to specify this parameter. * on how to specify this parameter.
* @param array $params the parameters (name => value) to be bound to the query.
* @return static the query object itself * @return static the query object itself
* @see onCondition() * @see onCondition()
* @see andOnCondition() * @see andOnCondition()