with

Author: Ethan

src/ModelTrait.php

@@ -6,6 +6,7 @@
 use PFinal\Database\Relations\HasMany;
 use PFinal\Database\Relations\HasOne;
 use Leaf\DB;
+use PFinal\Database\Relations\RelationBase;
 
 /**
  * 模型
@@ -145,7 +146,9 @@ public function hasMany($related, $foreignKey = null, $localKey = 'id')
     /**
      * 渴求式加载
      *
-     * eg. Blog::with('category')->where()->findAll()
+     * eg:
+     * Blog::with('category')->findAll()
+     * Favorite::with('project.city', 'project.user')->findAll()
      *
      * @param  string|array $relations 关联名称
      */
@@ -154,15 +157,11 @@ public static function with($relations)
         $relations = is_string($relations) ? func_get_args() : $relations;
 
         return DB::table(static::tableName())->asEntity(static::className())->afterFind(function ($models) use ($relations) {
-            if (count($models) > 0) {
-                foreach ($relations as $relation) {
-                    $relationObj = call_user_func([$models[0], $relation]);
-                    $relationObj->appendData($models, $relation);
-                }
-            }
+            RelationBase::appendRelationData($models, $relations);
         });
     }
 
+
     public function __get($getter)
     {
         if (!method_exists($this, $getter)) {

src/Relations/BelongsTo.php

@@ -3,9 +3,8 @@
 namespace PFinal\Database\Relations;
 
 use Leaf\Util;
-use PFinal\Database\Builder;
 
-class BelongsTo extends Builder
+class BelongsTo extends RelationBase
 {
     public $foreignKey = null;
     public $ownerKey;
@@ -18,13 +17,27 @@ public function __invoke()
         return $this->findOne();
     }
 
-    public function appendData($models, $name)
+    public function appendData(array $models, $name, $relations = [])
     {
+        if (count($models) == 0) {
+            return;
+        }
+
+        $relations = (array)$relations;
+
+        if (isset($models[0]->$name) && count($relations) > 0) {
+            self::appendRelationData(array_column($models, $name), $relations);
+            return;
+        }
+
         $ids = Util::arrayColumn($models, $this->foreignKey);
         $ids = array_unique($ids);
 
         $this->whereIn($this->ownerKey, $ids);
         $relationData = $this->findAll();
+        if (count($relations) > 0) {
+            $this->appendRelationData($relationData, $relations);
+        }
 
         $relationData = Util::arrayColumn($relationData, null, $this->ownerKey);
 

src/Relations/HasMany.php

@@ -3,9 +3,8 @@
 namespace PFinal\Database\Relations;
 
 use Leaf\Util;
-use PFinal\Database\Builder;
 
-class HasMany extends Builder
+class HasMany extends RelationBase
 {
     public $foreignKey = null;
     public $localKey;
@@ -18,14 +17,28 @@ public function __invoke()
         return $this->findAll();
     }
 
-    public function appendData($models, $name)
+    public function appendData(array $models, $name, $relations = [])
     {
+        if (count($models) == 0) {
+            return;
+        }
+
+        $relations = (array)$relations;
+
+        if (isset($models[0]->$name) && count($relations) > 0) {
+            self::appendRelationData(array_column($models, $name), $relations);
+            return;
+        }
+
         $ids = Util::arrayColumn($models, $this->localKey);
         $ids = array_unique($ids);
 
         $this->whereIn($this->foreignKey, $ids);
 
         $relationData = $this->findAll();
+        if (count($relations) > 0) {
+            $this->appendRelationData($relationData, $relations);
+        }
 
         foreach ($models as $k => $model) {
             $models[$k][$name] = [];

src/Relations/HasOne.php

@@ -3,9 +3,8 @@
 namespace PFinal\Database\Relations;
 
 use Leaf\Util;
-use PFinal\Database\Builder;
 
-class HasOne extends Builder
+class HasOne extends RelationBase
 {
     public $foreignKey = null;
     public $localKey;
@@ -18,14 +17,28 @@ public function __invoke()
         return $this->findOne();
     }
 
-    public function appendData($models, $name)
+    public function appendData(array $models, $name, $relations = [])
     {
+        if (count($models) == 0) {
+            return;
+        }
+
+        $relations = (array)$relations;
+
+        if (isset($models[0]->$name) && count($relations) > 0) {
+            self::appendRelationData(array_column($models, $name), $relations);
+            return;
+        }
+
         $ids = Util::arrayColumn($models, $this->localKey);
         $ids = array_unique($ids);
 
         $this->whereIn($this->foreignKey, $ids);
 
         $relationData = $this->findAll();
+        if (count($relations) > 0) {
+            $this->appendRelationData($relationData, $relations);
+        }
 
         $relationData = Util::arrayColumn($relationData, null, $this->foreignKey);
 

src/Relations/RelationBase.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace PFinal\Database\Relations;
+
+use PFinal\Database\Builder;
+
+class RelationBase extends Builder
+{
+    public static function appendRelationData($models, array $relations)
+    {
+        if (count($models) > 0) {
+            foreach ($relations as $relation) {
+
+                $ind = strpos($relation, '.');
+                if ($ind !== false) {
+                    $methodName = substr($relation, 0, $ind);
+                    $nextMethodName = substr($relation, $ind + 1);
+                } else {
+                    $methodName = $relation;
+                    $nextMethodName = [];
+                }
+
+                $relationObj = call_user_func([$models[0], $methodName]);
+                $relationObj->appendData($models, $methodName, $nextMethodName);
+            }
+        }
+    }
+}