Revert "改名"

This reverts commit fdf58326

ActiveQuery.php

@@ -0,0 +1,340 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: whwyy
+ * Date: 2018/4/4 0004
+ * Time: 14:42
+ */
+declare(strict_types=1);
+
+namespace Database;
+
+use Database\Traits\QueryTrait;
+use Exception;
+use JetBrains\PhpStorm\ArrayShape;
+use Kiri\Abstracts\Component;
+
+/**
+ * Class ActiveQuery
+ * @package Database
+ */
+class ActiveQuery extends Component implements ISqlBuilder
+{
+
+    use QueryTrait;
+
+    /** @var array */
+    public array $with = [];
+
+    /** @var bool */
+    public bool $asArray = FALSE;
+
+    /** @var bool */
+    public bool $useCache = FALSE;
+
+    /**
+     * @var Connection|null
+     */
+    public ?Connection $db = NULL;
+
+    /**
+     * @var array
+     * 参数绑定
+     */
+    public array $attributes = [];
+
+
+    /**
+     * Comply constructor.
+     * @param $model
+     * @param array $config
+     * @throws
+     */
+    public function __construct($model, array $config = [])
+    {
+        $this->modelClass = $model;
+
+        $this->builder = SqlBuilder::builder($this);
+        parent::__construct($config);
+    }
+
+
+    /**
+     * 清除不完整数据
+     */
+    public function clear()
+    {
+        $this->db = NULL;
+        $this->useCache = FALSE;
+        $this->with = [];
+    }
+
+    /**
+     * @param $key
+     * @param $value
+     * @return $this
+     */
+    public function addParam($key, $value): static
+    {
+        $this->attributes[$key] = $value;
+        return $this;
+    }
+
+
+    /**
+     * @param int $size
+     * @param int $page
+     * @return array
+     * @throws Exception
+     */
+    #[ArrayShape(['code' => "int", 'message' => "string", 'size' => "mixed", 'page' => "mixed", 'count' => "int", 'next' => "mixed", 'prev' => "mixed", 'param' => "array"])]
+    public function pagination(int $size = 20, int $page = 1): array
+    {
+        $page = max(1, $page);
+        $size = max(1, $size);
+
+        $offset = ($page - 1) * $size;
+
+        $count = $this->count();
+        $lists = $this->limit($offset, $size)->get()->toArray();
+        return [
+            'code'   => 0,
+            'message'   => 'ok',
+            'size'   => $size,
+            'page'   => $page,
+            'count'  => $count,
+            'next'   => max($page + 1, 1),
+            'prev'   => max($page - 1, 1),
+            'param' => $lists,
+        ];
+    }
+
+
+    /**
+     * @param array $values
+     * @return $this
+     */
+    public function addParams(array $values): static
+    {
+        foreach ($values as $key => $val) {
+            $this->addParam($key, $val);
+        }
+        return $this;
+    }
+
+    /**
+     * @param $name
+     * @return $this
+     */
+    public function with($name): static
+    {
+        if (empty($name)) {
+            return $this;
+        }
+        if (is_string($name)) {
+            $name = explode(',', $name);
+        }
+        foreach ($name as $val) {
+	        $this->with[] = $val;
+        }
+        return $this;
+    }
+
+
+    /**
+     * @param $sql
+     * @param array $params
+     * @return mixed
+     * @throws Exception
+     */
+    public function execute($sql, array $params = []): Command
+    {
+        return $this->modelClass->getConnection()->createCommand($sql, $params);
+    }
+
+
+    /**
+     * @return ModelInterface|null
+     * @throws Exception
+     */
+    public function first(): ModelInterface|null
+    {
+        $data = $this->execute($this->builder->one())->one();
+        if (empty($data)) {
+            return NULL;
+        }
+        return $this->populate($data);
+    }
+
+
+    /**
+     * @return string
+     * @throws Exception
+     */
+    public function toSql(): string
+    {
+        return $this->builder->get();
+    }
+
+
+    /**
+     * @return array|Collection
+     */
+    public function get(): Collection|array
+    {
+        return $this->all();
+    }
+
+
+    /**
+     * @throws Exception
+     */
+    public function flush(): array|bool|int|string|null
+    {
+        return $this->execute($this->builder->truncate())->exec();
+    }
+
+
+    /**
+     * @param int $size
+     * @param callable $callback
+     * @return Pagination
+     * @throws Exception
+     */
+    public function page(int $size, callable $callback): Pagination
+    {
+        $pagination = new Pagination($this);
+        $pagination->setOffset(0);
+        $pagination->setLimit($size);
+        $pagination->setCallback($callback);
+        return $pagination;
+    }
+
+    /**
+     * @param string $field
+     * @param string $setKey
+     *
+     * @return array|null
+     * @throws Exception
+     */
+    public function column(string $field, string $setKey = ''): ?array
+    {
+        return $this->all()->column($field, $setKey);
+    }
+
+    /**
+     * @return array|Collection
+     * @throws
+     */
+    public function all(): Collection|array
+    {
+        $data = $this->execute($this->builder->all())->all();
+        if (!empty($this->with)) {
+            $this->getWith($this->modelClass);
+        }
+        $collect = new Collection($this, $data, $this->modelClass);
+        if ($this->asArray) {
+            return $collect->toArray();
+        }
+        return $collect;
+    }
+
+    /**
+     * @param $data
+     * @return ModelInterface
+     * @throws Exception
+     */
+    public function populate($data): ModelInterface
+    {
+        return $this->getWith($this->modelClass::populate($data));
+    }
+
+
+    /**
+     * @param ModelInterface $model
+     * @return ModelInterface
+     */
+    public function getWith(ModelInterface $model): ModelInterface
+    {
+        if (empty($this->with) || !is_array($this->with)) {
+            return $model;
+        }
+        return $model->setWith($this->with);
+    }
+
+    /**
+     * @return int
+     * @throws Exception
+     */
+    public function count(): int
+    {
+        $data = $this->execute($this->builder->count())->one();
+        if ($data && is_array($data)) {
+            return (int)array_shift($data);
+        }
+        return 0;
+    }
+
+
+    /**
+     * @param array $data
+     * @return array|Command|bool|int|string
+     * @throws Exception
+     */
+    public function batchUpdate(array $data): Command|array|bool|int|string
+    {
+        $generate = $this->builder->update($data);
+        if (is_bool($generate)) {
+            return $generate;
+        }
+        return $this->execute(...$generate)->exec();
+    }
+
+    /**
+     * @param array $data
+     * @return bool
+     * @throws Exception
+     */
+    public function batchInsert(array $data): bool
+    {
+        [$sql, $params] = $this->builder->insert($data, TRUE);
+
+
+        return $this->execute($sql, $params)->exec();
+    }
+
+    /**
+     * @param $filed
+     *
+     * @return null
+     * @throws Exception
+     */
+    public function value($filed)
+    {
+        return $this->first()[$filed] ?? NULL;
+    }
+
+    /**
+     * @return bool
+     * @throws Exception
+     */
+    public function exists(): bool
+    {
+        return !empty($this->execute($this->builder->one())->fetchColumn());
+    }
+
+
+    /**
+     * @param bool $getSql
+     * @return int|bool|string|null
+     * @throws Exception
+     */
+    public function delete(bool $getSql = FALSE): int|bool|string|null
+    {
+        $sql = $this->builder->delete();
+        if ($getSql === FALSE) {
+            return $this->execute($sql)->delete();
+        }
+        return $sql;
+    }
+}

Annotation/Get.php

@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Database\Note;
+namespace Database\Annotation;
 
 
 use Attribute;
@@ -11,9 +11,9 @@ use Exception;
 
 /**
  * Class Get
- * @package Note\Model
+ * @package Annotation\Model
  */
-#[Attribute(Attribute::TARGET_METHOD)] class Get extends \Note\Attribute
+#[Attribute(Attribute::TARGET_METHOD)] class Get extends \Kiri\Annotation\Attribute
 {
 
 

Annotation/Relation.php

@@ -1,17 +1,17 @@
 <?php
 
 
-namespace Database\Note;
+namespace Database\Annotation;
 
 
-use Note\Attribute;
+use Kiri\Annotation\Attribute;
 use Database\Base\Relate;
 use Exception;
 
 
 /**
  * Class Relation
- * @package Note\Model
+ * @package Annotation\Model
  */
 #[\Attribute(\Attribute::TARGET_METHOD)] class Relation extends Attribute
 {

Annotation/Set.php

@@ -1,10 +1,10 @@
 <?php
 
 
-namespace Database\Note;
+namespace Database\Annotation;
 
 
-use Note\Attribute;
+use Kiri\Annotation\Attribute;
 use Database\Base\Setter;
 use Exception;
 

Base/AbstractCollection.php

@@ -17,6 +17,7 @@ use Kiri\ToArray;
 use Exception;
 use JetBrains\PhpStorm\Pure;
 use Kiri\Abstracts\Component;
+use ReturnTypeWillChange;
 use Traversable;
 
 /**
@@ -91,7 +92,7 @@ abstract class AbstractCollection extends Component implements \IteratorAggregat
      */
     public function addItem($item)
     {
-        array_push($this->_item, $item);
+        $this->_item[] = $item;
     }
 
     /**
@@ -100,7 +101,7 @@ abstract class AbstractCollection extends Component implements \IteratorAggregat
      */
     public function getIterator(): Traversable|CollectionIterator|ArrayIterator
     {
-        return new CollectionIterator($this->model, $this->query, $this->_item);
+        return new CollectionIterator($this->model, $this->_item);
     }
 
 
@@ -143,7 +144,7 @@ abstract class AbstractCollection extends Component implements \IteratorAggregat
      * @param mixed $offset
      * @param mixed $value
      */
-    public function offsetSet(mixed $offset, mixed $value)
+    #[ReturnTypeWillChange] public function offsetSet(mixed $offset, mixed $value)
     {
         $this->_item[$offset] = $value;
     }
@@ -152,7 +153,7 @@ abstract class AbstractCollection extends Component implements \IteratorAggregat
     /**
      * @param mixed $offset
      */
-    public function offsetUnset(mixed $offset)
+    #[ReturnTypeWillChange] public function offsetUnset(mixed $offset)
     {
         if ($this->offsetExists($offset)) {
             unset($this->_item[$offset]);

Base/CollectionIterator.php

@@ -20,31 +20,17 @@ class CollectionIterator extends \ArrayIterator
 	private ModelInterface|string $model;
 
 
-	/** @var ActiveQuery */
-	private ActiveQuery $query;
-
-
-	private ?ModelInterface $_clone = null;
-
-
-	public function clean()
-	{
-		unset($this->query);
-	}
-
 
 	/**
 	 * CollectionIterator constructor.
 	 * @param $model
-	 * @param $query
 	 * @param array $array
 	 * @param int $flags
 	 * @throws Exception
 	 */
-	public function __construct($model, $query, array $array = [], int $flags = 0)
+	public function __construct($model, array $array = [], int $flags = 0)
 	{
 		$this->model = $model;
-		$this->query = $query;
 		parent::__construct($array, $flags);
 	}
 

Base/Model.php

@@ -25,14 +25,12 @@ use Database\Relation;
 use Database\SqlBuilder;
 use Database\Traits\HasBase;
 use Exception;
-use JetBrains\PhpStorm\Pure;
 use Kiri\Abstracts\Component;
-use Kiri\Application;
-use Kiri\Events\EventDispatch;
 use Kiri\Exception\NotFindClassException;
-use Kiri\Kiri;
+use Kiri;
 use Kiri\ToArray;
 use ReflectionException;
+use ReturnTypeWillChange;
 use validator\Validator;
 
 /**
@@ -41,8 +39,6 @@ use validator\Validator;
  * @package Kiri\Abstracts
  *
  * @property bool $isNowExample
- * @property Application $container
- * @property EventDispatch $eventDispatch
  * @property array $attributes
  * @property array $oldAttributes
  */
@@ -164,16 +160,6 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 	}
 
 
-	/**
-	 * @return EventDispatch
-	 * @throws ReflectionException
-	 */
-	protected function getEventDispatch(): EventDispatch
-	{
-		return Kiri::getDi()->get(EventDispatch::class);
-	}
-
-
 	/**
 	 * @param $data
 	 * @return Model
@@ -212,7 +198,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 	 */
 	public function init()
 	{
-		$an = Kiri::app()->getNote();
+		$an = Kiri::app()->getAnnotation();
 		$an->injectProperty($this);
 	}
 
@@ -263,13 +249,13 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 	public function hasPrimary(): bool
 	{
 		if ($this->primary !== NULL) {
-			return true;
+			return TRUE;
 		}
 		$primary = $this->getColumns()->getPrimaryKeys();
 		if (!empty($primary)) {
 			return $this->primary = is_array($primary) ? current($primary) : $primary;
 		}
-		return false;
+		return FALSE;
 	}
 
 
@@ -278,7 +264,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 	 */
 	public function isAutoIncrement(): bool
 	{
-		return $this->getAutoIncrement() !== null;
+		return $this->getAutoIncrement() !== NULL;
 	}
 
 	/**
@@ -296,11 +282,25 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 	public function getPrimary(): ?string
 	{
 		if (!$this->hasPrimary()) {
-			return null;
+			return NULL;
 		}
 		return $this->primary;
 	}
 
+
+	/**
+	 * @return bool
+	 * @throws Exception
+	 */
+	public function hasPrimaryValue(): bool
+	{
+		if ($this->hasPrimary()) {
+			return !empty($this->{$this->getPrimary()});
+		}
+		return false;
+	}
+
+
 	/**
 	 * @return int|null
 	 * @throws Exception
@@ -308,7 +308,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 	public function getPrimaryValue(): ?int
 	{
 		if (!$this->hasPrimary()) {
-			return null;
+			return NULL;
 		}
 		return $this->getAttribute($this->primary);
 	}
@@ -324,7 +324,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 	public static function findOne($param, $db = NULL): static|null
 	{
 		if (is_bool($param)) {
-			return null;
+			return NULL;
 		}
 		if (is_numeric($param)) {
 			$param = static::getPrimaryCondition($param);
@@ -357,7 +357,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 	 * @throws Exception
 	 * @throws Exception
 	 */
-	public static function max($field = null): ?ModelInterface
+	public static function max($field = NULL): ?ModelInterface
 	{
 		$columns = static::makeNewInstance()->getColumns();
 		if (empty($field)) {
@@ -365,11 +365,11 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 		}
 		$columns = $columns->get_fields();
 		if (!isset($columns[$field])) {
-			return null;
+			return NULL;
 		}
 		$first = static::query()->max($field)->first();
 		if (empty($first)) {
-			return null;
+			return NULL;
 		}
 		return $first[$field];
 	}
@@ -429,7 +429,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 	 */
 	public function getConnection(): Connection
 	{
-		return Kiri::app()->get('db')->get($this->connection);
+		return Kiri::app()->get($this->connection);
 	}
 
 
@@ -441,11 +441,11 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 	 * @return bool
 	 * @throws Exception
 	 */
-	protected static function deleteByCondition($condition = NULL, array $attributes = [], bool $if_condition_is_null = false): bool
+	protected static function deleteByCondition($condition = NULL, array $attributes = [], bool $if_condition_is_null = FALSE): bool
 	{
 		if (empty($condition)) {
 			if (!$if_condition_is_null) {
-				return false;
+				return FALSE;
 			}
 			return (bool)static::query()->delete();
 		}
@@ -506,12 +506,13 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 		if (empty($param)) {
 			return $this;
 		}
-        foreach ($param as $key => $attribute) {
-            $this->setAttribute($key, $attribute);
-        }
+		foreach ($param as $key => $attribute) {
+			$this->setAttribute($key, $attribute);
+		}
 		return $this;
 	}
 
+
 	/**
 	 * @param $param
 	 * @return $this
@@ -522,10 +523,10 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 		if (empty($param) || !is_array($param)) {
 			return $this;
 		}
-        foreach ($param as $key => $attribute) {
-            $this->setOldAttribute($key, $attribute);
-        }
-        return $this;
+		foreach ($param as $key => $attribute) {
+			$this->setOldAttribute($key, $attribute);
+		}
+		return $this;
 	}
 
 	/**
@@ -539,7 +540,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 		[$sql, $param] = SqlBuilder::builder(static::query())->insert($param);
 		$dbConnection = $this->getConnection()->createCommand($sql, $param);
 
-		$lastId = $dbConnection->save(true);
+		$lastId = $dbConnection->save();
 
 		$lastId = $this->setPrimary((int)$lastId, $param);
 
@@ -584,7 +585,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 	private function updateInternal($fields, $condition, $param): bool|static
 	{
 		if (empty($param)) {
-			return true;
+			return TRUE;
 		}
 		if ($this->hasPrimary()) {
 			$condition = [$this->getPrimary() => $this->getPrimaryValue()];
@@ -594,10 +595,10 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 			return $generate;
 		}
 		$command = $this->getConnection()->createCommand($generate[0], $generate[1]);
-		if ($command->save(false, $this)) {
+		if ($command->save()) {
 			return $this->refresh()->afterSave($fields, $param);
 		}
-		return false;
+		return FALSE;
 	}
 
 	/**
@@ -607,31 +608,32 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 	 */
 	public function save($data = NULL): static|bool
 	{
-        if (!is_null($data)) {
+		if (!is_null($data)) {
 			$this->_attributes = merge($this->_attributes, $data);
 		}
 		if (!$this->validator($this->rules()) || !$this->beforeSave($this)) {
-			return false;
+			return FALSE;
 		}
 		[$change, $condition, $fields] = $this->separation();
-		if (!$this->isNewExample) {
+		if (!empty($this->_oldAttributes)) {
 			return $this->updateInternal($fields, $condition, $change);
+		} else {
+			return $this->insert($change, $fields);
 		}
-		return $this->insert($change, $fields);
 	}
 
 
-    /**
-     * @param $value
-     * @return $this
-     */
-    public function populates($value): static
-    {
-        $this->_attributes = $value;
-        $this->_oldAttributes = $value;
-        $this->setIsNowExample(FALSE);
-        return $this;
-    }
+	/**
+	 * @param $value
+	 * @return $this
+	 */
+	public function populates($value): static
+	{
+		$this->_attributes = $value;
+		$this->_oldAttributes = $value;
+		$this->setIsNowExample(FALSE);
+		return $this;
+	}
 
 
 	/**
@@ -641,10 +643,10 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 	 */
 	public function validator(?array $rule): bool
 	{
-		if (empty($rule)) return true;
+		if (empty($rule)) return TRUE;
 		$validate = $this->resolve($rule);
 		if (!$validate->validation()) {
-			return $this->addError('$validate->getError()', 'mysql');
+			return $this->addError($validate->getError(), 'mysql');
 		} else {
 			return TRUE;
 		}
@@ -677,10 +679,10 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 	 */
 	public function getAttribute(string $name)
 	{
-		if ($this->hasNote($name)) {
-			return $this->runNote($name, $this->_attributes[$name]);
+		if ($this->hasAnnotation($name)) {
+			return $this->runAnnotation($name, $this->_attributes[$name]);
 		}
-		return $this->_attributes[$name] ?? null;
+		return $this->_attributes[$name] ?? NULL;
 	}
 
 
@@ -690,7 +692,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 	 * @param string $type
 	 * @return mixed
 	 */
-	protected function runNote(string $name, mixed $value, string $type = self::GET): mixed
+	protected function runAnnotation(string $name, mixed $value, string $type = self::GET): mixed
 	{
 		return call_user_func($this->_annotations[$type][$name], $value);
 	}
@@ -705,7 +707,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 		$_tmp = [];
 		$condition = [];
 		foreach ($this->_attributes as $key => $val) {
-			$oldValue = $this->_oldAttributes[$key] ?? null;
+			$oldValue = $this->_oldAttributes[$key] ?? NULL;
 			if ($val === $oldValue) {
 				$condition[$key] = $val;
 			} else {
@@ -776,7 +778,6 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 
 	/**
 	 * @return Relation|null
-	 * @throws ReflectionException
 	 */
 	public function getRelation(): ?Relation
 	{
@@ -817,7 +818,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 		if (empty($this->table)) {
 			throw new Exception('You need add static method `tableName` and return table name.');
 		}
-		$table = trim($this->table, '{{%}}');
+		$table = trim($this->table, '{%}');
 		if (!empty($tablePrefix) && !str_starts_with($table, $tablePrefix)) {
 			$table = $tablePrefix . $table;
 		}
@@ -833,7 +834,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 	 */
 	public function afterSave($attributes, $changeAttributes): bool
 	{
-		return true;
+		return TRUE;
 	}
 
 
@@ -843,7 +844,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 	 */
 	public function beforeSave($model): bool
 	{
-		return true;
+		return TRUE;
 	}
 
 
@@ -882,7 +883,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 		if (method_exists($this, $method)) {
 			return $this->{$method}();
 		}
-		$value = $this->_attributes[$name] ?? null;
+		$value = $this->_attributes[$name] ?? NULL;
 
 		return $this->_getter($name, $value);
 	}
@@ -918,7 +919,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 	 * @param string $type
 	 * @return array
 	 */
-	protected function getNote(string $type = self::GET): array
+	protected function getAnnotation(string $type = self::GET): array
 	{
 		return $this->_annotations[$type] ?? [];
 	}
@@ -929,10 +930,10 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 	 * @param string $type
 	 * @return bool
 	 */
-	protected function hasNote($name, string $type = self::GET): bool
+	protected function hasAnnotation($name, string $type = self::GET): bool
 	{
 		if (!isset($this->_annotations[$type])) {
-			return false;
+			return FALSE;
 		}
 		return isset($this->_annotations[$type][$name]);
 	}
@@ -999,7 +1000,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 	 * @param mixed $value
 	 * @throws Exception
 	 */
-	public function offsetSet(mixed $offset, mixed $value)
+	#[ReturnTypeWillChange] public function offsetSet(mixed $offset, mixed $value)
 	{
 		$this->__set($offset, $value);
 	}
@@ -1008,7 +1009,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 	 * @param mixed $offset
 	 * @throws Exception
 	 */
-	public function offsetUnset(mixed $offset)
+	#[ReturnTypeWillChange] public function offsetUnset(mixed $offset)
 	{
 		if (!isset($this->_attributes[$offset])
 			&& !isset($this->_oldAttributes[$offset])) {
@@ -1058,7 +1059,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 		$model = duplicate(static::class);
 		$model->_attributes = $data;
 		$model->_oldAttributes = $data;
-		$model->setIsNowExample(false);
+		$model->setIsNowExample(FALSE);
 		return $model;
 	}
 

Collection.php

@@ -82,10 +82,10 @@ class Collection extends AbstractCollection
 	 */
 	#[Pure] public function slice(int $start = 0, int $length = 20): array
 	{
-		if (empty($this->_item) || !is_array($this->_item)) {
+		if (empty($this->_item)) {
 			return [];
 		}
-		if (count($this->_item) < $length) {
+		if (\count($this->_item) < $length) {
 			return $this->_item;
 		} else {
 			return array_slice($this->_item, $start, $length);
@@ -138,7 +138,7 @@ class Collection extends AbstractCollection
 	 */
 	#[Pure] public function size(): int
 	{
-		return (int)count($this->_item);
+		return count($this->_item);
 	}
 
 	/**
@@ -166,15 +166,12 @@ class Collection extends AbstractCollection
 	public function delete(): bool
 	{
 		$model = $this->getModel();
-		if (!$model->hasPrimary()) return false;
-		$ids = [];
-		foreach ($this as $item) {
-			$id = $item->getPrimaryValue();
-			if (!empty($id)) {
-				$ids[] = $id;
-			}
+		if ($model->hasPrimary()) {
+			$key = $model->getPrimary();
+
+			return $model::query()->whereIn($key, $this->column($key))->delete();
 		}
-		return $model::query()->whereIn($model->getPrimary(), $ids)->delete();
+		throw new Exception('Must set primary key. if you wante delete');
 	}
 
 	/**

Command.php

@@ -39,9 +39,6 @@ class Command extends Component
 	/** @var string */
 	public string $dbname = '';
 
-	/** @var PDOStatement|null */
-	private ?PDOStatement $prepare = null;
-
 
 	/**
 	 * @return array|bool|int|string|PDOStatement|null
@@ -53,12 +50,10 @@ class Command extends Component
 	}
 
 	/**
-	 * @param bool $isInsert
-	 * @param mixed $hasAutoIncrement
 	 * @return int|bool|array|string|null
 	 * @throws Exception
 	 */
-	public function save(bool $isInsert = TRUE, mixed $hasAutoIncrement = null): int|bool|array|string|null
+	public function save(): int|bool|array|string|null
 	{
 		return $this->execute(static::EXECUTE);
 	}
@@ -110,11 +105,11 @@ class Command extends Component
 	}
 
 	/**
-	 * @param $type
+	 * @param string $type
 	 * @return int|bool|array|string|null
 	 * @throws Exception
 	 */
-	private function execute($type): int|bool|array|string|null
+	private function execute(string $type): int|bool|array|string|null
 	{
 		try {
 			$time = microtime(true);
@@ -136,11 +131,11 @@ class Command extends Component
 
 
 	/**
-	 * @param $type
+	 * @param string $type
 	 * @return array|int|bool|null
 	 * @throws Exception
 	 */
-	private function search($type): array|int|bool|null
+	private function search(string $type): array|int|bool|null
 	{
 		$pdo = $this->db->getConnect($this->sql);
 		if ($type === static::FETCH_COLUMN) {
@@ -180,9 +175,6 @@ class Command extends Component
 	 */
 	public function bindValues(array $data = []): static
 	{
-		if (!is_array($this->params)) {
-			$this->params = [];
-		}
 		if (!empty($data)) {
 			$this->params = array_merge($this->params, $data);
 		}

Condition/Condition.php

@@ -18,7 +18,7 @@ abstract class Condition extends Component
 	protected string $opera = '=';
 
 	/** @var array|mixed */
-	protected $value;
+	protected mixed $value;
 
 	const INT_TYPE = ['bit', 'bool', 'tinyint', 'smallint', 'mediumint', 'int', 'bigint', 'float', 'double', 'decimal', 'timestamp'];
 

Connection.php

@@ -17,15 +17,15 @@ use Database\Affair\Rollback;
 use Database\Mysql\PDO;
 use Database\Mysql\Schema;
 use Exception;
+use Kiri;
 use Kiri\Abstracts\Component;
 use Kiri\Abstracts\Config;
-use Kiri\Events\EventProvider;
 use Kiri\Exception\NotFindClassException;
-use Kiri\Kiri;
-use Note\Inject;
+use Kiri\Server\Events\OnWorkerExit;
+use Kiri\Server\Events\OnWorkerStop;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\NotFoundExceptionInterface;
 use ReflectionException;
-use Server\Events\OnWorkerExit;
-use Server\Events\OnWorkerStop;
 
 /**
  * Class Connection
@@ -68,31 +68,21 @@ class Connection extends Component
 	public array $attributes = [];
 
 
-	/**
-	 * @var Schema
-	 */
-	#[Inject(Schema::class)]
-	public Schema $_schema;
+	private ?Schema $_schema = null;
 
 
 	/**
-	 * execute by __construct
-	 * @throws Exception
+	 * @return void
+	 * @throws ContainerExceptionInterface
+	 * @throws NotFoundExceptionInterface
 	 */
 	public function init()
 	{
-		$eventProvider = Kiri::getDi()->get(EventProvider::class);
-		$eventProvider->on(OnWorkerStop::class, [$this, 'clear_connection'], 0);
-		$eventProvider->on(OnWorkerExit::class, [$this, 'clear_connection'], 0);
-		$eventProvider->on(BeginTransaction::class, [$this, 'beginTransaction'], 0);
-		$eventProvider->on(Rollback::class, [$this, 'rollback'], 0);
-		$eventProvider->on(Commit::class, [$this, 'commit'], 0);
-
-		if (Db::transactionsActive()) {
-			$this->beginTransaction();
-		}
-
-		$this->_schema->db = $this;
+		$this->getEventProvider()->on(OnWorkerStop::class, [$this, 'clear_connection'], 0);
+		$this->getEventProvider()->on(OnWorkerExit::class, [$this, 'clear_connection'], 0);
+		$this->getEventProvider()->on(BeginTransaction::class, [$this, 'beginTransaction'], 0);
+		$this->getEventProvider()->on(Rollback::class, [$this, 'rollback'], 0);
+		$this->getEventProvider()->on(Commit::class, [$this, 'commit'], 0);
 	}
 
 
@@ -107,17 +97,6 @@ class Connection extends Component
 	}
 
 
-	/**
-	 * @param $config
-	 * @return $this
-	 */
-	public function configure($config): static
-	{
-		Kiri::configure($this, $config);
-		return $this;
-	}
-
-
 	/**
 	 * @throws Exception
 	 */
@@ -130,6 +109,43 @@ class Connection extends Component
 		if (!empty($this->slaveConfig) && $this->cds != $this->slaveConfig['cds']) {
 			$connections->initConnections('Mysql:' . $this->slaveConfig['cds'], false, $pool);
 		}
+//		$name = $connections->name('Mysql:' . $this->cds, true);
+//
+//		$config = $this->_config();
+//		for ($i = 0; $i < $pool; $i++) {
+//			$connections->addItem($name, $connections->create($name, $config)());
+//		}
+//
+//		if (empty($this->slaveConfig)) {
+//			return;
+//		}
+//
+//		$config['cds'] = $this->slaveConfig['cds'];
+//		$config['username'] = $this->slaveConfig['username'];
+//		$config['password'] = $this->slaveConfig['password'];
+//
+//		$name = $connections->name('Mysql:' . $config['cds'], false);
+//		for ($i = 0; $i < $pool; $i++) {
+//			$connections->addItem($name, $connections->create($name, $config)());
+//		}
+	}
+
+
+	/**
+	 * @return array
+	 */
+	private function _config(): array
+	{
+		return [
+			'cds'             => $this->cds,
+			'username'        => $this->username,
+			'password'        => $this->password,
+			'attributes'      => $this->attributes,
+			'connect_timeout' => $this->connect_timeout,
+			'read_timeout'    => $this->read_timeout,
+			'dbname'          => $this->database,
+			'pool'            => $this->pool
+		];
 	}
 
 
@@ -312,8 +328,13 @@ class Connection extends Component
 			return;
 		}
 		$connections = $this->connections();
-		$connections->release($this->cds, true);
-		$connections->release($this->slaveConfig['cds'], false);
+		$connections->release($this->cds, true, $config = $this->_config());
+
+		$config['cds'] = $this->slaveConfig['cds'];
+		$config['username'] = $this->slaveConfig['username'];
+		$config['password'] = $this->slaveConfig['password'];
+
+		$connections->release($this->slaveConfig['cds'], false, $config);
 	}
 
 
@@ -324,8 +345,13 @@ class Connection extends Component
 	{
 		$connections = $this->connections();
 
-		$connections->release($this->cds, true);
-		$connections->release($this->slaveConfig['cds'], false);
+		$connections->release($this->cds, true, $config = $this->_config());
+
+		$config['cds'] = $this->slaveConfig['cds'];
+		$config['username'] = $this->slaveConfig['username'];
+		$config['password'] = $this->slaveConfig['password'];
+
+		$connections->release($this->slaveConfig['cds'], false, $config);
 	}
 
 	/**

DatabasesProviders.php

@@ -5,13 +5,14 @@ namespace Database;
 
 
 use Exception;
+use Kiri;
 use Kiri\Abstracts\Config;
 use Kiri\Abstracts\Providers;
 use Kiri\Application;
-use Kiri\Events\EventProvider;
 use Kiri\Exception\ConfigException;
-use Kiri\Kiri;
-use Server\Events\OnWorkerStart;
+use Kiri\Server\Events\OnTaskerStart;
+use Kiri\Server\Events\OnWorkerStart;
+use Kiri\Server\Events\OnProcessStart;
 
 /**
  * Class DatabasesProviders
@@ -20,8 +21,6 @@ use Server\Events\OnWorkerStart;
 class DatabasesProviders extends Providers
 {
 
-	private array $_pooLength = ['min' => 0, 'max' => 1];
-
 
 	/**
 	 * @param Application $application
@@ -29,25 +28,20 @@ class DatabasesProviders extends Providers
 	 */
 	public function onImport(Application $application)
 	{
-		$application->set('db', $this);
-
-		$this->_pooLength = Config::get('databases.pool', ['min' => 0, 'max' => 1]);
-
-		$this->eventProvider->on(OnWorkerStart::class, [$this, 'createPool']);
+		$this->getEventProvider()->on(OnWorkerStart::class, [$this, 'createPool']);
+		$this->getEventProvider()->on(OnProcessStart::class, [$this, 'createPool']);
+		$this->getEventProvider()->on(OnTaskerStart::class, [$this, 'createPool']);
 	}
 
 
 	/**
 	 * @param $name
 	 * @return Connection
-	 * @throws ConfigException
 	 * @throws Exception
 	 */
 	public function get($name): Connection
 	{
-		$config = $this->_settings($this->getConfig($name));
-
-		return Kiri::getDi()->get(Connection::class)->configure($config);
+		return Kiri::app()->get($name);
 	}
 
 
@@ -55,16 +49,21 @@ class DatabasesProviders extends Providers
 	 * @throws ConfigException
 	 * @throws Exception
 	 */
-	public function createPool(OnWorkerStart $onWorkerStart)
+	public function createPool(OnTaskerStart|OnWorkerStart|OnProcessStart $onWorkerStart)
 	{
 		$databases = Config::get('databases.connections', []);
 		if (empty($databases)) {
 			return;
 		}
-		$connection = Kiri::getDi()->get(Connection::class);
-		foreach ($databases as $database) {
-			/** @var Connection $connection */
-			$connection->configure($database)->fill();
+
+		$app = Kiri::app();
+		foreach ($databases as $key => $database) {
+			$database = $this->_settings($database);
+
+			$connection = Kiri::getDi()->create(Connection::class, [$database]);
+			$connection->fill();
+
+			$app->set($key, $connection);
 		}
 	}
 
@@ -93,15 +92,4 @@ class DatabasesProviders extends Providers
 	}
 
 
-	/**
-	 * @param $name
-	 * @return mixed
-	 * @throws ConfigException
-	 */
-	public function getConfig($name): mixed
-	{
-		return Config::get('databases.connections.' . $name, null, true);
-	}
-
-
 }

Db.php

@@ -43,7 +43,8 @@ class Db implements ISqlBuilder
 	public static function beginTransaction()
 	{
 		if (!static::transactionsActive()) {
-			di(EventDispatch::class)->dispatch(new BeginTransaction());
+			$event = \Kiri::getDi()->get(EventDispatch::class);
+			$event->dispatch(new BeginTransaction());
 		}
 		static::$_inTransaction = true;
 	}
@@ -55,7 +56,8 @@ class Db implements ISqlBuilder
 	public static function commit()
 	{
 		if (static::transactionsActive()) {
-			di(EventDispatch::class)->dispatch(new Commit());
+			$event = \Kiri::getDi()->get(EventDispatch::class);
+			$event->dispatch(new Commit());
 		}
 		static::$_inTransaction = false;
 	}
@@ -67,7 +69,8 @@ class Db implements ISqlBuilder
 	public static function rollback()
 	{
 		if (static::transactionsActive()) {
-			di(EventDispatch::class)->dispatch(new Rollback());
+			$event = \Kiri::getDi()->get(EventDispatch::class);
+			$event->dispatch(new Rollback());
 		}
 		static::$_inTransaction = false;
 	}

HasCount.php

@@ -3,8 +3,8 @@ declare(strict_types=1);
 
 namespace Database;
 
-use Exception;
 use Database\Traits\HasBase;
+use Exception;
 
 /**
  * Class HasCount
@@ -17,14 +17,14 @@ class HasCount extends HasBase
 	 * @param $name
 	 * @param $arguments
 	 * @return ActiveQuery
-	 * @throws Exception
+	 * @throws ActiveQuery|static
 	 */
-	public function __call($name, $arguments): mixed
+	public function __call($name, $arguments)
 	{
-		if (method_exists($this, $name)) {
-			return call_user_func([$this, $name], ...$arguments);
+		if (!method_exists($this, $name)) {
+			return $this->_relation->getQuery($this->model::className())->$name(...$arguments);
 		}
-		return $this->_relation->getQuery($this->model::className())->$name(...$arguments);
+		return call_user_func([$this, $name], ...$arguments);
 	}
 
 	/**

HasMany.php

@@ -6,10 +6,11 @@
  * Time: 13:58
  */
 declare(strict_types=1);
+
 namespace Database;
 
-use Exception;
 use Database\Traits\HasBase;
+use Exception;
 
 /**
  * Class HasMany
@@ -23,14 +24,14 @@ class HasMany extends HasBase
 	/**
 	 * @param $name
 	 * @param $arguments
-	 * @return ActiveQuery
+	 * @return ActiveQuery|static
 	 */
-	public function __call($name, $arguments): mixed
+	public function __call($name, $arguments)
 	{
-		if (method_exists($this, $name)) {
-			return call_user_func([$this, $name], ...$arguments);
+		if (!method_exists($this, $name)) {
+			return $this->_relation->getQuery($this->model::className())->$name(...$arguments);
 		}
-		return $this->_relation->getQuery($this->model::className())->$name(...$arguments);
+		return call_user_func([$this, $name], ...$arguments);
 	}
 
 	/**

HasOne.php

@@ -9,8 +9,8 @@ declare(strict_types=1);
 
 namespace Database;
 
-use Exception;
 use Database\Traits\HasBase;
+use Exception;
 
 /**
  * Class HasOne
@@ -23,15 +23,14 @@ class HasOne extends HasBase
 	/**
 	 * @param $name
 	 * @param $arguments
-	 * @return ActiveQuery
+	 * @return ActiveQuery|static
 	 */
-	public function __call($name, $arguments): mixed
+	public function __call($name, $arguments)
 	{
-		if (method_exists($this, $name)) {
-			return call_user_func([$this, $name], ...$arguments);
+		if (!method_exists($this, $name)) {
+			return $this->_relation->getQuery($this->model::className())->$name(...$arguments);
 		}
-		$this->_relation->getQuery($this->model::className())->$name(...$arguments);
-		return $this;
+		return call_user_func([$this, $name], ...$arguments);
 	}
 
 	/**

Model.php

@@ -13,10 +13,11 @@ namespace Database;
 use Database\Base\Getter;
 use Database\Traits\HasBase;
 use Exception;
+use Kiri;
 use Kiri\Exception\NotFindClassException;
-use Kiri\Kiri;
 use Kiri\ToArray;
 use ReflectionException;
+use Swoole\Coroutine;
 
 defined('SAVE_FAIL') or define('SAVE_FAIL', 3227);
 defined('FIND_OR_CREATE_MESSAGE') or define('FIND_OR_CREATE_MESSAGE', 'Create a new model, but the data cannot be empty.');
@@ -111,19 +112,15 @@ class Model extends Base\Model
 		if (empty($attributes)) {
 			return $logger->addError(FIND_OR_CREATE_MESSAGE, 'mysql');
 		}
-		Db::beginTransaction();
 		/** @var static $select */
 		$select = static::query()->where($condition)->first();
 		if (empty($select)) {
 			$select = duplicate(static::class);
 			$select->attributes = $attributes;
-			$select->setIsNowExample(true);
 			if (!$select->save()) {
-				Db::rollback();
-				return $logger->addError($select->getLastError(), 'mysql');
+				throw new Exception($select->getLastError());
 			}
 		}
-		Db::commit();
 		return $select;
 	}
 
@@ -140,8 +137,6 @@ class Model extends Base\Model
 		if (empty($attributes)) {
 			return $logger->addError(FIND_OR_CREATE_MESSAGE, 'mysql');
 		}
-
-		Db::beginTransaction();
 		/** @var static $select */
 		$select = static::query()->where($condition)->first();
 		if (empty($select)) {
@@ -149,10 +144,7 @@ class Model extends Base\Model
 		}
 		$select->attributes = $attributes;
 		if (!$select->save()) {
-			Db::rollback();
-			$select = $logger->addError($select->getLastError(), 'mysql');
-		} else {
-			Db::commit();
+			throw new Exception($select->getLastError());
 		}
 		return $select;
 	}
@@ -213,16 +205,18 @@ class Model extends Base\Model
 	 */
 	public function delete(): bool
 	{
-		$conditions = $this->_oldAttributes;
-		if (empty($conditions)) {
-			return $this->addError("Delete condition do not empty.", 'mysql');
-		}
 		$primary = $this->getPrimary();
-
-		if (!empty($primary)) {
-			$conditions = [$primary => $this->getAttribute($primary)];
+		if (empty($primary) || !$this->hasPrimaryValue()) {
+			return $this->addError("Only primary key operations are supported.", 'mysql');
 		}
-		return static::deleteByCondition($conditions);
+		if (!$this->beforeDelete()) {
+			$result = static::deleteByCondition([$primary => $this->getPrimaryValue()]);
+			Coroutine::create(function () use ($result) {
+				$this->afterDelete($result);
+			});
+			return $result;
+		}
+		return false;
 	}
 
 
@@ -401,12 +395,11 @@ class Model extends Base\Model
 	}
 
 	/**
-	 * @return bool
-	 * @throws Exception
+	 * @param bool $result
+	 * @return void
 	 */
-	public function afterDelete(): bool
+	public function afterDelete(bool $result): void
 	{
-		return TRUE;
 	}
 
 	/**

ModelInterface.php

@@ -32,11 +32,11 @@ interface ModelInterface
 	public static function find(string|int $param): mixed;
 
 
-    /**
-     * @param array $data
-     * @return static
-     */
-    public static function populate(array $data): static;
+	/**
+	 * @param array $data
+	 * @return static
+	 */
+	public static function populate(array $data): static;
 
 
 	/**
@@ -46,6 +46,12 @@ interface ModelInterface
 	public static function query(): ActiveQuery;
 
 
+	/**
+	 * @return string
+	 */
+	public function getPrimary(): string;
+
+
 	/**
 	 * @return string
 	 */

Mysql/PDO.php

@@ -3,10 +3,11 @@
 namespace Database\Mysql;
 
 use Exception;
+use Kiri;
 use Kiri\Abstracts\Config;
-use Kiri\Abstracts\Logger;
-use Kiri\Kiri;
+use Kiri\Events\EventProvider;
 use Kiri\Pool\StopHeartbeatCheck;
+use Kiri\Server\Events\OnWorkerExit;
 use PDOStatement;
 use Swoole\Timer;
 
@@ -57,9 +58,14 @@ class PDO implements StopHeartbeatCheck
 	}
 
 
-	public function init()
+	/**
+	 * @return void
+	 */
+	public function init(): void
 	{
 		$this->heartbeat_check();
+		$eventProvider = Kiri::getDi()->get(EventProvider::class);
+		$eventProvider->on(OnWorkerExit::class, [$this, 'onWorkerExit']);
 	}
 
 
@@ -72,14 +78,21 @@ class PDO implements StopHeartbeatCheck
 	}
 
 
+	/**
+	 * @param Kiri\Server\Events\OnWorkerExit $exit
+	 * @return void
+	 */
+	public function onWorkerExit(OnWorkerExit $exit)
+	{
+		$this->stopHeartbeatCheck();
+	}
+
+
 	/**
 	 *
 	 */
 	public function heartbeat_check(): void
 	{
-		if (env('state', 'start') == 'exit') {
-			return;
-		}
 		if ($this->_timer === -1) {
 			$this->_timer = Timer::tick(1000, fn() => $this->waite());
 		}
@@ -92,12 +105,12 @@ class PDO implements StopHeartbeatCheck
 	private function waite(): void
 	{
 		try {
-			if (env('state', 'start') == 'exit') {
-				Kiri::getDi()->get(Logger::class)->critical('timer end');
+			if ($this->_timer == -1) {
 				$this->stopHeartbeatCheck();
 			}
 			if (time() - $this->_last > (int)Config::get('databases.pool.tick', 60)) {
 				$this->stopHeartbeatCheck();
+
 				$this->pdo = null;
 			}
 		} catch (\Throwable $throwable) {
@@ -232,7 +245,7 @@ class PDO implements StopHeartbeatCheck
 				throw new Exception($this->_pdo()->errorInfo()[1]);
 			}
 			return $this->bindValue($statement, $params);
-		} catch (\PDOException | \Throwable $throwable) {
+		} catch (\PDOException|\Throwable $throwable) {
 			if (str_contains($throwable->getMessage(), 'MySQL server has gone away')) {
 				$this->pdo = null;
 
@@ -313,7 +326,7 @@ class PDO implements StopHeartbeatCheck
 		$link->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
 		$link->setAttribute(\PDO::ATTR_STRINGIFY_FETCHES, false);
 		$link->setAttribute(\PDO::ATTR_ORACLE_NULLS, \PDO::NULL_EMPTY_STRING);
-		if (!empty($this->attributes) && is_array($this->attributes)) {
+		if (!empty($this->attributes)) {
 			foreach ($this->attributes as $key => $attribute) {
 				$link->setAttribute($key, $attribute);
 			}

Traits/Builder.php

@@ -12,7 +12,7 @@ use Database\Query;
 use Exception;
 use JetBrains\PhpStorm\Pure;
 use Kiri\Exception\NotFindClassException;
-use Kiri\Kiri;
+use Kiri;
 use ReflectionException;
 
 

Traits/QueryTrait.php

@@ -18,7 +18,7 @@ use Database\Query;
 use Database\SqlBuilder;
 use Exception;
 use Kiri\Exception\NotFindClassException;
-use Kiri\Kiri;
+use Kiri;
 use ReflectionException;
 
 /**
@@ -195,7 +195,7 @@ trait QueryTrait
 	 * @param string $column
 	 * @return $this
 	 */
-	public function whereNotEmpty(string $column): static
+	public function whereAnnotationmpty(string $column): static
 	{
 		$this->where[] = $column . ' <> \'\'';
 		return $this;

composer.json

@@ -12,12 +12,12 @@
     "php": ">=8.0",
     "ext-json": "*",
     "ext-pdo": "*",
-    "game-worker/kiri-validator": "^v1.2",
-    "game-worker/kiri-event": "^v1.0"
+    "game-worker/kiri-validator": "~v2.0",
+    "game-worker/kiri-event": "~v2.0"
   },
   "autoload": {
     "psr-4": {
-      "Database\\": "src/"
+      "Database\\": "./"
      }
   },
   "require-dev": {

src/ActiveQuery.php

@@ -1,309 +0,0 @@
-<?php
-/**
- * Created by PhpStorm.
- * User: whwyy
- * Date: 2018/4/4 0004
- * Time: 14:42
- */
-declare(strict_types=1);
-
-namespace Database;
-
-use Database\Traits\QueryTrait;
-use Exception;
-use Kiri\Abstracts\Component;
-
-/**
- * Class ActiveQuery
- * @package Database
- */
-class ActiveQuery extends Component implements ISqlBuilder
-{
-
-	use QueryTrait;
-
-	/** @var array */
-	public array $with = [];
-
-	/** @var bool */
-	public bool $asArray = FALSE;
-
-	/** @var bool */
-	public bool $useCache = FALSE;
-
-	/**
-	 * @var Connection|null
-	 */
-	public ?Connection $db = NULL;
-
-	/**
-	 * @var array
-	 * 参数绑定
-	 */
-	public array $attributes = [];
-
-
-	/**
-	 * Comply constructor.
-	 * @param $model
-	 * @param array $config
-	 * @throws
-	 */
-	public function __construct($model, array $config = [])
-	{
-		$this->modelClass = $model;
-
-		$this->builder = SqlBuilder::builder($this);
-		parent::__construct($config);
-	}
-
-
-	/**
-	 * 清除不完整数据
-	 */
-	public function clear()
-	{
-		$this->db = null;
-		$this->useCache = false;
-		$this->with = [];
-	}
-
-	/**
-	 * @param $key
-	 * @param $value
-	 * @return $this
-	 */
-	public function addParam($key, $value): static
-	{
-		$this->attributes[$key] = $value;
-		return $this;
-	}
-
-	/**
-	 * @param array $values
-	 * @return $this
-	 */
-	public function addParams(array $values): static
-	{
-		foreach ($values as $key => $val) {
-			$this->addParam($key, $val);
-		}
-		return $this;
-	}
-
-	/**
-	 * @param $name
-	 * @return $this
-	 */
-	public function with($name): static
-	{
-		if (empty($name)) {
-			return $this;
-		}
-		if (is_string($name)) {
-			$name = explode(',', $name);
-		}
-		foreach ($name as $val) {
-			array_push($this->with, $val);
-		}
-		return $this;
-	}
-
-
-	/**
-	 * @param $sql
-	 * @param array $params
-	 * @return mixed
-	 * @throws Exception
-	 */
-	public function execute($sql, array $params = []): Command
-	{
-		return $this->modelClass->getConnection()->createCommand($sql, $params);
-	}
-
-
-	/**
-	 * @return ModelInterface|null
-	 * @throws Exception
-	 */
-	public function first(): ModelInterface|null
-	{
-		$data = $this->execute($this->builder->one())->one();
-		if (empty($data)) {
-			return NULL;
-		}
-		return $this->populate($data);
-	}
-
-
-	/**
-	 * @return string
-	 * @throws Exception
-	 */
-	public function toSql(): string
-	{
-		return $this->builder->get();
-	}
-
-
-	/**
-	 * @return array|Collection
-	 */
-	public function get(): Collection|array
-	{
-		return $this->all();
-	}
-
-
-	/**
-	 * @throws Exception
-	 */
-	public function flush(): array|bool|int|string|null
-	{
-		return $this->execute($this->builder->truncate())->exec();
-	}
-
-
-	/**
-	 * @param int $size
-	 * @param callable $callback
-	 * @return Pagination
-	 * @throws Exception
-	 */
-	public function page(int $size, callable $callback): Pagination
-	{
-		$pagination = new Pagination($this);
-		$pagination->setOffset(0);
-		$pagination->setLimit($size);
-		$pagination->setCallback($callback);
-		return $pagination;
-	}
-
-	/**
-	 * @param string $field
-	 * @param string $setKey
-	 *
-	 * @return array|null
-	 * @throws Exception
-	 */
-	public function column(string $field, string $setKey = ''): ?array
-	{
-		return $this->all()->column($field, $setKey);
-	}
-
-	/**
-	 * @return array|Collection
-	 * @throws
-	 */
-	public function all(): Collection|array
-	{
-		$data = $this->execute($this->builder->all())->all();
-		if (!empty($this->with)){
-			$this->getWith($this->modelClass);
-		}
-		$collect = new Collection($this, $data, $this->modelClass);
-		if ($this->asArray) {
-			return $collect->toArray();
-		}
-		return $collect;
-	}
-
-	/**
-	 * @param $data
-	 * @return ModelInterface
-	 * @throws Exception
-	 */
-	public function populate($data): ModelInterface
-	{
-		return $this->getWith($this->modelClass::populate($data));
-	}
-
-
-	/**
-	 * @param ModelInterface $model
-	 * @return ModelInterface
-	 */
-	public function getWith(ModelInterface $model): ModelInterface
-	{
-		if (empty($this->with) || !is_array($this->with)) {
-			return $model;
-		}
-		return $model->setWith($this->with);
-	}
-
-	/**
-	 * @return int
-	 * @throws Exception
-	 */
-	public function count(): int
-	{
-		$data = $this->execute($this->builder->count())->one();
-		if ($data && is_array($data)) {
-			return (int)array_shift($data);
-		}
-		return 0;
-	}
-
-
-	/**
-	 * @param array $data
-	 * @return array|Command|bool|int|string
-	 * @throws Exception
-	 */
-	public function batchUpdate(array $data): Command|array|bool|int|string
-	{
-		$generate = $this->builder->update($data);
-		if (is_bool($generate)) {
-			return $generate;
-		}
-		return $this->execute(...$generate)->exec();
-	}
-
-	/**
-	 * @param array $data
-	 * @return bool
-	 * @throws Exception
-	 */
-	public function batchInsert(array $data): bool
-	{
-		[$sql, $params] = $this->builder->insert($data, true);
-
-
-		return $this->execute($sql, $params)->exec();
-	}
-
-	/**
-	 * @param $filed
-	 *
-	 * @return null
-	 * @throws Exception
-	 */
-	public function value($filed)
-	{
-		return $this->first()[$filed] ?? null;
-	}
-
-	/**
-	 * @return bool
-	 * @throws Exception
-	 */
-	public function exists(): bool
-	{
-		return !empty($this->execute($this->builder->one())->fetchColumn());
-	}
-
-
-	/**
-	 * @param bool $getSql
-	 * @return int|bool|string|null
-	 * @throws Exception
-	 */
-	public function delete(bool $getSql = false): int|bool|string|null
-	{
-		$sql = $this->builder->delete();
-		if ($getSql === false) {
-			return $this->execute($sql)->delete();
-		}
-		return $sql;
-	}
-}

src/TestModel.php

@@ -1,26 +0,0 @@
-<?php
-
-namespace Database;
-
-
-use Database\Model;
-
-/**
- *
- */
-class TestModel extends Model
-{
-
-
-	protected string $connection = '';
-
-
-	protected string $table = '';
-
-
-	public ?string $primary = '';
-
-}
-
-
-TestModel::query()->get();