改名

.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('@'));

src/ActiveQuery.php

@@ -237,7 +237,6 @@ class ActiveQuery extends Component implements ISqlBuilder
 	 */
 	public function count(): int
 	{
-		$this->select = ['COUNT(*)'];
 		$data = $this->execute($this->builder->count())->one();
 		if ($data && is_array($data)) {
 			return (int)array_shift($data);
@@ -270,7 +269,7 @@ class ActiveQuery extends Component implements ISqlBuilder
 		[$sql, $params] = $this->builder->insert($data, true);
 
 
-		return $this->execute($sql, $params)->exec(null, true);
+		return $this->execute($sql, $params)->exec();
 	}
 
 	/**
@@ -296,10 +295,10 @@ class ActiveQuery extends Component implements ISqlBuilder
 
 	/**
 	 * @param bool $getSql
-	 * @return string|bool
+	 * @return int|bool|string|null
 	 * @throws Exception
 	 */
-	public function delete(bool $getSql = false): string|bool
+	public function delete(bool $getSql = false): int|bool|string|null
 	{
 		$sql = $this->builder->delete();
 		if ($getSql === false) {

src/Base/AbstractCollection.php

@@ -134,7 +134,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];
     }

src/Base/CollectionIterator.php

@@ -56,7 +56,7 @@ class CollectionIterator extends \ArrayIterator
 	 */
 	protected function newModel($current): ModelInterface
 	{
-		return $this->model->setAttributes($current);
+		return $this->model->populates($current);
 	}
 
 

src/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;
@@ -42,7 +40,7 @@ use validator\Validator;
  *
  * @package Kiri\Abstracts
  *
- * @property bool $isCreate
+ * @property bool $isNowExample
  * @property Application $container
  * @property EventDispatch $eventDispatch
  * @property array $attributes
@@ -98,12 +96,6 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 	protected string $connection = 'db';
 
 
-	/**
-	 * @var array
-	 */
-	protected array $rules = [];
-
-
 	/**
 	 * @var array
 	 */
@@ -111,25 +103,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 +131,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 +147,6 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 	 * @param string $name
 	 * @param $value
 	 * @return mixed
-	 * @throws NotFindClassException
 	 * @throws ReflectionException
 	 * @throws Exception
 	 */
@@ -174,6 +166,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 
 	/**
 	 * @return EventDispatch
+	 * @throws ReflectionException
 	 */
 	protected function getEventDispatch(): EventDispatch
 	{
@@ -219,7 +212,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 	 */
 	public function init()
 	{
-		$an = Kiri::app()->getAnnotation();
+		$an = Kiri::app()->getNote();
 		$an->injectProperty($this);
 	}
 
@@ -236,7 +229,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 +239,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;
@@ -401,6 +394,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 
 	/**
 	 * @return static
+	 * @throws ReflectionException
 	 */
 	private static function makeNewInstance(): static
 	{
@@ -453,13 +447,13 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 			if (!$if_condition_is_null) {
 				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,23 +506,26 @@ 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) {
+        foreach ($param as $key => $attribute) {
-			$this->setOldAttribute($key, $val);
+            $this->setOldAttribute($key, $attribute);
-		}
+        }
-		return $this;
+        return $this;
 	}
 
 	/**
@@ -539,10 +538,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 = $dbConnection->save(true);
-		}
+
-		$lastId = $this->setPrimary($lastId, $param);
+		$lastId = $this->setPrimary((int)$lastId, $param);
 
 		$this->refresh()->afterSave($attributes, $param);
 
@@ -571,7 +570,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;
 	}
 
 
@@ -608,10 +607,10 @@ 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)) {
+		if (!$this->validator($this->rules()) || !$this->beforeSave($this)) {
 			return false;
 		}
 		[$change, $condition, $fields] = $this->separation();
@@ -622,6 +621,19 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 	}
 
 
+    /**
+     * @param $value
+     * @return $this
+     */
+    public function populates($value): static
+    {
+        $this->_attributes = $value;
+        $this->_oldAttributes = $value;
+        $this->setIsNowExample(FALSE);
+        return $this;
+    }
+
+
 	/**
 	 * @param array|null $rule
 	 * @return bool
@@ -632,7 +644,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 		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;
 		}
@@ -665,8 +677,8 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 	 */
 	public function getAttribute(string $name)
 	{
-		if ($this->hasAnnotation($name)) {
+		if ($this->hasNote($name)) {
-			return $this->runAnnotation($name, $this->_attributes[$name]);
+			return $this->runNote($name, $this->_attributes[$name]);
 		}
 		return $this->_attributes[$name] ?? null;
 	}
@@ -678,7 +690,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 	 * @param string $type
 	 * @return mixed
 	 */
-	protected function runAnnotation(string $name, mixed $value, string $type = self::GET): mixed
+	protected function runNote(string $name, mixed $value, string $type = self::GET): mixed
 	{
 		return call_user_func($this->_annotations[$type][$name], $value);
 	}
@@ -764,6 +776,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 
 	/**
 	 * @return Relation|null
+	 * @throws ReflectionException
 	 */
 	public function getRelation(): ?Relation
 	{
@@ -805,8 +818,8 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 			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)) {
+		if (!empty($tablePrefix) && !str_starts_with($table, $tablePrefix)) {
-			$table = $tablePrefix . $this->table;
+			$table = $tablePrefix . $table;
 		}
 		return '`' . $connection->database . '`.' . $table;
 	}
@@ -853,7 +866,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);
 		}
 	}
 
@@ -905,7 +918,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 	 * @param string $type
 	 * @return array
 	 */
-	protected function getAnnotation(string $type = self::GET): array
+	protected function getNote(string $type = self::GET): array
 	{
 		return $this->_annotations[$type] ?? [];
 	}
@@ -916,7 +929,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 	 * @param string $type
 	 * @return bool
 	 */
-	protected function hasAnnotation($name, string $type = self::GET): bool
+	protected function hasNote($name, string $type = self::GET): bool
 	{
 		if (!isset($this->_annotations[$type])) {
 			return false;
@@ -1045,7 +1058,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;
 	}
 

src/Command.php

@@ -60,7 +60,7 @@ class Command extends Component
 	 */
 	public function save(bool $isInsert = TRUE, mixed $hasAutoIncrement = null): int|bool|array|string|null
 	{
-		return $this->execute(static::EXECUTE, $isInsert, $hasAutoIncrement);
+		return $this->execute(static::EXECUTE);
 	}
 
 
@@ -111,17 +111,15 @@ class Command extends Component
 
 	/**
 	 * @param $type
-	 * @param null $isInsert
-	 * @param bool|null $hasAutoIncrement
 	 * @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($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);
 			}
@@ -158,22 +156,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 +166,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);
 	}
 
 	/**

src/Condition/Condition.php

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

src/Condition/HashCondition.php

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

src/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;
@@ -23,6 +22,7 @@ use Kiri\Abstracts\Config;
 use Kiri\Events\EventProvider;
 use Kiri\Exception\NotFindClassException;
 use Kiri\Kiri;
+use Note\Inject;
 use ReflectionException;
 use Server\Events\OnWorkerExit;
 use Server\Events\OnWorkerStop;
@@ -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,6 +65,7 @@ class Connection extends Component
 	 * @var array
 	 */
 	public array $slaveConfig = [];
+	public array $attributes = [];
 
 
 	/**
@@ -70,24 +75,18 @@ class Connection extends Component
 	public Schema $_schema;
 
 
-	/**
-	 * @var EventProvider
-	 */
-	#[Inject(EventProvider::class)]
-	public EventProvider $eventProvider;
-
-
 	/**
 	 * execute by __construct
 	 * @throws Exception
 	 */
 	public function init()
 	{
-		$this->eventProvider->on(OnWorkerStop::class, [$this, 'clear_connection'], 0);
+		$eventProvider = Kiri::getDi()->get(EventProvider::class);
-		$this->eventProvider->on(OnWorkerExit::class, [$this, 'clear_connection'], 0);
+		$eventProvider->on(OnWorkerStop::class, [$this, 'clear_connection'], 0);
-		$this->eventProvider->on(BeginTransaction::class, [$this, 'beginTransaction'], 0);
+		$eventProvider->on(OnWorkerExit::class, [$this, 'clear_connection'], 0);
-		$this->eventProvider->on(Rollback::class, [$this, 'rollback'], 0);
+		$eventProvider->on(BeginTransaction::class, [$this, 'beginTransaction'], 0);
-		$this->eventProvider->on(Commit::class, [$this, 'commit'], 0);
+		$eventProvider->on(Rollback::class, [$this, 'rollback'], 0);
+		$eventProvider->on(Commit::class, [$this, 'commit'], 0);
 
 		if (Db::transactionsActive()) {
 			$this->beginTransaction();
@@ -108,6 +107,17 @@ class Connection extends Component
 	}
 
 
+	/**
+	 * @param $config
+	 * @return $this
+	 */
+	public function configure($config): static
+	{
+		Kiri::configure($this, $config);
+		return $this;
+	}
+
+
 	/**
 	 * @throws Exception
 	 */
@@ -141,7 +151,7 @@ class Connection extends Component
 	 * @return mixed
 	 * @throws ReflectionException
 	 * @throws NotFindClassException
-	 * @throws \Exception
+	 * @throws Exception
 	 */
 	public function getSchema(): Schema
 	{
@@ -186,10 +196,14 @@ class Connection extends Component
 	public function masterInstance(): PDO
 	{
 		return $this->connections()->get([
-			'cds'      => $this->cds,
+			'cds'             => $this->cds,
-			'username' => $this->username,
+			'username'        => $this->username,
-			'password' => $this->password,
+			'password'        => $this->password,
-			'database' => $this->database
+			'attributes'      => $this->attributes,
+			'connect_timeout' => $this->connect_timeout,
+			'read_timeout'    => $this->read_timeout,
+			'dbname'          => $this->database,
+			'pool'            => $this->pool
 		], true);
 	}
 

src/DatabasesProviders.php

@@ -4,15 +4,14 @@ 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;
+use Server\Events\OnWorkerStart;
 
 /**
  * Class DatabasesProviders
@@ -24,13 +23,6 @@ class DatabasesProviders extends Providers
 	private array $_pooLength = ['min' => 0, 'max' => 1];
 
 
-	/**
-	 * @var EventProvider
-	 */
-	#[Inject(EventProvider::class)]
-	public EventProvider $eventProvider;
-
-
 	/**
 	 * @param Application $application
 	 * @throws Exception
@@ -53,11 +45,9 @@ class DatabasesProviders extends Providers
 	 */
 	public function get($name): Connection
 	{
-		$application = Kiri::app();
+		$config = $this->_settings($this->getConfig($name));
-		if (!$application->has('databases.' . $name)) {
+
-			$application->set('databases.' . $name, $this->_settings($this->getConfig($name)));
+		return Kiri::getDi()->get(Connection::class)->configure($config);
-		}
-		return $application->get('databases.' . $name);
 	}
 
 
@@ -71,11 +61,10 @@ class DatabasesProviders extends Providers
 		if (empty($databases)) {
 			return;
 		}
-		$application = Kiri::app();
+		$connection = Kiri::getDi()->get(Connection::class);
-		foreach ($databases as $name => $database) {
+		foreach ($databases as $database) {
 			/** @var Connection $connection */
-			$application->set('databases.' . $name, $this->_settings($database));
+			$connection->configure($database)->fill();
-			$application->get('databases.' . $name)->fill();
 		}
 	}
 
@@ -86,18 +75,20 @@ class DatabasesProviders extends Providers
 	 */
 	private function _settings($database): array
 	{
+		$clientPool = $database['pool'] ?? ['min' => 1, 'max' => 5, 'tick' => 60];
 		return [
-			'class'       => Connection::class,
+			'id'              => $database['id'],
-			'id'          => $database['id'],
+			'cds'             => $database['cds'],
-			'cds'         => $database['cds'],
+			'username'        => $database['username'],
-			'username'    => $database['username'],
+			'password'        => $database['password'],
-			'password'    => $database['password'],
+			'tablePrefix'     => $database['tablePrefix'],
-			'tablePrefix' => $database['tablePrefix'],
+			'database'        => $database['database'],
-			'database'    => $database['database'],
+			'connect_timeout' => $database['connect_timeout'] ?? 30,
-			'maxNumber'   => $this->_pooLength['max'],
+			'read_timeout'    => $database['read_timeout'] ?? 10,
-			'minNumber'   => $this->_pooLength['min'],
+			'pool'            => $clientPool,
-			'charset'     => $database['charset'] ?? 'utf8mb4',
+			'attributes'      => $database['attributes'] ?? [],
-			'slaveConfig' => $database['slaveConfig']
+			'charset'         => $database['charset'] ?? 'utf8mb4',
+			'slaveConfig'     => $database['slaveConfig']
 		];
 	}
 

src/Model.php

@@ -117,6 +117,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');
@@ -334,7 +335,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 +354,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 +373,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 +391,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.");
 		}
 

src/ModelInterface.php

@@ -32,10 +32,11 @@ interface ModelInterface
 	public static function find(string|int $param): mixed;
 
 
-	/**
+    /**
-	 * @return string
+     * @param array $data
-	 */
+     * @return static
-	public static function className(): string;
+     */
+    public static function populate(array $data): static;
 
 
 	/**

src/Mysql/Columns.php

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

src/Mysql/PDO.php

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

src/Note/Get.php

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

src/Note/Relation.php

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

src/Note/Set.php

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

src/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);
 		}

src/Traits/Builder.php

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

src/Traits/QueryTrait.php

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