eee

ActiveQuery.php

@@ -20,22 +20,8 @@ class ActiveQuery extends QueryTrait implements ISqlBuilder
 {
 
 
-    /** @var bool */
     public bool        $asArray    = FALSE;
-
-    /** @var bool */
-    public bool $useCache = FALSE;
-
-    /**
-     * @var Connection|null
-     */
     public ?Connection $db         = NULL;
-
-
-    /**
-     * @var array
-     * 参数绑定
-     */
     public array       $attributes = [];
     protected mixed    $_mock      = null;
 

Query.php

@@ -19,13 +19,6 @@ use Database\Traits\QueryTrait;
 class Query extends QueryTrait implements ISqlBuilder
 {
 
-
-    /**
-     * @var SqlBuilder
-     */
-    protected SqlBuilder $builder;
-
-
     /**
      * @throws
      */

Traits/QueryTrait.php

@@ -16,6 +16,7 @@ use Database\Base\ActiveQueryInterface;
 use Database\ISqlBuilder;
 use Database\ModelInterface;
 use Database\Query;
+use Database\SqlBuilder;
 use Exception;
 use Kiri;
 use Kiri\Abstracts\Component;
@@ -37,6 +38,7 @@ class QueryTrait extends Component implements ActiveQueryInterface, ISqlBuilder
     protected string     $alias  = 't1';
     protected array      $filter = [];
     protected bool       $lock   = false;
+    protected SqlBuilder $builder;
 
 
     /**