Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
yii2
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
PSDI Army
yii2
Commits
46cbe63c
Commit
46cbe63c
authored
Apr 15, 2014
by
Qiang Xue
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #3114 from thiagotalma/patch-1
Update ActiveQuery.php
parents
c3f4e005
563e7e01
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
1 deletion
+3
-1
ActiveQuery.php
framework/db/ActiveQuery.php
+3
-1
No files found.
framework/db/ActiveQuery.php
View file @
46cbe63c
...
@@ -416,7 +416,7 @@ class ActiveQuery extends Query implements ActiveQueryInterface
...
@@ -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
...
@@ -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
...
@@ -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()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment