改进数据集的关联预载入查询 使用cursor查询 减少内存开销

Author: liu21st

src/Model.php

@@ -240,11 +240,10 @@ private function getWeakData(string $key, string $name, $default = null)
      * 创建新的模型实例.
      *
      * @param array|object $data
-     * @param array        $options
      *
      * @return Model|Entity
      */
-    public function newInstance(array | object $data = [], array $options = [])
+    public function newInstance(array | object $data = [])
     {
         $model = new static($data);
         if (!empty($data)) {

src/db/PDOConnection.php

@@ -653,20 +653,19 @@ public function getPdo()
      * @param BaseQuery  $query     查询对象
      * @param string     $sql       sql指令
      * @param Model|null $model     模型对象实例
-     * @param null       $condition 查询条件
      *
      * @throws DbException
      *
      * @return \Generator
      */
-    public function getCursor(BaseQuery $query, string $sql, $model = null, $condition = null)
+    public function getCursor(BaseQuery $query, string $sql, $model = null)
     {
         $this->queryPDOStatement($query, $sql);
 
         // 返回结果集
         while ($result = $this->PDOStatement->fetch($this->fetchType)) {
             if ($model) {
-                yield $model->newInstance($result, $condition);
+                yield $model->newInstance($result);
             } else {
                 yield $result;
             }
@@ -966,10 +965,8 @@ public function cursor(BaseQuery $query)
         // 生成查询SQL
         $sql = $this->builder->select($query);
 
-        $condition = $options['where']['AND'] ?? null;
-
         // 执行查询操作
-        return $this->getCursor($query, $sql, $query->getModel(), $condition);
+        return $this->getCursor($query, $sql, $query->getModel());
     }
 
     /**

src/db/concern/ModelRelationQuery.php

@@ -663,7 +663,7 @@ protected function resultToModel(array &$result): void
             }
         }
 
-        $result = $this->model->newInstance($result, $this->options);
+        $result = $this->model->newInstance($result);
 
         if ($this->suffix) {
             $result->setSuffix($this->suffix);

src/model/relation/BelongsToMany.php

@@ -443,10 +443,11 @@ protected function eagerlyManyToMany(array $where, array $subRelation = [], ?Clo
         }
 
         // 预载入关联查询 支持嵌套预载入
-        $list = $this->belongsToManyQuery($this->foreignKey, $this->localKey, $where)
+        $method = ($subRelation || !empty($cache)) ? 'select' : 'cursor';
+        $list   = $this->belongsToManyQuery($this->foreignKey, $this->localKey, $where)
             ->with($subRelation)
             ->cache($cache[0] ?? false, $cache[1] ?? null, $cache[2] ?? null)
-            ->select();
+            ->$method();
 
         // 组装模型数据
         $data = [];

src/model/relation/HasMany.php

@@ -217,11 +217,12 @@ protected function eagerlyOneToMany(array $where, array $subRelation = [], ?Clos
             $this->query->removeOption('limit');
         }
 
-        $list = $this->query
+        $method = ($subRelation || !empty($cache)) ? 'select' : 'cursor';
+        $list   = $this->query
             ->where($where)
             ->cache($cache[0] ?? false, $cache[1] ?? null, $cache[2] ?? null)
             ->with($subRelation)
-            ->select();
+            ->$method();
 
         // 组装模型数据
         $data = [];

src/model/relation/HasManyThrough.php

@@ -257,11 +257,11 @@ protected function eagerlyWhere(array $where, string $key, array $subRelation =
         if ($withLimit && $collection) {
             $this->query->removeOption('limit');
         }
-
-        $list = $this->query
+        $method = ($subRelation || !empty($cache)) ? 'select' : 'cursor';
+        $list   = $this->query
             ->where($throughKey, 'in', $keys)
             ->cache($cache[0] ?? false, $cache[1] ?? null, $cache[2] ?? null)
-            ->select();
+            ->$method();
 
         // 组装模型数据
         $data = [];

src/model/relation/MorphMany.php

@@ -298,11 +298,12 @@ protected function eagerlyMorphToMany(array $where, array $subRelation = [], ?Cl
             $this->query->removeOption('limit');
         }
 
-        $list = $this->query
+        $method = ($subRelation || !empty($cache)) ? 'select' : 'cursor';
+        $list   = $this->query
             ->where($where)
             ->with($subRelation)
             ->cache($cache[0] ?? false, $cache[1] ?? null, $cache[2] ?? null)
-            ->select();
+            ->$method();
         $morphKey = $this->morphKey;
 
         // 组装模型数据

src/model/relation/MorphToMany.php

@@ -256,10 +256,11 @@ protected function eagerlyManyToMany(array $where, array $subRelation = [], ?Clo
         }
 
         // 预载入关联查询 支持嵌套预载入
-        $list = $this->belongsToManyQuery($this->foreignKey, $this->localKey, $where)
+        $method = ($subRelation || !empty($cache)) ? 'select' : 'cursor';
+        $list   = $this->belongsToManyQuery($this->foreignKey, $this->localKey, $where)
             ->with($subRelation)
             ->cache($cache[0] ?? false, $cache[1] ?? null, $cache[2] ?? null)
-            ->select();
+            ->$method();
 
         // 组装模型数据
         $data = [];