Handling $query->joinWith called inside of other $query->joinWith within Closure…

Handling $query->joinWith called inside of other $query->joinWith within Closure (called inside Closure). Ex.: ```php $query->joinWith( [ 'rel1' => function($query) { $query->joinWith( [ 'rel2' => function($query) { // ... } ] ); } ] ); ```

Handling $query->joinWith called inside of other $query->joinWith within Closure…
35b54345 · Stephen Seliuk · Qiang Xue · b8354224 · 35b54345
Commit 35b54345 authored Sep 09, 2014 by Stephen Seliuk Committed by Qiang Xue Sep 10, 2014
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

ActiveQuery.php framework/db/ActiveQuery.php +3 -0

No files found.
--- a/framework/db/ActiveQuery.php
+++ b/framework/db/ActiveQuery.php
@@ -482,6 +482,9 @@ class ActiveQuery extends Query implements ActiveQueryInterface
                $relations[$fullName] = $relation = $primaryModel->getRelation($name);
                if ($callback !== null) {
                    call_user_func($callback, $relation);
+                    if(is_array($relation->joinWith)) {
+                        $relation->buildJoinWith();
+                    }
                }
                $this->joinWithRelation($parent, $relation, $this->getJoinType($joinType, $fullName));
            }