Revert "改名"

This reverts commit fdf58326

.phpstorm.meta.php

@@ -4,7 +4,10 @@ namespace PHPSTORM_META {
 
     // Reflect
 	use Kiri\Di\Container;
+	use Psr\Container\ContainerInterface;
 
+	override(ContainerInterface::get(0), map('@'));
+	override(Container::make(0), map('@'));
 	override(Container::get(0), map('@'));
 	override(Container::create(0), map('@'));
 //    override(\Hyperf\Utils\Context::get(0), map('@'));

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) {
+            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;
+    }
+}

Annotation/Get.php

@@ -13,7 +13,7 @@ use Exception;
  * Class Get
  * @package Annotation\Model
  */
-#[Attribute(Attribute::TARGET_METHOD)] class Get extends \Annotation\Attribute
+#[Attribute(Attribute::TARGET_METHOD)] class Get extends \Kiri\Annotation\Attribute
 {
 
 

Annotation/Relation.php

@@ -4,7 +4,7 @@
 namespace Database\Annotation;
 
 
-use Annotation\Attribute;
+use Kiri\Annotation\Attribute;
 use Database\Base\Relate;
 use Exception;
 

Annotation/Set.php

@@ -4,7 +4,7 @@
 namespace Database\Annotation;
 
 
-use Annotation\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);
     }
 
 
@@ -134,7 +135,7 @@ abstract class AbstractCollection extends Component implements \IteratorAggregat
             return NULL;
         }
         if (!($this->_item[$offset] instanceof ModelInterface)) {
-            return $this->model->setAttributes($this->_item[$offset]);
+            return $this->model->populates($this->_item[$offset]);
         }
         return $this->_item[$offset];
     }
@@ -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);
 	}
 
@@ -56,7 +42,7 @@ class CollectionIterator extends \ArrayIterator
 	 */
 	protected function newModel($current): ModelInterface
 	{
-		return $this->model->setAttributes($current);
+		return $this->model->populates($current);
 	}
 
 

Base/Model.php

@@ -13,12 +13,10 @@ 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.');
 
 
-use Annotation\Inject;
 use ArrayAccess;
 use Closure;
 use Database\ActiveQuery;
 use Database\Connection;
-use Database\HasCount;
 use Database\HasMany;
 use Database\HasOne;
 use Database\ModelInterface;
@@ -27,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;
 
 /**
@@ -42,9 +38,7 @@ use validator\Validator;
  *
  * @package Kiri\Abstracts
  *
- * @property bool $isCreate
- * @property Application $container
- * @property EventDispatch $eventDispatch
+ * @property bool $isNowExample
  * @property array $attributes
  * @property array $oldAttributes
  */
@@ -98,12 +92,6 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 	protected string $connection = 'db';
 
 
-	/**
-	 * @var array
-	 */
-	protected array $rules = [];
-
-
 	/**
 	 * @var array
 	 */
@@ -111,25 +99,27 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 
 
 	/**
-	 * @return Application
+	 * @return array
 	 */
-	#[Pure] protected function getContainer(): Application
+	public function rules(): array
 	{
-		return Kiri::app();
+		return [];
 	}
 
 
 	/**
 	 * @param string $name
 	 * @param mixed $value
+	 * @return mixed
+	 * @throws ReflectionException
 	 */
-	private function _setter(string $name, mixed $value): void
+	private function _setter(string $name, mixed $value): mixed
 	{
 		$method = di(Setter::class)->getSetter(static::class, $name);
 		if (!empty($method)) {
 			$value = $this->{$method}($value);
 		}
-		$this->_attributes[$name] = $value;
+		return $value;
 	}
 
 
@@ -137,7 +127,6 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 	 * @param string $name
 	 * @param $value
 	 * @return mixed
-	 * @throws NotFindClassException
 	 * @throws ReflectionException
 	 */
 	private function _getter(string $name, $value): mixed
@@ -154,7 +143,6 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 	 * @param string $name
 	 * @param $value
 	 * @return mixed
-	 * @throws NotFindClassException
 	 * @throws ReflectionException
 	 * @throws Exception
 	 */
@@ -172,15 +160,6 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 	}
 
 
-	/**
-	 * @return EventDispatch
-	 */
-	protected function getEventDispatch(): EventDispatch
-	{
-		return Kiri::getDi()->get(EventDispatch::class);
-	}
-
-
 	/**
 	 * @param $data
 	 * @return Model
@@ -236,7 +215,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 	/**
 	 * @return bool
 	 */
-	public function getIsCreate(): bool
+	public function getIsNowExample(): bool
 	{
 		return $this->isNewExample === TRUE;
 	}
@@ -246,7 +225,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 	 * @param bool $bool
 	 * @return $this
 	 */
-	public function setIsCreate(bool $bool = FALSE): static
+	public function setIsNowExample(bool $bool = FALSE): static
 	{
 		$this->isNewExample = $bool;
 		return $this;
@@ -270,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;
 	}
 
 
@@ -285,7 +264,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 	 */
 	public function isAutoIncrement(): bool
 	{
-		return $this->getAutoIncrement() !== null;
+		return $this->getAutoIncrement() !== NULL;
 	}
 
 	/**
@@ -303,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
@@ -315,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);
 	}
@@ -331,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);
@@ -364,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)) {
@@ -372,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];
 	}
@@ -401,6 +394,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 
 	/**
 	 * @return static
+	 * @throws ReflectionException
 	 */
 	private static function makeNewInstance(): static
 	{
@@ -435,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);
 	}
 
 
@@ -447,19 +441,19 @@ 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 static::query()->delete();
+			return (bool)static::query()->delete();
 		}
 		$model = static::query()->ifNotWhere($if_condition_is_null)->where($condition);
 		if (!empty($attributes)) {
 			$model->bindParams($attributes);
 		}
-		return $model->delete();
+		return (bool)$model->delete();
 	}
 
 
@@ -484,20 +478,22 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 	 * @param $name
 	 * @param $value
 	 * @return mixed
+	 * @throws ReflectionException
 	 */
 	public function setAttribute($name, $value): mixed
 	{
-		return $this->_attributes[$name] = $value;
+		return $this->_attributes[$name] = $this->_setter($name, $value);
 	}
 
 	/**
 	 * @param $name
 	 * @param $value
 	 * @return mixed
+	 * @throws ReflectionException
 	 */
 	public function setOldAttribute($name, $value): mixed
 	{
-		return $this->_oldAttributes[$name] = $value;
+		return $this->_oldAttributes[$name] = $this->_setter($name, $value);
 	}
 
 	/**
@@ -510,21 +506,25 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 		if (empty($param)) {
 			return $this;
 		}
-		$this->_attributes = array_merge($this->_attributes, $param);
+		foreach ($param as $key => $attribute) {
+			$this->setAttribute($key, $attribute);
+		}
 		return $this;
 	}
 
+
 	/**
 	 * @param $param
 	 * @return $this
+	 * @throws ReflectionException
 	 */
 	public function setOldAttributes($param): static
 	{
 		if (empty($param) || !is_array($param)) {
 			return $this;
 		}
-		foreach ($param as $key => $val) {
-			$this->setOldAttribute($key, $val);
+		foreach ($param as $key => $attribute) {
+			$this->setOldAttribute($key, $attribute);
 		}
 		return $this;
 	}
@@ -539,10 +539,10 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 	{
 		[$sql, $param] = SqlBuilder::builder(static::query())->insert($param);
 		$dbConnection = $this->getConnection()->createCommand($sql, $param);
-		if (!($lastId = (int)$dbConnection->save(true, $this))) {
-			throw new Exception('保存失败.');
-		}
-		$lastId = $this->setPrimary($lastId, $param);
+
+		$lastId = $dbConnection->save();
+
+		$lastId = $this->setPrimary((int)$lastId, $param);
 
 		$this->refresh()->afterSave($attributes, $param);
 
@@ -571,7 +571,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 		if (!isset($param[$primary]) || empty($param[$primary])) {
 			$this->setAttribute($primary, (int)$lastId);
 		}
-		return $this->setAttributes($param);
+		return $this;
 	}
 
 
@@ -585,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()];
@@ -595,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;
 	}
 
 	/**
@@ -611,14 +611,28 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 		if (!is_null($data)) {
 			$this->_attributes = merge($this->_attributes, $data);
 		}
-		if (!$this->validator($this->rules) || !$this->beforeSave($this)) {
-			return false;
+		if (!$this->validator($this->rules()) || !$this->beforeSave($this)) {
+			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;
 	}
 
 
@@ -629,7 +643,7 @@ 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');
@@ -668,7 +682,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 		if ($this->hasAnnotation($name)) {
 			return $this->runAnnotation($name, $this->_attributes[$name]);
 		}
-		return $this->_attributes[$name] ?? null;
+		return $this->_attributes[$name] ?? NULL;
 	}
 
 
@@ -693,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 {
@@ -804,9 +818,9 @@ 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, '{{%}}');
-		if (!empty($tablePrefix) && !str_starts_with($this->table, $tablePrefix)) {
-			$table = $tablePrefix . $this->table;
+		$table = trim($this->table, '{%}');
+		if (!empty($tablePrefix) && !str_starts_with($table, $tablePrefix)) {
+			$table = $tablePrefix . $table;
 		}
 		return '`' . $connection->database . '`.' . $table;
 	}
@@ -820,7 +834,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 	 */
 	public function afterSave($attributes, $changeAttributes): bool
 	{
-		return true;
+		return TRUE;
 	}
 
 
@@ -830,7 +844,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 	 */
 	public function beforeSave($model): bool
 	{
-		return true;
+		return TRUE;
 	}
 
 
@@ -853,7 +867,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 		if (method_exists($this, 'set' . ucfirst($name))) {
 			$this->{'set' . ucfirst($name)}($value);
 		} else {
-			$this->_setter($name, $value);
+			$this->_attributes[$name] = $this->_setter($name, $value);
 		}
 	}
 
@@ -869,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);
 	}
@@ -919,7 +933,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 	protected function hasAnnotation($name, string $type = self::GET): bool
 	{
 		if (!isset($this->_annotations[$type])) {
-			return false;
+			return FALSE;
 		}
 		return isset($this->_annotations[$type][$name]);
 	}
@@ -986,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);
 	}
@@ -995,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])) {
@@ -1045,7 +1059,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 		$model = duplicate(static::class);
 		$model->_attributes = $data;
 		$model->_oldAttributes = $data;
-		$model->setIsCreate(false);
+		$model->setIsNowExample(FALSE);
 		return $model;
 	}
 

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,14 +50,12 @@ 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, $isInsert, $hasAutoIncrement);
+		return $this->execute(static::EXECUTE);
 	}
 
 
@@ -110,18 +105,16 @@ class Command extends Component
 	}
 
 	/**
-	 * @param $type
-	 * @param null $isInsert
-	 * @param bool|null $hasAutoIncrement
+	 * @param string $type
 	 * @return int|bool|array|string|null
 	 * @throws Exception
 	 */
-	private function execute($type, $isInsert = null, mixed $hasAutoIncrement = null): int|bool|array|string|null
+	private function execute(string $type): int|bool|array|string|null
 	{
 		try {
 			$time = microtime(true);
 			if ($type === static::EXECUTE) {
-				$result = $this->insert_or_change($isInsert, $hasAutoIncrement);
+				$result = $this->db->getConnect($this->sql)->execute($this->sql,$this->params);
 			} else {
 				$result = $this->search($type);
 			}
@@ -138,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) {
@@ -158,22 +151,6 @@ class Command extends Component
 	}
 
 
-	/**
-	 * @param $isInsert
-	 * @param $hasAutoIncrement
-	 * @return bool|int
-	 * @throws Exception
-	 */
-	private function insert_or_change($isInsert, $hasAutoIncrement): bool|int
-	{
-		$pdo = $this->db->getConnect($this->sql);
-		$result = $pdo->execute($this->sql, $isInsert, $this->params);
-		if ($hasAutoIncrement && $result == 0) {
-			return false;
-		}
-		return $result;
-	}
-
 	/**
 	 * @return int|bool|array|string|null
 	 * @throws Exception
@@ -184,14 +161,12 @@ class Command extends Component
 	}
 
 	/**
-	 * @param null $scope
-	 * @param bool $insert
 	 * @return int|bool|array|string|null
 	 * @throws Exception
 	 */
-	public function exec($scope = null, bool $insert = false): int|bool|array|string|null
+	public function exec(): int|bool|array|string|null
 	{
-		return $this->execute(static::EXECUTE, $insert, $scope);
+		return $this->execute(static::EXECUTE);
 	}
 
 	/**
@@ -200,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

@@ -5,14 +5,13 @@ namespace Database\Condition;
 
 
 use JetBrains\PhpStorm\Pure;
-use Kiri\Abstracts\BaseObject;
-use Kiri\Core\Str;
+use Kiri\Abstracts\Component;
 
 /**
  * Class Condition
  * @package Database\Condition
  */
-abstract class Condition extends BaseObject
+abstract class Condition extends Component
 {
 
 	protected string $column = '';

Condition/HashCondition.php

@@ -20,9 +20,8 @@ class HashCondition extends Condition
 			return '';
 		}
 		foreach ($this->value as $key => $value) {
-			if ($value === null) {
-				continue;
-			}
+			if (is_null($value)) continue;
+
 			$array[] = sprintf("%s = '%s'", $key, addslashes($value));
 		}
 		return implode(' AND ', $array);

Connection.php

@@ -11,7 +11,6 @@ declare(strict_types=1);
 namespace Database;
 
 
-use Annotation\Inject;
 use Database\Affair\BeginTransaction;
 use Database\Affair\Commit;
 use Database\Affair\Rollback;
@@ -22,10 +21,11 @@ use Kiri\Abstracts\Component;
 use Kiri\Abstracts\Config;
 use Kiri\Events\EventProvider;
 use Kiri\Exception\NotFindClassException;
-use Kiri\Kiri;
+use Kiri;
+use Kiri\Annotation\Inject;
 use ReflectionException;
-use Server\Events\OnWorkerExit;
-use Server\Events\OnWorkerStop;
+use Kiri\Server\Events\OnWorkerExit;
+use Kiri\Server\Events\OnWorkerStop;
 
 /**
  * Class Connection
@@ -43,7 +43,11 @@ class Connection extends Component
 
 	public string $database = '';
 
-	public int $timeout = 1900;
+	public int $connect_timeout = 30;
+
+	public int $read_timeout = 10;
+
+	public array $pool;
 
 	/**
 	 * @var bool
@@ -61,20 +65,10 @@ class Connection extends Component
 	 * @var array
 	 */
 	public array $slaveConfig = [];
+	public array $attributes = [];
 
 
-	/**
-	 * @var Schema
-	 */
-	#[Inject(Schema::class)]
-	public Schema $_schema;
-
-
-	/**
-	 * @var EventProvider
-	 */
-	#[Inject(EventProvider::class)]
-	public EventProvider $eventProvider;
+	private ?Schema $_schema = null;
 
 
 	/**
@@ -88,12 +82,6 @@ class Connection extends Component
 		$this->eventProvider->on(BeginTransaction::class, [$this, 'beginTransaction'], 0);
 		$this->eventProvider->on(Rollback::class, [$this, 'rollback'], 0);
 		$this->eventProvider->on(Commit::class, [$this, 'commit'], 0);
-
-		if (Db::transactionsActive()) {
-			$this->beginTransaction();
-		}
-
-		$this->_schema->db = $this;
 	}
 
 
@@ -141,7 +129,7 @@ class Connection extends Component
 	 * @return mixed
 	 * @throws ReflectionException
 	 * @throws NotFindClassException
-	 * @throws \Exception
+	 * @throws Exception
 	 */
 	public function getSchema(): Schema
 	{
@@ -186,10 +174,14 @@ class Connection extends Component
 	public function masterInstance(): PDO
 	{
 		return $this->connections()->get([
-			'cds'      => $this->cds,
-			'username' => $this->username,
-			'password' => $this->password,
-			'database' => $this->database
+			'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
 		], true);
 	}
 

DatabasesProviders.php

@@ -0,0 +1,91 @@
+<?php
+declare(strict_types=1);
+
+namespace Database;
+
+
+use Exception;
+use Kiri\Abstracts\Config;
+use Kiri\Abstracts\Providers;
+use Kiri\Application;
+use Kiri\Exception\ConfigException;
+use Kiri;
+use Kiri\Events\OnBeforeCommandExecute;
+
+/**
+ * Class DatabasesProviders
+ * @package Database
+ */
+class DatabasesProviders extends Providers
+{
+
+
+	/**
+	 * @param Application $application
+	 * @throws Exception
+	 */
+	public function onImport(Application $application)
+	{
+		$this->eventProvider->on(OnBeforeCommandExecute::class, [$this, 'createPool']);
+	}
+
+
+	/**
+	 * @param $name
+	 * @return Connection
+	 * @throws Exception
+	 */
+	public function get($name): Connection
+	{
+		return Kiri::app()->get($name);
+	}
+
+
+	/**
+	 * @throws ConfigException
+	 * @throws Exception
+	 */
+	public function createPool(OnBeforeCommandExecute $onWorkerStart)
+	{
+		$databases = Config::get('databases.connections', []);
+		if (empty($databases)) {
+			return;
+		}
+
+		$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);
+		}
+	}
+
+
+	/**
+	 * @param $database
+	 * @return array
+	 */
+	private function _settings($database): array
+	{
+		$clientPool = $database['pool'] ?? ['min' => 1, 'max' => 5, 'tick' => 60];
+		return [
+			'id'              => $database['id'],
+			'cds'             => $database['cds'],
+			'username'        => $database['username'],
+			'password'        => $database['password'],
+			'tablePrefix'     => $database['tablePrefix'],
+			'database'        => $database['database'],
+			'connect_timeout' => $database['connect_timeout'] ?? 30,
+			'read_timeout'    => $database['read_timeout'] ?? 10,
+			'pool'            => $clientPool,
+			'attributes'      => $database['attributes'] ?? [],
+			'charset'         => $database['charset'] ?? 'utf8mb4',
+			'slaveConfig'     => $database['slaveConfig']
+		];
+	}
+
+
+}

Model.php

@@ -14,9 +14,10 @@ use Database\Base\Getter;
 use Database\Traits\HasBase;
 use Exception;
 use Kiri\Exception\NotFindClassException;
-use Kiri\Kiri;
+use 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.');
@@ -117,6 +118,7 @@ class Model extends Base\Model
 		if (empty($select)) {
 			$select = duplicate(static::class);
 			$select->attributes = $attributes;
+			$select->setIsNowExample(true);
 			if (!$select->save()) {
 				Db::rollback();
 				return $logger->addError($select->getLastError(), 'mysql');
@@ -212,16 +214,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;
 	}
 
 
@@ -334,7 +338,7 @@ class Model extends Base\Model
 	 */
 	public function hasOne(string $modelName, $foreignKey, $localKey): HasOne|ActiveQuery
 	{
-		if (($value = $this->getAttribute($localKey)) === null) {
+		if (($value = $this->{$localKey}) === null) {
 			throw new Exception("Need join table primary key.");
 		}
 
@@ -353,7 +357,7 @@ class Model extends Base\Model
 	 */
 	public function hasCount($modelName, $foreignKey, $localKey): ActiveQuery|HasCount
 	{
-		if (($value = $this->getAttribute($localKey)) === null) {
+		if (($value = $this->{$localKey}) === null) {
 			throw new Exception("Need join table primary key.");
 		}
 
@@ -372,7 +376,7 @@ class Model extends Base\Model
 	 */
 	public function hasMany($modelName, $foreignKey, $localKey): ActiveQuery|HasMany
 	{
-		if (($value = $this->getAttribute($localKey)) === null) {
+		if (($value = $this->{$localKey}) === null) {
 			throw new Exception("Need join table primary key.");
 		}
 
@@ -390,7 +394,7 @@ class Model extends Base\Model
 	 */
 	public function hasIn($modelName, $foreignKey, $localKey): ActiveQuery|HasMany
 	{
-		if (($value = $this->getAttribute($localKey)) === null) {
+		if (($value = $this->{$localKey}) === null) {
 			throw new Exception("Need join table primary key.");
 		}
 
@@ -400,12 +404,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,10 +32,11 @@ interface ModelInterface
 	public static function find(string|int $param): mixed;
 
 
-	/**
-	 * @return string
-	 */
-	public static function className(): string;
+    /**
+     * @param array $data
+     * @return static
+     */
+    public static function populate(array $data): static;
 
 
 	/**

Mysql/Columns.php

@@ -316,7 +316,7 @@ class Columns extends Component
 
 
 	/**
-	 * @param $column
+	 * @param array $column
 	 * @param $table
 	 * @return array
 	 */

Mysql/PDO.php

@@ -0,0 +1,342 @@
+<?php
+
+namespace Database\Mysql;
+
+use Exception;
+use Kiri;
+use Kiri\Abstracts\Config;
+use Kiri\Events\EventProvider;
+use Kiri\Pool\StopHeartbeatCheck;
+use Kiri\Server\Events\OnWorkerExit;
+use PDOStatement;
+use Swoole\Timer;
+
+/**
+ *
+ */
+class PDO implements StopHeartbeatCheck
+{
+
+	const DB_ERROR_MESSAGE = 'The system is busy, please try again later.';
+
+
+	private ?\PDO $pdo = null;
+
+
+	private int $_transaction = 0;
+
+
+	private int $_timer = -1;
+
+	private int $_last = 0;
+
+	public string $dbname;
+	public string $cds;
+	public string $username;
+	public string $password;
+	public string $charset;
+	public int $connect_timeout;
+	public int $read_timeout;
+
+
+	private EventProvider $eventProvider;
+
+
+	public array $attributes = [];
+
+
+	/**
+	 * @param array $config
+	 */
+	public function __construct(array $config)
+	{
+		$this->dbname = $config['dbname'];
+		$this->cds = $config['cds'];
+		$this->username = $config['username'];
+		$this->password = $config['password'];
+		$this->connect_timeout = $config['connect_timeout'] ?? 30;
+		$this->read_timeout = $config['read_timeout'] ?? 10;
+		$this->charset = $config['charset'] ?? 'utf8mb4';
+		$this->attributes = $config['attributes'] ?? [];
+	}
+
+
+	/**
+	 * @return void
+	 */
+	public function init(): void
+	{
+		$this->heartbeat_check();
+		$this->eventProvider = Kiri::getDi()->get(EventProvider::class);
+		$this->eventProvider->on(OnWorkerExit::class, [$this, 'onWorkerExit']);
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function inTransaction(): bool
+	{
+		return $this->_transaction > 0;
+	}
+
+
+	/**
+	 * @param Kiri\Server\Events\OnWorkerExit $exit
+	 * @return void
+	 */
+	public function onWorkerExit(OnWorkerExit $exit)
+	{
+		$this->stopHeartbeatCheck();
+	}
+
+
+	/**
+	 *
+	 */
+	public function heartbeat_check(): void
+	{
+		if ($this->_timer === -1) {
+			$this->_timer = Timer::tick(1000, fn() => $this->waite());
+		}
+	}
+
+
+	/**
+	 * @throws Exception
+	 */
+	private function waite(): void
+	{
+		try {
+			if ($this->_timer == -1) {
+				$this->stopHeartbeatCheck();
+			}
+			if (time() - $this->_last > (int)Config::get('databases.pool.tick', 60)) {
+				$this->stopHeartbeatCheck();
+
+				$this->eventProvider->off(OnWorkerExit::class, [$this, 'stopHeartbeatCheck']);
+
+				$this->pdo = null;
+			}
+		} catch (\Throwable $throwable) {
+			error($throwable);
+		}
+	}
+
+
+	/**
+	 *
+	 */
+	public function stopHeartbeatCheck(): void
+	{
+		if ($this->_timer > -1) {
+			Timer::clear($this->_timer);
+		}
+		$this->_timer = -1;
+	}
+
+
+	/**
+	 *
+	 */
+	public function beginTransaction()
+	{
+		if ($this->_transaction == 0) {
+			$this->_pdo()->beginTransaction();
+		}
+		$this->_transaction++;
+	}
+
+
+	/**
+	 *
+	 */
+	public function commit()
+	{
+		if ($this->_transaction == 0) {
+			$this->_pdo()->commit();
+		}
+		$this->_transaction--;
+	}
+
+
+	/**
+	 *
+	 */
+	public function rollback()
+	{
+		if ($this->_transaction == 0) {
+			$this->_pdo()->rollBack();
+		}
+		$this->_transaction--;
+	}
+
+
+	/**
+	 * @param string $sql
+	 * @param array $params
+	 * @return bool|array|null
+	 * @throws Exception
+	 */
+	public function fetchAll(string $sql, array $params = []): bool|null|array
+	{
+		$pdo = $this->queryPrev($sql, $params);
+
+		$result = $pdo->fetchAll(\PDO::FETCH_ASSOC);
+		$pdo->closeCursor();
+		return $result;
+	}
+
+
+	/**
+	 * @param string $sql
+	 * @param array $params
+	 * @return bool|array|null
+	 * @throws Exception
+	 */
+	public function fetch(string $sql, array $params = []): bool|null|array
+	{
+		$pdo = $this->queryPrev($sql, $params);
+
+		$result = $pdo->fetch(\PDO::FETCH_ASSOC);
+		$pdo->closeCursor();
+		return $result;
+	}
+
+
+	/**
+	 * @param string $sql
+	 * @param array $params
+	 * @return bool|array|null
+	 * @throws \Exception
+	 */
+	public function fetchColumn(string $sql, array $params = []): bool|null|array
+	{
+		$pdo = $this->queryPrev($sql, $params);
+
+		$result = $pdo->fetchColumn(\PDO::FETCH_ASSOC);
+		$pdo->closeCursor();
+		return $result;
+	}
+
+
+	/**
+	 * @param string $sql
+	 * @param array $params
+	 * @return int
+	 * @throws Exception
+	 */
+	public function count(string $sql, array $params = []): int
+	{
+		$pdo = $this->queryPrev($sql, $params);
+
+		$result = $pdo->rowCount();
+		$pdo->closeCursor();
+		return $result;
+	}
+
+
+	/**
+	 * @param string $sql
+	 * @param array $params
+	 * @return PDOStatement
+	 * @throws Exception
+	 */
+	private function queryPrev(string $sql, array $params = []): PDOStatement
+	{
+		$this->_last = time();
+		try {
+			if (($statement = $this->_pdo()->query($sql)) === false) {
+				throw new Exception($this->_pdo()->errorInfo()[1]);
+			}
+			return $this->bindValue($statement, $params);
+		} catch (\PDOException|\Throwable $throwable) {
+			if (str_contains($throwable->getMessage(), 'MySQL server has gone away')) {
+				$this->pdo = null;
+
+				return $this->queryPrev($sql, $params);
+			}
+			throw new Exception($throwable->getMessage());
+		}
+	}
+
+
+	/**
+	 * @param PDOStatement $statement
+	 * @param array $params
+	 * @return PDOStatement
+	 */
+	private function bindValue(PDOStatement $statement, array $params = []): PDOStatement
+	{
+		if (empty($params)) return $statement;
+		foreach ($params as $key => $param) {
+			$statement->bindValue($key, $param);
+		}
+		return $statement;
+	}
+
+
+	/**
+	 * @param string $sql
+	 * @param array $params
+	 * @return int
+	 * @throws Exception
+	 */
+	public function execute(string $sql, array $params = []): int
+	{
+		$this->_last = time();
+		$pdo = $this->_pdo();
+		if (!(($prepare = $pdo->prepare($sql)) instanceof PDOStatement)) {
+			throw new Exception($prepare->errorInfo()[2] ?? static::DB_ERROR_MESSAGE);
+		}
+		if ($prepare->execute($params) === false) {
+			throw new Exception($prepare->errorInfo()[2] ?? static::DB_ERROR_MESSAGE);
+		}
+		$result = (int)$pdo->lastInsertId();
+		$prepare->closeCursor();
+		if ($result == 0) {
+			return true;
+		}
+		return $result;
+	}
+
+
+	/**
+	 * @return \PDO
+	 */
+	public function _pdo(): \PDO
+	{
+		if ($this->_timer === -1) {
+			$this->heartbeat_check();
+		}
+		if (!($this->pdo instanceof \PDO)) {
+			$this->pdo = $this->newClient();
+		}
+		return $this->pdo;
+	}
+
+
+	/**
+	 * @return \PDO
+	 */
+	private function newClient(): \PDO
+	{
+		$link = new \PDO('mysql:dbname=' . $this->dbname . ';host=' . $this->cds, $this->username, $this->password, [
+			\PDO::ATTR_EMULATE_PREPARES         => false,
+			\PDO::ATTR_CASE                     => \PDO::CASE_NATURAL,
+			\PDO::ATTR_TIMEOUT                  => $this->connect_timeout,
+			\PDO::MYSQL_ATTR_USE_BUFFERED_QUERY => true,
+			\PDO::MYSQL_ATTR_INIT_COMMAND       => 'SET NAMES ' . $this->charset
+		]);
+		$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)) {
+			foreach ($this->attributes as $key => $attribute) {
+				$link->setAttribute($key, $attribute);
+			}
+		}
+		return $link;
+	}
+
+}

SqlBuilder.php

@@ -240,7 +240,7 @@ class SqlBuilder extends Component
 		if (empty($this->query->from) && !empty($this->query->modelClass)) {
 			$this->query->from($this->query->getTable());
 		}
-		return $this->_prefix();
+		return $this->_prefix(false, true);
 	}
 
 
@@ -256,14 +256,15 @@ class SqlBuilder extends Component
 
 	/**
 	 * @param bool $hasOrder
+	 * @param bool $isCount
 	 * @return string
 	 * @throws Exception
 	 */
-	private function _prefix(bool $hasOrder = false): string
+	private function _prefix(bool $hasOrder = false, bool $isCount = false): string
 	{
 		$select = '';
 		if (!empty($this->query->from)) {
-			$select = $this->_selectPrefix();
+			$select = $this->_selectPrefix($isCount);
 		}
 		$select = $this->_wherePrefix($select);
 		if (!empty($this->query->attributes) && is_array($this->query->attributes)) {
@@ -302,12 +303,13 @@ class SqlBuilder extends Component
 
 
 	/**
+	 * @param bool $isCount
 	 * @return string
 	 * @throws Exception
 	 */
-	private function _selectPrefix(): string
+	private function _selectPrefix(bool $isCount): string
 	{
-		$select = $this->builderSelect($this->query->select) . ' FROM ' . $this->tableName();
+		$select = $this->builderSelect($this->query->select, $isCount) . ' FROM ' . $this->tableName();
 		if (!empty($this->query->alias)) {
 			$select .= $this->builderAlias($this->query->alias);
 		}

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;
 
 
@@ -61,10 +61,14 @@ trait Builder
 
 	/**
 	 * @param null $select
+	 * @param bool $isCount
 	 * @return string
 	 */
-	#[Pure] private function builderSelect($select = NULL): string
+	#[Pure] private function builderSelect($select = NULL, bool $isCount = false): string
 	{
+		if ($isCount) {
+			return "SELECT COUNT(*)";
+		}
 		if (empty($select)) {
 			return "SELECT *";
 		}
@@ -129,6 +133,8 @@ trait Builder
 		if (empty($where)) return '';
 		if (is_string($where)) return $where;
 		foreach ($where as $key => $value) {
+			if (is_null($value)) continue;
+
 			$_value = $this->resolveCondition($key, $value, $_tmp);
 
 			if (empty($_value)) continue;
@@ -188,7 +194,7 @@ trait Builder
 			$class = $defaultConfig['class'];
 			unset($defaultConfig['class']);
 
-			$builder = Kiri::getDi()->get($class, [], $defaultConfig);
+			$builder = Kiri::getDi()->make($class, [], $defaultConfig);
 			$builder->setValue($condition[2]);
 			$builder->setColumn($condition[1]);
 		} else {
@@ -210,6 +216,8 @@ trait Builder
 	{
 		$_array = [];
 		foreach ($condition as $key => $value) {
+			if (is_null($value)) continue;
+
 			$value = is_numeric($value) ? $value : '\'' . $value . '\'';
 			if (!is_numeric($key)) {
 				$_array[] = sprintf('%s = %s', $key, $value);

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;
@@ -522,7 +522,7 @@ trait QueryTrait
 			$conditionArray = $this->sprintf($conditionArray, $value, $opera);
 		}
 
-		$this->where = ['(' . implode(' AND ', $this->where) . ') OR (' . $conditionArray . ')'];
+		$this->where = ['((' . implode(' AND ', $this->where) . ') OR (' . $conditionArray . '))'];
 		return $this;
 	}
 
@@ -923,6 +923,7 @@ trait QueryTrait
 	private function addArray(array $array): static
 	{
 		foreach ($array as $key => $value) {
+			if (is_null($value)) continue;
 			if (is_numeric($key)) {
 				[$column, $opera, $value] = $this->opera(...$value);
 

composer.json

@@ -1,5 +1,5 @@
 {
-  "name": "game-worker/db-connection",
+  "name": "game-worker/kiri-databases",
   "description": "db",
   "authors": [
     {
@@ -12,12 +12,12 @@
     "php": ">=8.0",
     "ext-json": "*",
     "ext-pdo": "*",
-    "game-worker/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,310 +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
-	{
-		$this->select = ['COUNT(*)'];
-		$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(null, true);
-	}
-
-	/**
-	 * @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 string|bool
-	 * @throws Exception
-	 */
-	public function delete(bool $getSql = false): string|bool
-	{
-		$sql = $this->builder->delete();
-		if ($getSql === false) {
-			return $this->execute($sql)->delete();
-		}
-		return $sql;
-	}
-}

src/DatabasesProviders.php

@@ -1,116 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace Database;
-
-
-use Annotation\Inject;
-use Exception;
-use Server\Events\OnWorkerStart;
-use Kiri\Abstracts\Config;
-use Kiri\Abstracts\Providers;
-use Kiri\Application;
-use Kiri\Events\EventProvider;
-use Kiri\Exception\ConfigException;
-use Kiri\Kiri;
-
-/**
- * Class DatabasesProviders
- * @package Database
- */
-class DatabasesProviders extends Providers
-{
-
-	private array $_pooLength = ['min' => 0, 'max' => 1];
-
-
-	/**
-	 * @var EventProvider
-	 */
-	#[Inject(EventProvider::class)]
-	public EventProvider $eventProvider;
-
-
-	/**
-	 * @param Application $application
-	 * @throws Exception
-	 */
-	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']);
-	}
-
-
-	/**
-	 * @param $name
-	 * @return Connection
-	 * @throws ConfigException
-	 * @throws Exception
-	 */
-	public function get($name): Connection
-	{
-		$application = Kiri::app();
-		if (!$application->has('databases.' . $name)) {
-			$application->set('databases.' . $name, $this->_settings($this->getConfig($name)));
-		}
-		return $application->get('databases.' . $name);
-	}
-
-
-	/**
-	 * @throws ConfigException
-	 * @throws Exception
-	 */
-	public function createPool(OnWorkerStart $onWorkerStart)
-	{
-		$databases = Config::get('databases.connections', []);
-		if (empty($databases)) {
-			return;
-		}
-		$application = Kiri::app();
-		foreach ($databases as $name => $database) {
-			/** @var Connection $connection */
-			$application->set('databases.' . $name, $this->_settings($database));
-			$application->get('databases.' . $name)->fill();
-		}
-	}
-
-
-	/**
-	 * @param $database
-	 * @return array
-	 */
-	private function _settings($database): array
-	{
-		return [
-			'class'       => Connection::class,
-			'id'          => $database['id'],
-			'cds'         => $database['cds'],
-			'username'    => $database['username'],
-			'password'    => $database['password'],
-			'tablePrefix' => $database['tablePrefix'],
-			'database'    => $database['database'],
-			'maxNumber'   => $this->_pooLength['max'],
-			'minNumber'   => $this->_pooLength['min'],
-			'charset'     => $database['charset'] ?? 'utf8mb4',
-			'slaveConfig' => $database['slaveConfig']
-		];
-	}
-
-
-	/**
-	 * @param $name
-	 * @return mixed
-	 * @throws ConfigException
-	 */
-	public function getConfig($name): mixed
-	{
-		return Config::get('databases.connections.' . $name, null, true);
-	}
-
-
-}

src/Mysql/PDO.php

@@ -1,301 +0,0 @@
-<?php
-
-namespace Database\Mysql;
-
-use Exception;
-use Kiri\Context;
-use Kiri\Abstracts\Logger;
-use Kiri\Kiri;
-use Kiri\Pool\StopHeartbeatCheck;
-use PDOStatement;
-use Swoole\Timer;
-
-/**
- *
- */
-class PDO implements StopHeartbeatCheck
-{
-
-    const DB_ERROR_MESSAGE = 'The system is busy, please try again later.';
-
-
-    private ?\PDO $pdo = null;
-
-
-    private int $_transaction = 0;
-
-
-    private int $_timer = -1;
-
-    private int $_last = 0;
-
-
-    /**
-     * @param string $dbname
-     * @param string $cds
-     * @param string $username
-     * @param string $password
-     * @param string $chatset
-     * @throws
-     */
-    public function __construct(public string $dbname, public string $cds,
-                                public string $username, public string $password, public string $chatset = 'utf8mb4')
-    {
-    }
-
-
-    public function init()
-    {
-        $this->heartbeat_check();
-    }
-
-
-    /**
-     * @return bool
-     */
-    public function inTransaction(): bool
-    {
-        return $this->_transaction > 0;
-    }
-
-
-    /**
-     *
-     */
-    public function heartbeat_check(): void
-    {
-        if (env('state', 'start') == 'exit') {
-            return;
-        }
-        if ($this->_timer === -1 && Context::inCoroutine()) {
-            $this->_timer = Timer::tick(1000, function () {
-                try {
-                    if (env('state', 'start') == 'exit') {
-                        Kiri::getDi()->get(Logger::class)->critical('timer end');
-                        $this->stopHeartbeatCheck();
-                    }
-                    if (time() - $this->_last > 10 * 60) {
-                        $this->stopHeartbeatCheck();
-                        $this->pdo = null;
-                    }
-                } catch (\Throwable $throwable) {
-                    error($throwable);
-                }
-            });
-        }
-    }
-
-
-    /**
-     *
-     */
-    public function stopHeartbeatCheck(): void
-    {
-        if ($this->_timer > -1) {
-            Timer::clear($this->_timer);
-        }
-        $this->_timer = -1;
-    }
-
-
-    /**
-     *
-     */
-    public function beginTransaction()
-    {
-        if ($this->_transaction == 0) {
-            $this->_pdo()->beginTransaction();
-        }
-        $this->_transaction++;
-    }
-
-
-    /**
-     *
-     */
-    public function commit()
-    {
-        if ($this->_transaction == 0) {
-            $this->_pdo()->commit();
-        }
-        $this->_transaction--;
-    }
-
-
-    /**
-     *
-     */
-    public function rollback()
-    {
-        if ($this->_transaction == 0) {
-            $this->_pdo()->rollBack();
-        }
-        $this->_transaction--;
-    }
-
-
-	/**
-	 * @param string $sql
-	 * @param array $params
-	 * @return bool|array|null
-	 * @throws Exception
-	 */
-    public function fetchAll(string $sql, array $params = []): bool|null|array
-    {
-        $pdo = $this->queryPrev($sql, $params);
-
-        $result = $pdo->fetchAll(\PDO::FETCH_ASSOC);
-        $pdo->closeCursor();
-        return $result;
-    }
-
-
-	/**
-	 * @param string $sql
-	 * @param array $params
-	 * @return bool|array|null
-	 * @throws Exception
-	 */
-    public function fetch(string $sql, array $params = []): bool|null|array
-    {
-        $pdo = $this->queryPrev($sql, $params);
-
-        $result = $pdo->fetch(\PDO::FETCH_ASSOC);
-        $pdo->closeCursor();
-        return $result;
-    }
-
-
-    /**
-     * @param string $sql
-     * @param array $params
-     * @return bool|array|null
-     * @throws \Exception
-     */
-    public function fetchColumn(string $sql, array $params = []): bool|null|array
-    {
-        $pdo = $this->queryPrev($sql, $params);
-
-        $result = $pdo->fetchColumn(\PDO::FETCH_ASSOC);
-        $pdo->closeCursor();
-        return $result;
-    }
-
-
-    /**
-     * @param string $sql
-     * @param array $params
-     * @return int
-     * @throws Exception
-     */
-    public function count(string $sql, array $params = []): int
-    {
-        $pdo = $this->queryPrev($sql, $params);
-
-        $result = $pdo->rowCount();
-        $pdo->closeCursor();
-        return $result;
-    }
-
-
-    /**
-     * @param string $sql
-     * @param array $params
-     * @return PDOStatement
-     * @throws Exception
-     */
-    private function queryPrev(string $sql, array $params = []): PDOStatement
-    {
-        $this->_last = time();
-        try {
-            if (($statement = $this->_pdo()->query($sql)) === false) {
-                throw new Exception($this->_pdo()->errorInfo()[1]);
-            }
-            return $this->bindValue($statement, $params);
-        } catch (\Throwable $throwable) {
-
-            if (str_contains($throwable->getMessage(), 'MySQL server has gone away')) {
-                $this->pdo = null;
-
-                return $this->queryPrev($sql, $params);
-            }
-
-            throw new Exception($throwable->getMessage());
-        }
-    }
-
-
-    /**
-     * @param PDOStatement $statement
-     * @param array $params
-     * @return PDOStatement
-     */
-    private function bindValue(PDOStatement $statement, array $params = []): PDOStatement
-    {
-        if (empty($params)) return $statement;
-        foreach ($params as $key => $param) {
-            $statement->bindValue($key, $param);
-        }
-        return $statement;
-    }
-
-
-    /**
-     * @param string $sql
-     * @param $isInsert
-     * @param array $params
-     * @return int
-     * @throws Exception
-     */
-    public function execute(string $sql, $isInsert, array $params = []): int
-    {
-        $this->_last = time();
-        if (!(($prepare = $this->_pdo()->prepare($sql)) instanceof PDOStatement)) {
-            throw new Exception($prepare->errorInfo()[2] ?? static::DB_ERROR_MESSAGE);
-        }
-        if ($prepare->execute($params) === false) {
-            throw new Exception($prepare->errorInfo()[2] ?? static::DB_ERROR_MESSAGE);
-        }
-        $result = 1;
-        if ($isInsert) {
-            $result = (int)$this->_pdo()->lastInsertId();
-        }
-        $prepare->closeCursor();
-        return $result;
-    }
-
-
-    /**
-     * @return \PDO
-     */
-    public function _pdo(): \PDO
-    {
-        if ($this->_timer === -1) {
-            $this->heartbeat_check();
-        }
-        if (!($this->pdo instanceof \PDO)) {
-            $this->pdo = $this->newClient();
-        }
-        return $this->pdo;
-    }
-
-
-    /**
-     * @return \PDO
-     */
-    private function newClient(): \PDO
-    {
-        $link = new \PDO('mysql:dbname=' . $this->dbname . ';host=' . $this->cds, $this->username, $this->password, [
-            \PDO::ATTR_EMULATE_PREPARES         => false,
-            \PDO::ATTR_CASE                     => \PDO::CASE_NATURAL,
-            \PDO::ATTR_TIMEOUT                  => 60,
-            \PDO::MYSQL_ATTR_USE_BUFFERED_QUERY => true,
-            \PDO::MYSQL_ATTR_INIT_COMMAND       => 'SET NAMES ' . $this->chatset
-        ]);
-        $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);
-        return $link;
-    }
-
-}

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();