Merge pull request #7 from KateAAAA/master

Refresh relations on cached models
sitkoru · Aug 14, 2017 · 7a477d5 · 7a477d5
2 parents 69438b9 + 89e16c1
commit 7a477d5
Showing 1 changed file with 16 additions and 0 deletions.
diff --git a/CacheActiveQuery.php b/CacheActiveQuery.php
@@ -3,6 +3,7 @@
 namespace sitkoru\cache\ar;
 
 use yii\db\ActiveQuery;
+use yii\db\ActiveQueryTrait;
 use yii\db\ActiveRecord;
 
 /**
@@ -15,6 +16,7 @@
 class CacheActiveQuery extends ActiveQuery
 {
 
+    use ActiveQueryTrait;
 
     private $dropConditions = [];
     private $disableCache = false;
@@ -45,6 +47,20 @@ public function all($db = null)
             if ($fromCache) {
 
                 $resultFromCache = [];
+                if($this->with)
+                {
+                    $primaryModel = reset($fromCache);
+                    $relations = $this->normalizeRelations($primaryModel, $this->with);
+                    /* @var $relation ActiveQuery */
+                    foreach ($relations as $name => $relation)
+                    {
+                        if ($relation->asArray === null) {
+                            // inherit asArray from primary query
+                            $relation->asArray($this->asArray);
+                        }
+                        $relation->populateRelation($name, $fromCache);
+                    }
+                }
                 foreach ($fromCache as $i => $model) {
                     $index = $i;
                     if ($model instanceof ActiveRecord) {