调整lazyCollection类并完善单元测试

Author: liu21st

src/db/LazyCollection.php

@@ -15,7 +15,7 @@
 
 use PDOStatement;
 use think\db\exception\DbException as Exception;
-use think\model\LazyCollection;
+use think\model\LazyCollection as ModelLazyCollection;
 
 /**
  * PDO数据查询类.
@@ -503,7 +503,7 @@ public function getPdo(): PDOStatement
     }
 
     /**
-     * 使用游标查找记录.
+     * 使用游标查找记录.（不支持关联查询和查询缓存）
      *
      * @param bool $unbuffered 是否开启无缓冲查询（仅限mysql）
      * 
@@ -513,13 +513,14 @@ public function cursor(bool $unbuffered = false): LazyCollection
     {
         $connection = clone $this->connection;
 
-        return new LazyCollection(function () use ($connection, $unbuffered) {
+        $class = $this->model ? ModelLazyCollection::class : LazyCollection::class;
+        return new $class(function () use ($connection, $unbuffered) {
             yield from $connection->cursor($this, $unbuffered);
         });
     }
 
     /**
-     * 流式处理查询结果
+     * 流式处理查询结果（不支持关联查询和查询缓存）
      *
      * @param callable $callback    处理回调
      * @param bool     $unbuffered  是否使用无缓冲查询（仅MySQL支持）
@@ -618,8 +619,8 @@ public function lazy(int $count = 1000, ?string $column = null, string $order =
         if ($count < 1) {
             throw new Exception('The chunk size should be at least 1');
         }
-
-        return new LazyCollection(function () use ($count, $column, $order) {
+        $class = $this->model ? ModelLazyCollection::class : LazyCollection::class;
+        return new $class(function () use ($count, $column, $order) {
             $limit   = (int) $this->getOption('limit', 0);
             $column  = $column ?: $this->getPk();
             $length  = $limit && $count >= $limit ? $limit : $count;

src/db/Query.php

@@ -14,6 +14,7 @@
 namespace think\model;
 
 use think\Collection as BaseCollection;
+use think\model\concern\ModelCollection;
 use think\model\contract\Modelable as Model;
 use think\Paginator;
 
@@ -27,13 +28,7 @@
  */
 class Collection extends BaseCollection
 {
-    public function toView(string $view)
-    {
-        return $this->map(function (Model $model) use($view) {
-            return $model->toView($view);
-        });
-    }
-
+    use ModelCollection;
     /**
      * 延迟预载入关联查询.
      *
@@ -52,160 +47,6 @@ public function load(array $relation, $cache = false)
         return $this;
     }
 
-    /**
-     * 删除数据集的数据.
-     *
-     * @return bool
-     */
-    public function delete(): bool
-    {
-        $this->each(function (Model $model) {
-            $model->delete();
-        });
-
-        return true;
-    }
-
-    /**
-     * 更新数据.
-     *
-     * @param array $data       数据数组
-     * @param array $allowField 允许字段
-     *
-     * @return bool
-     */
-    public function update(array $data, array $allowField = []): bool
-    {
-        $this->each(function (Model $model) use ($data, $allowField) {
-            if (!empty($allowField)) {
-                $model->allowField($allowField);
-            }
-
-            $model->save($data);
-        });
-
-        return true;
-    }
-
-    /**
-     * 设置需要隐藏的输出属性.
-     *
-     * @param array $hidden 属性列表
-     * @param bool  $merge  是否合并
-     *
-     * @return $this
-     */
-    public function hidden(array $hidden, bool $merge = false)
-    {
-        $this->each(function (Model $model) use ($hidden, $merge) {
-            $model->hidden($hidden, $merge);
-        });
-
-        return $this;
-    }
-
-    /**
-     * 设置需要输出的属性.
-     *
-     * @param array $visible
-     * @param bool  $merge   是否合并
-     *
-     * @return $this
-     */
-    public function visible(array $visible, bool $merge = false)
-    {
-        $this->each(function (Model $model) use ($visible, $merge) {
-            $model->visible($visible, $merge);
-        });
-
-        return $this;
-    }
-
-    /**
-     * 设置需要追加的输出属性.
-     *
-     * @param array $append 属性列表
-     * @param bool  $merge  是否合并
-     *
-     * @return $this
-     */
-    public function append(array $append, bool $merge = false)
-    {
-        $this->each(function (Model $model) use ($append, $merge) {
-            $model->append($append, $merge);
-        });
-
-        return $this;
-    }
-
-    /**
-     * 设置属性映射.
-     *
-     * @param array $mapping 属性映射
-     *
-     * @return $this
-     */
-    public function mapping(array $mapping)
-    {
-        $this->each(function (Model $model) use ($mapping) {
-            $model->mapping($mapping);
-        });
-
-        return $this;
-    }
-
-    /**
-     * 设置模型输出场景.
-     *
-     * @param string $scene 场景名称
-     *
-     * @return $this
-     */
-    public function scene(string $scene)
-    {
-        $this->each(function (Model $model) use ($scene) {
-            $model->scene($scene);
-        });
-
-        return $this;
-    }
-
-    /**
-     * 设置数据字段获取器.
-     *
-     * @param string|array $name     字段名
-     * @param callable     $callback 闭包获取器
-     *
-     * @return $this
-     */
-    public function withAttr(string|array $name, ?callable $callback = null)
-    {
-        $this->each(function (Model $model) use ($name, $callback) {
-            $model->withFieldAttr($name, $callback);
-        });
-
-        return $this;
-    }
-
-    /**
-     * 绑定（一对一）关联属性到当前模型.
-     *
-     * @param string $relation 关联名称
-     * @param array  $attrs    绑定属性
-     *
-     * @throws Exception
-     *
-     * @return $this
-     */
-    public function bindAttr(string $relation, array $attrs = [])
-    {
-        $this->each(function (Model $model) use ($relation, $attrs) {
-            $model->bindAttr($relation, $attrs);
-        });
-
-        return $this;
-    }
-
     /**
      * 按指定键整理数据.
      *