eee

xxx

Signed-off-by: 向林 <as2252258@163.com>

.phpstorm.meta.php

@@ -1,18 +0,0 @@
-<?php
-
-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('@'));
-//    override(\make(0), map('@'));
-    override(\di(0), map('@'));
-    override(\duplicate(0), map('@'));
-
-}

ActiveQuery.php

@@ -23,14 +23,15 @@ class ActiveQuery extends QueryTrait implements ISqlBuilder
 
 
 	public bool     $asArray = FALSE;
-    protected mixed $_mock   = null;
+	protected mixed $_mock   = NULL;
 
 
 	/**
 	 * @param bool $asArray
+	 *
 	 * @return static
 	 */
-    public function asArray(bool $asArray = true): static
+	public function asArray(bool $asArray = TRUE): static
 	{
 		$this->asArray = $asArray;
 		return $this;
@@ -38,6 +39,7 @@ class ActiveQuery extends QueryTrait implements ISqlBuilder
 
 	/**
 	 * @param array $methods
+	 *
 	 * @return $this
 	 */
 	public function with(array $methods): static
@@ -57,7 +59,7 @@ class ActiveQuery extends QueryTrait implements ISqlBuilder
 		if (is_array($data)) {
 			return $this->populate($data);
 		}
-        return null;
+		return NULL;
 	}
 
 	/**
@@ -69,13 +71,14 @@ class ActiveQuery extends QueryTrait implements ISqlBuilder
 		if (is_array($data)) {
 			return new Collection($this, $this->modelClass, $data);
 		}
-        return false;
+		return FALSE;
 	}
 
 
 	/**
 	 * @param string    $column
 	 * @param int|float $amount
+	 *
 	 * @return bool
 	 */
 	public function increment(string $column, int|float $amount = 1): bool
@@ -86,6 +89,7 @@ class ActiveQuery extends QueryTrait implements ISqlBuilder
 
 	/**
 	 * @param array $attributes
+	 *
 	 * @return bool
 	 */
 	public function increments(array $attributes): bool
@@ -97,6 +101,7 @@ class ActiveQuery extends QueryTrait implements ISqlBuilder
 	/**
 	 * @param string    $column
 	 * @param int|float $amount
+	 *
 	 * @return bool
 	 */
 	public function decrement(string $column, int|float $amount = 1): bool
@@ -107,6 +112,7 @@ class ActiveQuery extends QueryTrait implements ISqlBuilder
 
 	/**
 	 * @param array $attributes
+	 *
 	 * @return bool
 	 */
 	public function decrements(array $attributes): bool
@@ -127,6 +133,7 @@ class ActiveQuery extends QueryTrait implements ISqlBuilder
 	/**
 	 * @param int     $size
 	 * @param Closure $closure
+	 *
 	 * @return void
 	 */
 	public function chunk(int $size, Closure $closure): void
@@ -151,7 +158,7 @@ class ActiveQuery extends QueryTrait implements ISqlBuilder
 	 *
 	 * @return array|null
 	 */
-    public function column(string $field, ?string $setKey = null): ?array
+	public function column(string $field, ?string $setKey = NULL): ?array
 	{
 		return $this->get()->column($field, $setKey);
 	}
@@ -159,6 +166,7 @@ class ActiveQuery extends QueryTrait implements ISqlBuilder
 
 	/**
 	 * @param mixed $value
+	 *
 	 * @return $this
 	 */
 	public function withMock(mixed $value): static
@@ -179,6 +187,7 @@ class ActiveQuery extends QueryTrait implements ISqlBuilder
 
 	/**
 	 * @param array $data
+	 *
 	 * @return ModelInterface|array
 	 * @throws
 	 */
@@ -190,6 +199,15 @@ class ActiveQuery extends QueryTrait implements ISqlBuilder
 	}
 
 
+	/**
+	 * @return string
+	 */
+	public function toSql(): string
+	{
+		return $this->builder->get();
+	}
+
+
 	/**
 	 * @return int
 	 * @throws
@@ -202,13 +220,14 @@ class ActiveQuery extends QueryTrait implements ISqlBuilder
 
 	/**
 	 * @param array $data
+	 *
 	 * @return bool
 	 * @throws
 	 */
 	public function update(array $data): bool
 	{
 		if (count($data) < 1) {
-            return true;
+			return TRUE;
 		}
 		$generate = $this->builder->update($data);
 		if (!is_bool($generate)) {
@@ -220,6 +239,7 @@ class ActiveQuery extends QueryTrait implements ISqlBuilder
 
 	/**
 	 * @param array $data
+	 *
 	 * @return bool
 	 */
 	public function insert(array $data): bool
@@ -229,6 +249,7 @@ class ActiveQuery extends QueryTrait implements ISqlBuilder
 		return (bool)$this->buildCommand($sql)->exec();
 	}
 
+
 	/**
 	 * @param string $filed
 	 *
@@ -253,6 +274,7 @@ class ActiveQuery extends QueryTrait implements ISqlBuilder
 	/**
 	 * @param string $sql
 	 * @param array  $params
+	 *
 	 * @return int|bool
 	 */
 	public function execute(string $sql, array $params = []): int|bool
@@ -266,6 +288,6 @@ class ActiveQuery extends QueryTrait implements ISqlBuilder
 	 */
 	public function delete(): bool
 	{
-        return $this->buildCommand($this->builder->delete())->delete();
+		return (bool)$this->buildCommand($this->builder->delete())->exec();
 	}
 }

BackupCommand.php

@@ -31,7 +31,7 @@ class BackupCommand extends Command
     /**
      *
      */
-    protected function configure()
+    protected function configure(): void
     {
         $this->setName('db:backup')
              ->addOption('data', 'd', InputArgument::OPTIONAL)

Base/ActiveQueryInterface.php

@@ -250,7 +250,7 @@ interface ActiveQueryInterface
      *
      * @return QueryTrait
      */
-    public function groupBy(string $name, string $having = NULL): QueryTrait;
+    public function groupBy(string $name, ?string $having = NULL): QueryTrait;
 
     /**
      * @param int $limit

Base/Model.php

@@ -23,12 +23,21 @@ use Database\ModelInterface;
 use Database\Relation;
 use Database\SqlBuilder;
 use Exception;
+use Kiri\Di\Context;
 use Kiri;
 use Kiri\Abstracts\Component;
 use ReturnTypeWillChange;
 use ReflectionException;
 use validator\Validator;
 
+
+enum Driver
+{
+	case Mysql;
+	case Pgsql;
+}
+
+
 /**
  * Class BOrm
  *
@@ -62,7 +71,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
 	/**
 	 * @var bool
 	 */
-    protected bool $skipValidate = false;
+	protected bool $skipValidate = FALSE;
 
 
 	/**
@@ -105,6 +114,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
 
 	/**
 	 * @param array $data
+	 *
 	 * @return Model
 	 */
 	public function setWith(array $data): static
@@ -163,6 +173,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
 
 	/**
 	 * @param bool $bool
+	 *
 	 * @return $this
 	 */
 	public function setIsNowExample(bool $bool = FALSE): static
@@ -211,9 +222,9 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
 	public function hasPrimaryValue(): bool
 	{
 		if ($this->hasPrimary()) {
-            return $this->getPrimaryValue() === null;
+			return $this->getPrimaryValue() === NULL;
 		}
-        return false;
+		return FALSE;
 	}
 
 
@@ -226,20 +237,22 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
 		if ($this->hasPrimary() && isset($this->_oldAttributes[$this->getPrimary()])) {
 			return (int)$this->_oldAttributes[$this->getPrimary()];
 		} else {
-            return null;
+			return NULL;
 		}
 	}
 
 	/**
 	 * @param int|string|array $param
+	 *
 	 * @return Model|null
 	 * @throws
 	 */
 	public static function findOne(int|string|array|null $param): ?static
 	{
-        if (empty($param)) return null;
-        $model = static::instance();
-        $query = new ActiveQuery($model);
+		if (empty($param)) {
+			return NULL;
+		}
+		$query = new ActiveQuery($model = static::instance());
 		$query->from($model->getTable())->alias('t1');
 		if (is_numeric($param)) {
 			$query->where([$model->getPrimary() => +$param]);
@@ -248,16 +261,17 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
 		} else {
 			$query->whereRaw($param);
 		}
-        $data = $query->first();
-        if ($data === false) {
+		if (($data = $query->first()) === FALSE) {
 			throw new Exception($model->getLastError());
-        }
+		} else {
 			return $data;
 		}
+	}
 
 
 	/**
 	 * @param int $param
+	 *
 	 * @return Model|null
 	 * @throws
 	 */
@@ -285,12 +299,13 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
 	 */
 	protected static function instance(): static
 	{
-        return new static();
+		return new static;
 	}
 
 
 	/**
 	 * @param int|string|array $condition
+	 *
 	 * @return static|null
 	 * @throws
 	 */
@@ -302,6 +317,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
 
 	/**
 	 * @param string|array $condition
+	 *
 	 * @return Collection
 	 * @throws
 	 */
@@ -325,7 +341,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
 	public static function query(): ActiveQuery
 	{
 		$model = new ActiveQuery(static::instance());
-        $model->from($model->getTable())->alias('t1');
+		$model->select()->from($model->getTable())->alias('t1');
 		return $model;
 	}
 
@@ -379,6 +395,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
 	/**
 	 * @param string $name
 	 * @param mixed  $value
+	 *
 	 * @return mixed
 	 */
 	public function setAttribute(string $name, mixed $value): mixed
@@ -393,6 +410,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
 	/**
 	 * @param string $name
 	 * @param mixed  $value
+	 *
 	 * @return mixed
 	 */
 	public function setOldAttribute(string $name, mixed $value): mixed
@@ -406,6 +424,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
 
 	/**
 	 * @param array $param
+	 *
 	 * @return $this
 	 * @throws
 	 */
@@ -420,6 +439,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
 
 	/**
 	 * @param array $param
+	 *
 	 * @return $this
 	 */
 	public function setOldAttributes(array $param): static
@@ -439,8 +459,8 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
 	{
 		$sql    = SqlBuilder::builder($query = static::query())->insert($this->_attributes);
 		$lastId = $this->getConnection()->createCommand($sql, $query->params)->exec();
-        if ($lastId === false) {
-            return false;
+		if ($lastId === FALSE) {
+			return FALSE;
 		}
 		if (!$this->hasPrimary()) {
 			return $this->refresh()->afterSave($this->_attributes, []);
@@ -456,6 +476,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
 	 * @param array $old
 	 * @param array $condition
 	 * @param array $change
+	 *
 	 * @return $this|bool
 	 * @throws
 	 */
@@ -463,11 +484,11 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
 	{
 		$query = static::query()->where($condition);
 		if (count($change) < 1) {
-            return true;
+			return TRUE;
 		}
 		$generate = SqlBuilder::builder($query)->update($change);
-        if ($generate === false) {
-            return false;
+		if ($generate === FALSE) {
+			return FALSE;
 		}
 		if (!$this->getConnection()->createCommand($generate, $query->params)->exec()) {
 			return FALSE;
@@ -529,6 +550,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
 
 	/**
 	 * @param array $value
+	 *
 	 * @return $this
 	 */
 	public function populates(array $value): static
@@ -542,6 +564,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
 
 	/**
 	 * @param array $rule
+	 *
 	 * @return bool
 	 * @throws
 	 */
@@ -552,7 +575,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
 		}
 		$validate = $this->resolve($rule);
 		if (!$validate->validation($params)) {
-            return \Kiri::getLogger()->failure($validate->getError() . PHP_EOL, 'mysql');
+			return \Kiri::getLogger()->logCategory($validate->getError() . PHP_EOL, 'mysql');
 		} else {
 			return TRUE;
 		}
@@ -561,12 +584,13 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
 
 	/**
 	 * @param array $rule
+	 *
 	 * @return Validator
 	 * @throws
 	 */
 	private function resolve(array $rule): Validator
 	{
-        $validate = new Validator();
+		$validate = new Validator;
 		foreach ($rule as $val) {
 			$field = array_shift($val);
 			if (is_string($field)) {
@@ -581,6 +605,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
 
 	/**
 	 * @param string $name
+	 *
 	 * @return null
 	 * @throws
 	 */
@@ -596,18 +621,19 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
 	 */
 	public function getRelation(): ?Relation
 	{
-        return Kiri::getDi()->get(Relation::class);
+		return di(Relation::class);
 	}
 
 
 	/**
 	 * @param string $attribute
+	 *
 	 * @return bool
 	 * @throws
 	 */
 	public function has(string $attribute): bool
 	{
-        return true;
+		return TRUE;
 	}
 
 
@@ -626,6 +652,13 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
 		if (!empty($tablePrefix) && !str_starts_with($table, $tablePrefix)) {
 			$table = $tablePrefix . $table;
 		}
+
+		$driver = strtolower($connection->driver ?? 'mysql');
+		if (in_array($driver, ['pgsql', 'postgresql'])) {
+			// PostgreSQL 使用双引号，并且 schema.table 格式
+			return '"' . $connection->database . '"."' . $table . '"';
+		}
+		// MySQL 使用反引号
 		return '`' . $connection->database . '`.' . $table;
 	}
 
@@ -633,6 +666,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
 	/**
 	 * @param array $oldAttributes
 	 * @param array $changeAttributes
+	 *
 	 * @return bool
 	 */
 	public function afterSave(array $oldAttributes, array $changeAttributes): bool
@@ -643,6 +677,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
 
 	/**
 	 * @param self $model
+	 *
 	 * @return bool
 	 * @throws
 	 */
@@ -658,7 +693,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
 	public function refresh(): static
 	{
 		$this->_oldAttributes = $this->_attributes;
-        $this->isNewExample   = false;
+		$this->isNewExample   = FALSE;
 		return $this;
 	}
 
@@ -666,17 +701,21 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
 	/**
 	 * @param string $name
 	 * @param mixed  $value
+	 *
 	 * @return void
 	 */
 	public function __set(string $name, mixed $value): void
 	{
-        if ($this->hasRelateMethod($name, 'set')) {
-            $this->{'set' . ucfirst($name)}($value);
-        } else {
-            $method = 'set' . ucfirst($name) . 'Attribute';
-            if (method_exists($this, $method)) {
-                $value = $this->{$method} ($value);
+		$prefix = 'set' . ucfirst($name);
+		if (method_exists($this, $prefix)) {
+			$this->{$prefix}($value);
+			return;
 		}
+
+		$method = $prefix . 'Attribute';
+		if (method_exists($this, $method)) {
+			$this->_attributes[$name] = $this->{$method}($value);
+		} else {
 			$this->_attributes[$name] = $value;
 		}
 	}
@@ -684,25 +723,35 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
 
 	/**
 	 * @param string $name
+	 *
 	 * @return mixed
 	 */
 	public function __get(string $name): mixed
 	{
-        $value = $this->_attributes[$name] ?? null;
-        if (!$this->hasRelateMethod($name)) {
-            return $this->withPropertyOverride($name, $value);
-        } else {
-            return $this->withRelate($name);
+		if (isset($this->_attributes[$name])) {
+			return $this->withPropertyOverride($name, $this->_attributes[$name]);
 		}
+
+		if (isset($this->_oldAttributes[$name])) {
+			return $this->withPropertyOverride($name, $this->_oldAttributes[$name]);
+		}
+
+
+		if (!method_exists($this, 'get' . ucfirst($name))) {
+			return NULL;
+		}
+
+		return $this->{'get' . ucfirst($name)}();
 	}
 
 
 	/**
 	 * @param string     $name
 	 * @param mixed|null $value
+	 *
 	 * @return mixed
 	 */
-    protected function withPropertyOverride(string $name, mixed $value = null): mixed
+	protected function withPropertyOverride(string $name, mixed $value = NULL): mixed
 	{
 		$method = 'get' . ucfirst($name) . 'Attribute';
 		if (method_exists($this, $method)) {
@@ -716,16 +765,26 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
 	/**
 	 * @param string $name
 	 * @param string $prefix
+	 *
 	 * @return bool
 	 */
-    protected function hasRelateMethod(string $name, string $prefix = 'get'): bool
+	protected function hasRelateMethod(string $name): bool
 	{
-        return method_exists($this, $prefix . ucfirst($name));
+		$reflection = $this->container->get(static::class);
+		if (!$reflection->hasMethod($name)) {
+			return FALSE;
+		}
+		if ($reflection->getMethod($name)->isStatic() || !$reflection->getMethod($name)->isPublic()) {
+			return FALSE;
+		} else {
+			return TRUE;
+		}
 	}
 
 
 	/**
 	 * @param string $name
+	 *
 	 * @return mixed
 	 */
 	protected function withRelate(string $name): mixed
@@ -740,6 +799,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
 
 	/**
 	 * @param $name
+	 *
 	 * @return bool
 	 */
 	public function __isset(string $name): bool
@@ -750,6 +810,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
 
 	/**
 	 * @param mixed $offset
+	 *
 	 * @return bool
 	 * @throws
 	 */
@@ -760,6 +821,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
 
 	/**
 	 * @param mixed $offset
+	 *
 	 * @return mixed
 	 * @throws
 	 */
@@ -771,18 +833,22 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
 	/**
 	 * @param mixed $offset
 	 * @param mixed $value
+	 *
 	 * @throws
 	 */
-    #[ReturnTypeWillChange] public function offsetSet(mixed $offset, mixed $value): void
+	#[ReturnTypeWillChange]
+	public function offsetSet(mixed $offset, mixed $value): void
 	{
 		$this->__set($offset, $value);
 	}
 
 	/**
 	 * @param mixed $offset
+	 *
 	 * @throws
 	 */
-    #[ReturnTypeWillChange] public function offsetUnset(mixed $offset): void
+	#[ReturnTypeWillChange]
+	public function offsetUnset(mixed $offset): void
 	{
 		if (!isset($this->_attributes[$offset]) && !isset($this->_oldAttributes[$offset])) {
 			return;
@@ -793,6 +859,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
 
 	/**
 	 * @param string ...$params
+	 *
 	 * @return array
 	 */
 	public function unset(string ...$params): array
@@ -803,12 +870,13 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
 
 	/**
 	 * @param array $data
+	 *
 	 * @return static
 	 * @throws
 	 */
 	public static function populate(array $data): static
 	{
-        $model                 = new static();
+		$model                 = new static;
 		$model->_attributes    = $data;
 		$model->_oldAttributes = $data;
 		$model->setIsNowExample();
@@ -819,21 +887,23 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
 	/**
 	 * @param string $name
 	 * @param array  $arguments
+	 *
 	 * @return mixed
 	 */
 	public static function __callStatic(string $name, array $arguments)
 	{
-        return (new static())->{$name}(...$arguments);
+		return (new static)->{$name}(...$arguments);
 	}
 
 
 	/**
 	 * @param string $field
+	 *
 	 * @return array
 	 */
 	public function getOldAttribute(string $field): mixed
 	{
-        return $this->_oldAttributes[$field] ?? null;
+		return $this->_oldAttributes[$field] ?? NULL;
 	}
 
 }

Base/PDO.php

@@ -5,6 +5,7 @@ namespace Database\Base;
 class PDO extends \PDO
 {
 
+    readonly public string $driver;
 
     /**
      * @param string $database
@@ -12,6 +13,7 @@ class PDO extends \PDO
      * @param string $username
      * @param string $password
      * @param array $options
+     * @param string $driver
      */
     public function __construct(
         readonly public string $database,
@@ -19,10 +21,23 @@ class PDO extends \PDO
         readonly public string $username,
         readonly public string $password,
         readonly public array  $options,
+        string $driver = 'mysql',
     )
     {
-        parent::__construct('mysql:dbname=' . $this->database . ';host=' . $this->host, $this->username, $this->password, $this->options);
+        $this->driver = strtolower($driver);
+        $dsn = $this->buildDsn();
+        parent::__construct($dsn, $this->username, $this->password, $this->options);
     }
 
+    /**
+     * @return string
+     */
+    private function buildDsn(): string
+    {
+        return match ($this->driver) {
+            'pgsql', 'postgresql' => 'pgsql:host=' . $this->host . ';dbname=' . $this->database,
+            default => 'mysql:dbname=' . $this->database . ';host=' . $this->host,
+        };
+    }
 
 }

Collection.php

@@ -41,7 +41,7 @@ class Collection extends AbstractCollection
     public function update(array $attributes): bool
     {
         if ($this->isEmpty()) {
-            return $this->getLogger()->failure('No data by update', 'mysql');
+            return $this->getLogger()->logCategory('No data by update', 'mysql');
         }
         return $this->batch()->update($attributes);
     }
@@ -150,7 +150,7 @@ class Collection extends AbstractCollection
     {
         $model = $this->getModel();
         if ($this->isEmpty()) {
-            return $this->getLogger()->failure('No data by delete', 'mysql');
+            return $this->getLogger()->logCategory('No data by delete', 'mysql');
         }
         if (!$model->hasPrimary()) {
             throw new Exception('Must set primary key. if you want to delete data');

Command.php

@@ -23,6 +23,9 @@ use Throwable;
 class Command extends Component
 {
 
+	/** @var int 数据库操作最大重试次数 */
+	private const MAX_RETRIES = 2;
+
 	public Connection $connection;
 	public ?string    $sql    = '';
 	public array      $params = [];
@@ -101,12 +104,17 @@ class Command extends Component
 
 
 	/**
-     * @param string $method
+	 * 执行查询类 SQL 操作，内置断连重试机制
+	 * 当数据库连接断开时自动重试，断开的连接不再归还池中防止污染连接池
+	 * @param string $method PDO 结果获取方法名
 	 * @return mixed
 	 * @throws
 	 */
 	protected function search(string $method): mixed
 	{
+		$retryCount = 0;
+
+		while ($retryCount <= self::MAX_RETRIES) {
 			$client = $this->connection->getConnection();
 			try {
 				$startTime = microtime(true);
@@ -121,18 +129,28 @@ class Command extends Component
 
 				$this->connection->println($startTime, microtime(true), $this->sql, $this->params);
 
+				$this->connection->release($client);
 				return $result;
 			} catch (Throwable $throwable) {
-            if ($this->isRefresh($throwable)) return $this->search($method);
+				$this->getLogger()->json_log($throwable);
+
+				if ($this->isRefresh($throwable) && $retryCount < self::MAX_RETRIES) {
+					$retryCount++;
+					$this->connection->connections->abandon($this->connection->getName());
+					continue;
+				}
+
+				$this->connection->release($client);
 
 				$errorMsg = $throwable->getMessage() . PHP_EOL . '                 Sql: ' . $this->sql . '.' . json_encode($this->params);
 
-            return $this->getLogger()->failure($errorMsg . PHP_EOL, 'mysql');
-        } finally {
-            $this->connection->release($client);
+				return $this->getLogger()->logCategory($errorMsg . PHP_EOL, 'mysql');
 			}
 		}
 
+		return $this->getLogger()->logCategory('Max retry exceeded for SQL: ' . $this->sql, 'mysql');
+	}
+
 
 	/**
 	 * @return bool
@@ -145,11 +163,16 @@ class Command extends Component
 
 
 	/**
+	 * 执行写入类 SQL 操作，内置断连重试机制
+	 * 当数据库连接断开时自动重试，断开的连接不再归还池中防止污染连接池
 	 * @return int|bool
 	 * @throws
 	 */
 	private function _prepare(): int|bool
 	{
+		$retryCount = 0;
+
+		while ($retryCount <= self::MAX_RETRIES) {
 			$client = $this->connection->getConnection();
 			try {
 				$startTime = microtime(true);
@@ -159,22 +182,37 @@ class Command extends Component
 				if ($prepare->execute($this->params) === false) {
 					throw new Exception('(' . $prepare->errorInfo()[0] . ')' . $prepare->errorInfo()[2]);
 				}
+
 				$prepare->closeCursor();
 
 				$result = $client->lastInsertId();
 
 				$this->connection->println($startTime, microtime(true), $this->sql, $this->params);
+				if (str_starts_with($this->sql, 'DELETE')) {
+					$this->connection->release($client);
+					return $prepare->rowCount();
+				}
 
+				$this->connection->release($client);
 				return $result == 0 ? $prepare->rowCount() : (int)$result;
 			} catch (Throwable $throwable) {
-            if ($this->isRefresh($throwable)) return $this->_prepare();
+				$this->getLogger()->json_log($throwable);
 
-            $errorMsg = $throwable->getMessage() . PHP_EOL . '                 Sql: ' . $this->sql . '.' . json_encode($this->params);
-
-            return $this->getLogger()->failure($errorMsg . PHP_EOL, 'mysql');
-        } finally {
-            $this->connection->release($client);
+				if ($this->isRefresh($throwable) && $retryCount < self::MAX_RETRIES) {
+					$retryCount++;
+					$this->connection->connections->abandon($this->connection->getName());
+					continue;
 				}
+
+				$this->connection->release($client);
+
+				$errorMsg = $throwable->getMessage() . PHP_EOL . '                 Sql: ' . $this->sql . '.' . json_encode($this->params, JSON_UNESCAPED_UNICODE);
+
+				return $this->getLogger()->logCategory($errorMsg . PHP_EOL, 'mysql');
+			}
+		}
+
+		return $this->getLogger()->logCategory('Max retry exceeded for SQL: ' . $this->sql, 'mysql');
 	}
 
 
@@ -184,15 +222,33 @@ class Command extends Component
 	 */
 	protected function isRefresh(Throwable $throwable): bool
 	{
-        if (str_contains($throwable->getMessage(), 'MySQL server has gone away')) {
+		$message = $throwable->getMessage();
+
+		// MySQL 错误处理
+		if (str_contains($message, 'MySQL server has gone away')) {
 			return true;
 		}
-        if (str_contains($throwable->getMessage(), 'Send of 14 bytes failed with errno=32 Broken pipe')) {
+		if (str_contains($message, 'Send of 14 bytes failed with errno=32 Broken pipe')) {
 			return true;
 		}
-        if (str_contains($throwable->getMessage(), 'Lost connection to MySQL server during query')) {
+		if (str_contains($message, 'Lost connection to MySQL server during query')) {
 			return true;
 		}
+
+		// PostgreSQL 错误处理
+		if (str_contains($message, 'server closed the connection unexpectedly')) {
+			return true;
+		}
+		if (str_contains($message, 'Connection refused')) {
+			return true;
+		}
+		if (str_contains($message, 'Broken pipe')) {
+			return true;
+		}
+		if (str_contains($message, 'connection to server was lost')) {
+			return true;
+		}
+
 		return false;
 	}
 
@@ -203,7 +259,7 @@ class Command extends Component
 	 */
 	public function delete(): bool
 	{
-        return (bool)$this->_prepare();
+		return $this->_prepare();
 	}
 
 

Condition/Condition.php

@@ -43,10 +43,9 @@ abstract class Condition extends Component
     public function setValue($params): void
     {
         if (is_array($params)) {
-            $values = [];
-            foreach ($params as $item => $value) {
-                $values[$item] = is_numeric($value) ? $value : '\'' . $value . '\'';
-            }
+            $values = array_map(function ($value) {
+                return is_numeric($value) ? $value : '\'' . $value . '\'';
+            }, $params);
             $this->value = $values;
         } else {
             $this->value = $this->checkIsSqlString($params);

Condition/NotInCondition.php

@@ -17,7 +17,7 @@ class NotInCondition extends Condition
      * @return string|null
      * @throws
      */
-    #[Pure] public function builder(): ?string
+    public function builder(): ?string
     {
         if (!is_array($this->value)) {
             throw new \Exception('Builder data by a empty string. need array');

Connection.php

@@ -14,21 +14,21 @@ namespace Database;
 use Database\Affair\BeginTransaction;
 use Database\Affair\Commit;
 use Database\Affair\Rollback;
+use Database\Base\Driver;
+use Database\Base\PDO;
 use Exception;
-use Kiri;
-use Kiri\Server\Events\OnWorkerExit;
 use Kiri\Abstracts\Component;
 use Kiri\Di\Context;
-use Kiri\Pool\Pool;
-use Kiri\Events\EventProvider;
-use Kiri\Error\StdoutLogger;
-use Psr\Log\LoggerInterface;
-use Kiri\Server\Events\OnWorkerStart;
-use Kiri\Server\Events\OnTaskerStart;
-use Kiri\Server\Events\OnAfterRequest;
 use Kiri\Di\Inject\Container;
+use Kiri\Error\StdoutLogger;
+use Kiri\Events\EventProvider;
+use Kiri\Pool\Pool;
+use Kiri\Server\Events\OnAfterRequest;
+use Kiri\Server\Events\OnTaskerStart;
+use Kiri\Server\Events\OnWorkerExit;
+use Kiri\Server\Events\OnWorkerStart;
+use Psr\Log\LoggerInterface;
 use Swoole\Timer;
-use Database\Base\PDO;
 
 //use PDO;
 
@@ -46,9 +46,10 @@ class Connection extends Component
     public string       $charset     = 'utf-8';
     public string       $tablePrefix = '';
     public string       $database    = '';
+    public string       $driver      = 'mysql';
     public int          $timeout     = 30;
     public int          $waite_time  = 3;
-    public int          $tick_time   = 60;
+    public int          $tick_time   = 60000;
     public int          $idle_count  = 3;
     public int          $idle_time   = 60;
     public array        $pool        = ['max' => 10, 'min' => 1];
@@ -67,6 +68,14 @@ class Connection extends Component
     #[Container(LoggerInterface::class)]
     public StdoutLogger $logger;
 
+
+    /**
+     * @var EventProvider
+     */
+    #[Container(EventProvider::class)]
+    public EventProvider $eventProvider;
+
+
     /**
      * @param Pool $connections
      */
@@ -99,14 +108,13 @@ class Connection extends Component
      */
     public function init(): void
     {
-        $eventProvider = Kiri::getDi()->get(EventProvider::class);
-        $eventProvider->on(BeginTransaction::class, [$this, 'beginTransaction'], 0);
-        $eventProvider->on(Rollback::class, [$this, 'rollback'], 0);
-        $eventProvider->on(Commit::class, [$this, 'commit'], 0);
-        $eventProvider->on(OnAfterRequest::class, [$this, 'clear']);
-        $eventProvider->on(OnWorkerExit::class, [$this, 'disconnect']);
-        $eventProvider->on(OnWorkerStart::class, [$this, 'tick']);
-        $eventProvider->on(OnTaskerStart::class, [$this, 'tick']);
+        $this->eventProvider->on(BeginTransaction::class, [$this, 'beginTransaction'], 0);
+        $this->eventProvider->on(Rollback::class, [$this, 'rollback'], 0);
+        $this->eventProvider->on(Commit::class, [$this, 'commit'], 0);
+        $this->eventProvider->on(OnAfterRequest::class, [$this, 'clear']);
+        $this->eventProvider->on(OnWorkerExit::class, [$this, 'disconnect']);
+        $this->eventProvider->on(OnWorkerStart::class, [$this, 'tick']);
+        $this->eventProvider->on(OnTaskerStart::class, [$this, 'tick']);
     }
 
 
@@ -127,28 +135,28 @@ class Connection extends Component
     protected function checkClientHealth(Pool $pool): void
     {
         $pool->flush($this->getName(), $this->pool['min'] ?? 1);
-        $length = $pool->size($this->getName());
-        for ($i = 0; $i < $length; $i++) {
-            try {
-                if (($client = $this->validator($pool)) === false) {
-                    break;
-                }
-                $pool->push($this->getName(), $client);
-            } catch (\Throwable $exception) {
-                if (!str_contains($exception->getMessage(), 'Client timeout.')) {
-                    $this->logger->error(throwable($exception), [$this->cds]);
-                }
-            }
-        }
+//        $length = $pool->size($this->getName());
+//        for ($i = 0; $i < $length; $i++) {
+//            try {
+//                if (($client = $this->validator($pool)) === false) {
+//                    break;
+//                }
+//                $pool->push($this->getName(), $client);
+//            } catch (\Throwable $exception) {
+//                if (!str_contains($exception->getMessage(), 'Client timeout.')) {
+//                    $this->logger->error(throwable($exception), [$this->cds]);
+//                }
+//            }
+//        }
     }
 
 
     /**
      * @return string
      */
-    private function getName(): string
+    public function getName(): string
     {
-        return 'mysql.' . $this->cds;
+        return strtolower($this->driver) . '.' . $this->cds;
     }
 
 
@@ -256,6 +264,7 @@ class Connection extends Component
                 $pdo->rollback();
             }
             $this->release($pdo);
+            Context::remove($this->cds);
         }
     }
 
@@ -275,6 +284,7 @@ class Connection extends Component
                 $pdo->commit();
             }
             $this->release($pdo);
+            Context::remove($this->cds);
         }
     }
 
@@ -294,6 +304,8 @@ class Connection extends Component
             $pdo->rollback();
         }
         $this->release($pdo);
+        Context::remove($this->cds);
+        $this->storey = 0;
     }
 
 
@@ -305,7 +317,7 @@ class Connection extends Component
      */
     public function createCommand(string $sql, array $attributes = []): Command
     {
-        return (new Command(['connection' => $this, 'sql' => $sql]))->bindValues($attributes);
+        return new Command(['connection' => $this, 'sql' => $sql])->bindValues($attributes);
     }
 
 
@@ -349,16 +361,22 @@ class Connection extends Component
      */
     public function newConnect(): \PDO
     {
-        $pdo = new PDO($this->database, $this->cds, $this->username, $this->password, [
-//        $pdo = new \PDO('mysql:dbname=' . $this->database . ';host=' . $this->cds, $this->username, $this->password, [
+        $driver = strtolower($this->driver);
+        $options = [
             \PDO::ATTR_CASE              => \PDO::CASE_NATURAL,
             \PDO::ATTR_ERRMODE           => \PDO::ERRMODE_EXCEPTION,
             \PDO::ATTR_ORACLE_NULLS      => \PDO::NULL_NATURAL,
             \PDO::ATTR_STRINGIFY_FETCHES => false,
             \PDO::ATTR_EMULATE_PREPARES  => true,
             \PDO::ATTR_TIMEOUT           => $this->timeout,
-\PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES ' . $this->charset
-        ]);
+        ];
+        
+        // MySQL 特定的选项
+        if ($driver === 'mysql') {
+            $options[\PDO::MYSQL_ATTR_INIT_COMMAND] = 'SET NAMES ' . $this->charset;
+        }
+        
+        $pdo = new PDO($this->database, $this->cds, $this->username, $this->password, $options, $driver);
         foreach ($this->attributes as $key => $attribute) {
             $pdo->setAttribute($key, $attribute);
         }

DatabasesProviders.php

@@ -35,7 +35,7 @@ class DatabasesProviders extends Providers
             return;
         }
         foreach ($databases as $key => $database) {
-            $this->set($key, $this->_settings($database));
+            $this->set($key, $this->_settings($key, $database));
         }
     }
 
@@ -64,22 +64,24 @@ class DatabasesProviders extends Providers
 
 
 	/**
+	 * @param string $key
 	 * @param array  $database
 	 * @return array
 	 */
-    private function _settings(array $database): array
+    private function _settings(string $key, array $database): array
     {
         $clientPool = $database['pool'] ?? ['min' => 1, 'max' => 5, 'tick' => 60];
         return [
-            'id'          => $database['id'],
+            'id'          => $key,
             'cds'         => $database['cds'],
             'class'       => Connection::class,
             'username'    => $database['username'],
             'password'    => $database['password'],
             'tablePrefix' => $database['tablePrefix'],
             'database'    => $database['database'],
+            'driver'      => $database['driver'] ?? 'mysql',
             'timeout'     => $database['timeout'] ?? 10,
-            'tick_time'   => $database['tick_time'] ?? 60,
+            'tick_time'   => $database['tick_time'] ?? 60000,
             'waite_time'  => $database['waite_time'] ?? 3,
             'pool'        => $clientPool,
             'attributes'  => $database['attributes'] ?? [],

HasCount.php

@@ -4,8 +4,8 @@ declare(strict_types=1);
 namespace Database;
 
 use Database\Traits\HasBase;
-use Exception;
 use Kiri;
+use Kiri\Di\Context;
 
 /**
  * Class HasCount
@@ -20,8 +20,7 @@ class HasCount extends HasBase
      */
     public function get(): array|ModelInterface|null
     {
-        $relation = Kiri::getDi()->get(Relation::class);
-        return $relation->get($this->name);
+        return di(Relation::class)->get($this->name);
     }
 
 }

HasMany.php

@@ -12,6 +12,7 @@ namespace Database;
 use Database\Traits\HasBase;
 use Exception;
 use Kiri;
+use Kiri\Di\Context;
 
 /**
  * Class HasMany
@@ -28,7 +29,6 @@ class HasMany extends HasBase
      */
     public function get(): array|Collection|null
     {
-        $relation = Kiri::getDi()->get(Relation::class);
-        return $relation->get($this->name);
+        return di(Relation::class)->get($this->name);
     }
 }

HasOne.php

@@ -12,6 +12,7 @@ namespace Database;
 use Database\Traits\HasBase;
 use Exception;
 use Kiri;
+use Kiri\Di\Context;
 
 /**
  * Class HasOne
@@ -27,7 +28,6 @@ class HasOne extends HasBase
      */
     public function get(): array|ModelInterface|null
     {
-        $relation = Kiri::getDi()->get(Relation::class);
-        return $relation->first($this->name);
+        return di(Relation::class)->first($this->name);
     }
 }

Model.php

@@ -116,8 +116,9 @@ class Model extends Base\Model
             $connection->commit();
             return $select;
         } catch (\Throwable $throwable) {
+			$model->getLogger()->json_log($throwable);
 			$connection->rollback();
-            return \Kiri::getLogger()->failure($throwable);
+            return false;
         }
     }
 
@@ -145,8 +146,9 @@ class Model extends Base\Model
             $connection->commit();
             return $select;
         } catch (\Throwable $throwable) {
+			$model->getLogger()->json_log($throwable);
 			$connection->rollback();
-            return \Kiri::getLogger()->failure($throwable);
+			return false;
         }
     }
 
@@ -206,10 +208,11 @@ class Model extends Base\Model
     public static function inserts(array $data): bool
     {
         if (empty($data)) {
-            return trigger_print_error('Insert data empty.', 'mysql');
-        }
+            return \Kiri::getLogger()->logCategory('Insert data empty.', 'mysql');
+        } else {
 			return static::query()->insert($data);
 		}
+    }
 
     /**
      * @return bool
@@ -266,22 +269,23 @@ class Model extends Base\Model
 
 
     /**
-     * @param ModelInterface|string $modelName
+     * @param string $modelName
      * @param string $foreignKey
      * @param string $localKey
      * @return string
      * @throws Exception
      */
-    private function _hasBase(ModelInterface|string $modelName, string $foreignKey, string $localKey): string
+    private function _hasBase(string $modelName, string $foreignKey, string $localKey): string
     {
         if (($value = $this->{$localKey}) === null) {
             throw new Exception("Need join table primary key.");
         }
 
-        $relation = $this->getRelation();
+        $relation = di(Relation::class);
 
-        $primaryKey = $modelName . $foreignKey . $value;
+        $primaryKey = str_replace('\\', '_', $modelName) . '_' . $foreignKey . '_' . $value;
         if (!$relation->hasIdentification($primaryKey)) {
+	        /** @var $modelName ModelInterface */
             $relation->bindIdentification($primaryKey, $modelName::query()->where([$foreignKey => $value]));
         }
         return $primaryKey;
@@ -289,60 +293,61 @@ class Model extends Base\Model
 
 
     /**
-     * @param ModelInterface|string $modelName
+     * @param string $modelName
      * @param string $foreignKey
      * @param string $localKey
      * @return HasOne|ActiveQuery
      * @throws Exception
      */
-    public function hasOne(ModelInterface|string $modelName, string $foreignKey, string $localKey): HasOne|ActiveQuery
+    public function hasOne(string $modelName, string $foreignKey, string $localKey): HasOne|ActiveQuery
     {
         return new HasOne($this->_hasBase($modelName, $foreignKey, $localKey));
     }
 
 
     /**
-     * @param ModelInterface|string $modelName
+     * @param string $modelName
      * @param string $foreignKey
      * @param string $localKey
      * @return ActiveQuery|HasCount
      * @throws Exception
      */
-    public function hasCount(ModelInterface|string $modelName, string $foreignKey, string $localKey): ActiveQuery|HasCount
+    public function hasCount(string $modelName, string $foreignKey, string $localKey): ActiveQuery|HasCount
     {
         return new HasCount($this->_hasBase($modelName, $foreignKey, $localKey));
     }
 
 
     /**
-     * @param ModelInterface|string $modelName
+     * @param string $modelName
      * @param string $foreignKey
      * @param string $localKey
      * @return ActiveQuery|HasMany
      * @throws Exception
      */
-    public function hasMany(ModelInterface|string $modelName, string $foreignKey, string $localKey): ActiveQuery|HasMany
+    public function hasMany(string $modelName, string $foreignKey, string $localKey): ActiveQuery|HasMany
     {
         return new HasMany($this->_hasBase($modelName, $foreignKey, $localKey));
     }
 
     /**
-     * @param ModelInterface|string $modelName
+     * @param string $modelName
      * @param string $foreignKey
      * @param string $localKey
      * @return ActiveQuery|HasMany
      * @throws Exception
      */
-    public function hasIn(ModelInterface|string $modelName, string $foreignKey, string $localKey): ActiveQuery|HasMany
+    public function hasIn(string $modelName, string $foreignKey, string $localKey): ActiveQuery|HasMany
     {
         if (($value = $this->{$localKey}) === null) {
             throw new Exception("Need join table primary key.");
         }
 
-        $relation = $this->getRelation();
+        $relation = di(Relation::class);
 
-        $primaryKey = $modelName . $foreignKey . json_encode($value, JSON_UNESCAPED_UNICODE);
+        $primaryKey = str_replace('\\', '_', $modelName) . '_' . $foreignKey . '_' . implode('_', $value);
         if (!$relation->hasIdentification($primaryKey)) {
+			/** @var $modelName ModelInterface */
             $relation->bindIdentification($primaryKey, $modelName::query()->whereIn($foreignKey, $value));
         }
 

Relation.php

@@ -4,8 +4,10 @@ declare(strict_types=1);
 namespace Database;
 
 
+use Database\Base\ActiveQueryInterface;
 use Kiri\Abstracts\Component;
 use Kiri\Di\Context;
+use Swoole\Coroutine;
 
 /**
  * Class Relation
@@ -34,7 +36,7 @@ class Relation extends Component
      */
     public function hasIdentification(string $identification): bool
     {
-        return isset($this->_query[$identification]) && $this->_query[$identification] instanceof ActiveQuery;
+        return isset($this->_query[$identification]);
     }
 
     /**
@@ -54,12 +56,10 @@ class Relation extends Component
      */
     public function first(string $_identification): mixed
     {
-        if (Context::exists($_identification)) {
-            return Context::get($_identification);
+        if (!Context::exists($_identification)) {
+            Context::set($_identification, $this->_query[$_identification]->first());
         }
-        $activeModel = $this->_query[$_identification]->first();
-        unset($this->_query[$_identification]);
-        return Context::set($_identification, $activeModel);
+        return Context::get($_identification);
     }
 
 
@@ -69,12 +69,10 @@ class Relation extends Component
      */
     public function count(string $_identification): mixed
     {
-        if (Context::exists($_identification)) {
-            return Context::get($_identification);
+        if (!Context::exists($_identification)) {
+            Context::set($_identification, $this->_query[$_identification]->count());
         }
-        $activeModel = $this->_query[$_identification]->count();
-        unset($this->_query[$_identification]);
-        return Context::set($_identification, $activeModel);
+        return Context::get($_identification);
     }
 
 
@@ -86,11 +84,9 @@ class Relation extends Component
     public function get(string $_identification): mixed
     {
         if (Context::exists($_identification)) {
-            return Context::get($_identification);
+            Context::set($_identification, $this->_query[$_identification]->get());
         }
-        $activeModel = $this->_query[$_identification]->get();
-        unset($this->_query[$_identification]);
-        return Context::set($_identification, $activeModel);
+        return Context::get($_identification);
     }
 
 }

SqlBuilder.php

@@ -1,4 +1,5 @@
-<?php /** @noinspection ALL */
+<?php
+/** @noinspection ALL */
 
 declare(strict_types=1);
 
@@ -8,6 +9,7 @@ namespace Database;
 use JetBrains\PhpStorm\Pure;
 use Kiri;
 use Kiri\Abstracts\Component;
+use Database\Traits\QueryTrait;
 
 
 /**
@@ -51,7 +53,7 @@ class SqlBuilder extends Component
 	 */
 	public function getCondition(): string
 	{
-        return $this->where($this->query->getWhere());
+		return $this->where($this->query->where);
 	}
 
 
@@ -73,13 +75,13 @@ class SqlBuilder extends Component
 	 */
 	public function update(array $attributes): bool|string
 	{
-        $conditions = $this->query->getParams();
-        $this->query->setParams([]);
-        $data = $this->__updateBuilder($this->makeParams($attributes));
-        foreach ($conditions as $condition) {
-            $this->query->pushParam($condition);
+		$params              = $this->query->params;
+		$this->query->params = [];
+		$array               = $this->makeParams($attributes);
+		foreach ($params as $name => $value) {
+			$this->query->pushParam($value);
 		}
-        return $data;
+		return $this->__updateBuilder($array);
 	}
 
 
@@ -107,9 +109,10 @@ class SqlBuilder extends Component
 	private function __updateBuilder(array $string): string|bool
 	{
 		if (empty($string)) {
-            return Kiri::getLogger()->failure('None data update.');
+			return Kiri::getLogger()->logCategory('None data update.');
 		}
-        return 'UPDATE ' . $this->query->getFrom() . ' SET ' . implode(',', $string) . $this->make();
+
+		return 'UPDATE ' . $this->getFromAlias() . ' ' . 'SET' . ' ' . implode(', ', $string) . ' ' . $this->make();
 	}
 
 
@@ -121,7 +124,7 @@ class SqlBuilder extends Component
 	 */
 	public function insert(array $attributes, bool $isBatch = false): string
 	{
-        $update = 'INSERT INTO ' . $this->query->getFrom();
+		$update = 'INSERT INTO ' . $this->getFromAlias();
 		if ($isBatch === false) {
 			$attributes = [$attributes];
 		}
@@ -143,7 +146,9 @@ class SqlBuilder extends Component
 	 */
 	public function delete(): string
 	{
-        return 'DELETE FROM ' . $this->query->getFrom() . $this->make();
+		return 'DELETE FROM ' .
+			$this->getFromAlias() . ' ' .
+			$this->make();
 	}
 
 
@@ -151,7 +156,8 @@ class SqlBuilder extends Component
 	 * @param $attributes
 	 * @return array
 	 */
-    #[Pure] private function getFields(array $attributes): array
+	#[Pure]
+	private function getFields(array $attributes): array
 	{
 		return array_keys(current($attributes));
 	}
@@ -189,7 +195,7 @@ class SqlBuilder extends Component
 		if (is_null($value)) {
 			return $keys;
 		}
-        if (is_string($value) && $this->isMath($value)) {
+		if (preg_match('/^[+|-]\s\d+$/', (string)$value)) {
 			$keys[] = $key . '=' . $key . ' ' . $value;
 		} else {
 			$this->query->pushParam($value);
@@ -199,23 +205,14 @@ class SqlBuilder extends Component
 	}
 
 
-    /**
-     * @param string $value
-     * @return bool
-     */
-    private function isMath(string $value): bool
-    {
-        return str_starts_with($value, '+ ') || str_starts_with($value, '- ');
-    }
-
-
 	/**
 	 * @return string
 	 * @throws
 	 */
 	public function one(): string
 	{
-        return $this->makeSelect($this->query->getSelect()) . $this->make() . $this->makeLimit($this->query->limit(1));
+		$this->query->offset(0)->limit(1);
+		return $this->all();
 	}
 
 
@@ -225,7 +222,7 @@ class SqlBuilder extends Component
 	 */
 	public function all(): string
 	{
-        return $this->makeSelect($this->query->getSelect()) . $this->make() . $this->makeLimit($this->query);
+		return $this->makeSelect($this->query) . ' ' . $this->make() . ' ' . $this->makeLimit();
 	}
 
 
@@ -235,7 +232,7 @@ class SqlBuilder extends Component
 	 */
 	public function count(): string
 	{
-        return $this->makeSelect(['COUNT(*)']) . $this->make();
+		return $this->makeSelect(['COUNT(*)']) . ' ' . $this->make();
 	}
 
 
@@ -245,16 +242,31 @@ class SqlBuilder extends Component
 	 */
 	public function exists(): string
 	{
-        return $this->makeSelect(['0']) . $this->make();
+		return $this->makeSelect(['0']) . ' ' . $this->make();
 	}
 
 
 	/**
 	 * @param string $table
 	 * @return string
+	 * @throws
 	 */
 	public function columns(string $table): string
 	{
+		$driver = $this->getDriver();
+		if (in_array($driver, ['pgsql', 'postgresql'])) {
+			$tableName = trim($table, '"`');
+			return "SELECT 
+                column_name as Field,
+                data_type as Type,
+                is_nullable as Null,
+                column_default as Default,
+                '' as Extra,
+                '' as Key
+            FROM information_schema.columns 
+            WHERE table_name = '$tableName' 
+            ORDER BY ordinal_position";
+		}
 		return 'SHOW FULL FIELDS FROM ' . $table;
 	}
 
@@ -265,26 +277,23 @@ class SqlBuilder extends Component
 	 */
 	private function make(): string
 	{
-        $select = $this->makeCondition();
-        $select .= $this->makeGroup();
-        $select .= $this->makeOrder();
-        return $select;
+		return $this->makeCondition() . ' ' . $this->makeGroup() . ' ' . $this->makeOrder();
 	}
 
 	/**
-     * @param array $select
+	 * @param mixed $select 列名数组或 QueryTrait 对象
 	 * @return string
 	 */
-    private function makeSelect(array $select = ['*']): string
+	private function makeSelect(mixed $select = ['*']): string
 	{
-        $select = "SELECT " . implode(',', $select) . " FROM " . $this->query->getFrom();
-        if ($this->query->getAlias() != "") {
-            $select .= " AS " . $this->query->getAlias();
+		if (!is_array($select)) {
+			$select = ['*'];
 		}
-        if (count($this->query->getJoin()) > 0) {
-            $select .= ' ' . implode(' ', $this->query->getJoin());
+		$sql = 'SELECT ' . implode(',', $select) . ' FROM ' . $this->getFromAlias();
+		if ($this->query->join !== []) {
+			$sql .= ' ' . implode(' ', $this->query->join);
 		}
-        return $select;
+		return $sql;
 	}
 
 
@@ -293,8 +302,8 @@ class SqlBuilder extends Component
 	 */
 	private function makeGroup(): string
 	{
-        if ($this->query->getGroup() != "") {
-            return ' GROUP BY ' . $this->query->getGroup();
+		if ($this->query->group !== '' && $this->query->group !== '0') {
+			return 'GROUP BY ' . $this->query->group;
 		}
 		return '';
 	}
@@ -305,8 +314,8 @@ class SqlBuilder extends Component
 	 */
 	private function makeOrder(): string
 	{
-        if (count($this->query->getOrder()) > 0) {
-            return ' ORDER BY ' . implode(',', $this->query->getOrder());
+		if (count($this->query->order) > 0) {
+			return 'ORDER BY ' . implode(',', $this->query->order);
 		}
 		return '';
 	}
@@ -317,7 +326,7 @@ class SqlBuilder extends Component
 	 */
 	private function makeCondition(): string
 	{
-        $condition = $this->where($this->query->getWhere());
+		$condition = $this->where($this->query->where);
 		if (empty($condition)) {
 			return '';
 		}
@@ -325,10 +334,18 @@ class SqlBuilder extends Component
 	}
 
 
+	/**
+	 * @return string
+	 * @throws
+	 */
 	private function makeLimit(): string
 	{
-        if ($this->query->getOffset() >= 0 && $this->query->getLimit() >= 1) {
-            return ' LIMIT ' . $this->query->getOffset() . ',' . $this->query->getLimit();
+		if ($this->query->offset >= 0 && $this->query->limit >= 1) {
+			$driver = $this->getDriver();
+			if (in_array($driver, ['pgsql', 'postgresql'])) {
+				return 'LIMIT ' . $this->query->limit . ' OFFSET ' . $this->query->offset;
+			}
+			return 'LIMIT ' . $this->query->offset . ',' . $this->query->limit;
 		}
 		return '';
 	}
@@ -354,7 +371,7 @@ class SqlBuilder extends Component
 	 */
 	public function truncate(): string
 	{
-        return sprintf('TRUNCATE %s', $this->query->getFrom());
+		return sprintf('TRUNCATE %s', $this->getFromAlias());
 	}
 
 
@@ -407,5 +424,48 @@ class SqlBuilder extends Component
 		return $_array;
 	}
 
+	/**
+	 * 获取数据库驱动类型
+	 * @return string
+	 * @throws
+	 */
+	private function getDriver(): string
+	{
+		try {
+			if ($this->query instanceof ActiveQuery && $this->query->modelClass !== null) {
+				if ($this->query->modelClass instanceof Model) {
+					$connection = $this->query->modelClass->getConnection();
+					if ($connection instanceof Connection) {
+						return strtolower($connection->driver ?? 'mysql');
+					}
+				}
+			}
+			if (method_exists($this->query, 'getConnection')) {
+				$connection = $this->query->getConnection();
+				if ($connection instanceof Connection) {
+					return strtolower($connection->driver ?? 'mysql');
+				}
+			}
+		} catch (\Throwable $e) {
+			$this->getLogger()->json_log($e);
+		}
+		return 'mysql';
+	}
+
+
+	/**
+	 * 获取 FROM 子句（表名 + 别名）
+	 * QueryTrait 对象有 $from 和 $alias 属性
+	 * @return string
+	 */
+	private function getFromAlias(): string
+	{
+		$from = $this->query->from;
+		if ($this->query->alias !== '' && $this->query->alias !== '0') {
+			$from .= ' AS ' . $this->query->alias;
+		}
+		return $from;
+	}
+
 
 }

Traits/HasBase.php

@@ -12,7 +12,6 @@ namespace Database\Traits;
 use Database\ModelInterface;
 use Database\Collection;
 use Database\Relation;
-use Kiri;
 
 /**
  * Class HasBase
@@ -52,12 +51,16 @@ abstract class HasBase implements \Database\Traits\Relation
      * @param string $name
      * @param array $arguments
      * @return $this|mixed
+     * @throws \Exception
      */
     public function __call(string $name, array $arguments)
     {
         if ($name !== 'get') {
-            $relation = Kiri::getDi()->get(Relation::class);
-            $relation->getQuery($this->name)->$name(...$arguments);
+            $query    = di(Relation::class)->getQuery($this->name);
+            if (is_null($query)) {
+                throw new \Exception('Unknown relation key: ' . $this->name);
+            }
+            $query->$name(...$arguments);
             return $this;
         } else {
             return $this->get();

Traits/QueryTrait.php

@@ -27,33 +27,112 @@ use Kiri\Abstracts\Component;
  */
 abstract class QueryTrait extends Component implements ActiveQueryInterface, ISqlBuilder
 {
-    protected array      $where  = [];
-    protected array      $select = ['*'];
-    protected array      $join   = [];
-    protected array      $order  = [];
-    protected int        $offset = -1;
-    protected int        $limit  = -1;
-    protected string     $group  = '';
-    protected string     $from   = '';
-    protected string     $alias  = 't1';
-    protected array      $filter = [];
-    protected bool       $lock   = false;
+	public array         $where  = [] {
+		&get {
+			return $this->where;
+		}
+	}
+	public array         $select = ['t1.*'] {
+		&get {
+			return $this->select;
+		}
+	}
+	public array         $join   = [] {
+		&get {
+			return $this->join;
+		}
+	}
+	public array         $order  = [] {
+		&get {
+			return $this->order;
+		}
+	}
+	public int           $offset = -1 {
+		get {
+			return $this->offset;
+		}
+		set {
+			$this->offset = $value;
+		}
+	}
+	public int           $limit  = -1 {
+		get {
+			return $this->limit;
+		}
+		set {
+			$this->limit = $value;
+		}
+	}
+	public string        $group  = '' {
+		get {
+			return $this->group;
+		}
+		set {
+			$this->group = $value;
+		}
+	}
+	public string        $from   = '' {
+		get {
+			return $this->from;
+		}
+		set {
+			$this->from = $value;
+		}
+	}
+	public string        $alias  = '' {
+		get {
+			return $this->alias;
+		}
+		set {
+			$this->alias = $value;
+		}
+	}
+	protected array      $filter = [] {
+		&get {
+			return $this->filter;
+		}
+	}
+	protected bool       $lock   = FALSE;
 	protected SqlBuilder $builder;
-    protected array      $params = [];
-    protected array      $_alias = ['t1'];
+	public array         $params = [] {
+		&get {
+			return $this->params;
+		}
+	}
+	protected array      $_alias = [] {
+		&get {
+			return $this->_alias;
+		}
+	}
 
 
 	/**
 	 * @var ModelInterface|string|null
 	 */
-    protected ModelInterface|string|null $modelClass;
+	protected ModelInterface|string|null $modelClass {
+		get {
+			return $this->modelClass;
+		}
+	}
+
+
+	public function __get(string $name)
+	{
+		if (property_exists($this, $name)) {
+			return $this->$name;
+		}
+		if (method_exists($this, $name)) {
+			return $this->$name();
+		}
+		return parent::__get($name); // TODO: Change the autogenerated stub
+	}
 
 
 	/**
 	 * Comply constructor.
 	 * @throws
 	 */
-    public function __construct($model = null)
+	public function __construct($model = NULL)
 	{
 		if (!is_null($model)) {
 			$this->modelClass = $model;
@@ -64,197 +143,63 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 
 
 	/**
-     * @param array $where
-     * @return void
+	 * @param Closure|Query $callback
+	 * @param array         $attributes
+	 *
+	 * @return $this
 	 */
-    public function setWhere(array $where): void
+	public function whereNotExists(Closure|Query $callback, array $attributes = []): static
 	{
-        $this->where = $where;
+		if ($callback instanceof Query) {
+			$this->where[] = 'NOT EXISTS(' . $callback->build() . ')';
+			$this->mergeParams($callback->params);
+		} else {
+			$this->where[] = 'NOT EXISTS(' . $this->makeClosureFunction($callback) . ')';
+		}
+		if (count($attributes) > 0) {
+			$this->bindParams($attributes);
+		}
+		return $this;
 	}
 
 
 	/**
-     * @param array $select
-     * @return void
+	 * @param Closure|Query $callback
+	 * @param array         $attributes
+	 *
+	 * @return $this
 	 */
-    public function setSelect(array $select): void
+	public function whereExists(Closure|Query $callback, array $attributes = []): static
 	{
-        $this->select = $select;
+		if ($callback instanceof Query) {
+			$this->where[] = 'EXISTS(' . $callback->build() . ')';
+			$this->mergeParams($callback->params);
+		} else {
+			$this->where[] = 'EXISTS(' . $this->makeClosureFunction($callback) . ')';
+		}
+		if (count($attributes) > 0) {
+			$this->bindParams($attributes);
+		}
+		return $this;
 	}
 
 
-    /**
-     * @param array $join
-     * @return void
-     */
-    public function setJoin(array $join): void
-    {
-        $this->join = $join;
-    }
-
-
-    /**
-     * @param array $order
-     * @return void
-     */
-    public function setOrder(array $order): void
-    {
-        $this->order = $order;
-    }
-
-
-    /**
-     * @param int $offset
-     * @return void
-     */
-    public function setOffset(int $offset): void
-    {
-        $this->offset = $offset;
-    }
-
-
-    /**
-     * @param int $limit
-     * @return void
-     */
-    public function setLimit(int $limit): void
-    {
-        $this->limit = $limit;
-    }
-
-
-    /**
-     * @param string $group
-     * @return void
-     */
-    public function setGroup(string $group): void
-    {
-        $this->group = $group;
-    }
-
-
-    /**
-     * @param string $from
-     * @return void
-     */
-    public function setFrom(string $from): void
-    {
-        $this->from = $from;
-    }
-
-
-    /**
-     * @param string $alias
-     * @return void
-     */
-    public function setAlias(string $alias): void
-    {
-        $this->alias = $alias;
-    }
-
 	/**
 	 * @param array $params
 	 * @return void
 	 */
-    public function setParams(array $params): void
+	public function mergeParams(array $params): void
 	{
-        $this->params = $params;
+		foreach ($params as $key => $value) {
+			$this->pushParam($value);
 		}
-
-
-    /**
-     * @return array
-     */
-    public function getWhere(): array
-    {
-        return $this->where;
-    }
-
-
-    /**
-     * @return array|string[]
-     */
-    public function getSelect(): array
-    {
-        return $this->select;
-    }
-
-
-    /**
-     * @return array
-     */
-    public function getJoin(): array
-    {
-        return $this->join;
-    }
-
-
-    /**
-     * @return array
-     */
-    public function getOrder(): array
-    {
-        return $this->order;
-    }
-
-
-    /**
-     * @return int
-     */
-    public function getOffset(): int
-    {
-        return $this->offset;
-    }
-
-
-    /**
-     * @return int
-     */
-    public function getLimit(): int
-    {
-        return $this->limit;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function getGroup(): string
-    {
-        return $this->group;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function getFrom(): string
-    {
-        return $this->from;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function getAlias(): string
-    {
-        return $this->alias;
-    }
-
-
-    /**
-     * @return array
-     */
-    public function getParams(): array
-    {
-        return $this->params;
 	}
 
 
 	/**
 	 * @param string   $column
 	 * @param callable $callable
+	 *
 	 * @return $this
 	 */
 	public function when(string $column, callable $callable): static
@@ -271,6 +216,7 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 
 	/**
 	 * @param bool $lock
+	 *
 	 * @return $this
 	 */
 	public function lock(bool $lock): static
@@ -282,6 +228,7 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 
 	/**
 	 * @param string $whereRaw
+	 *
 	 * @return QueryTrait
 	 */
 	public function whereRaw(string $whereRaw): static
@@ -307,6 +254,7 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 	/**
 	 * @param string $column
 	 * @param string $value
+	 *
 	 * @return $this
 	 */
 	public function whereLocate(string $column, string $value): static
@@ -318,6 +266,7 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 
 	/**
 	 * @param string $column
+	 *
 	 * @return $this
 	 */
 	public function whereNull(string $column): static
@@ -329,6 +278,7 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 
 	/**
 	 * @param string $column
+	 *
 	 * @return $this
 	 */
 	public function whereEmpty(string $column): static
@@ -340,6 +290,7 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 
 	/**
 	 * @param string $column
+	 *
 	 * @return $this
 	 */
 	public function whereNotEmpty(string $column): static
@@ -351,6 +302,7 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 
 	/**
 	 * @param string $column
+	 *
 	 * @return $this
 	 */
 	public function whereNotNull(string $column): static
@@ -376,16 +328,22 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 
 
 	/**
-     * @param string|Closure $tableName
+	 * @param string|Closure|Query $tableName
 	 *
 	 * @return $this
 	 */
-    public function from(string|Closure $tableName): static
+	public function from(string|Closure|Query $tableName): static
 	{
-        if ($tableName instanceof Closure) {
-            $tableName = call_user_func($tableName, $this->queryInstance());
-        }
+		if ($tableName instanceof Query) {
+			$this->from = '(' . $tableName->build() . ')';
+			$this->mergeParams($tableName->params);
+		} else if ($tableName instanceof Closure) {
+			$this->from = '(' . $this->makeClosureFunction($tableName) . ')';
+		} else if (class_exists($tableName)) {
+			$this->from = (new $tableName)->getTable();
+		} else {
 			$this->from = $tableName;
+		}
 		return $this;
 	}
 
@@ -395,6 +353,7 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 	 * @param string $alias
 	 * @param array  $on
 	 * @param array  $param
+	 *
 	 * @return $this
 	 * $query->join([$tableName, ['userId'=>'uuvOd']], $param)
 	 * $query->join([$tableName, ['userId'=>'uuvOd'], $param])
@@ -425,6 +384,7 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 
 	/**
 	 * @param array $params
+	 *
 	 * @return void
 	 */
 	public function bindParams(array $params): void
@@ -437,6 +397,7 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 
 	/**
 	 * @param array $condition
+	 *
 	 * @return string
 	 */
 	private function onCondition(array $condition): string
@@ -456,16 +417,17 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 
 	/**
 	 * @param string $value
+	 *
 	 * @return bool
 	 */
 	private function isAliasField(string $value): bool
 	{
 		foreach ($this->_alias as $alias) {
 			if (str_starts_with($value, $alias . '.')) {
-                return true;
+				return TRUE;
 			}
 		}
-        return false;
+		return FALSE;
 	}
 
 
@@ -474,6 +436,7 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 	 * @param string $alias
 	 * @param array  $onCondition
 	 * @param array  $param
+	 *
 	 * @return $this
 	 * @throws Exception
 	 */
@@ -495,6 +458,7 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 	 * @param string $alias
 	 * @param array  $onCondition
 	 * @param array  $param
+	 *
 	 * @return $this
 	 * @throws Exception
 	 */
@@ -516,6 +480,7 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 	 * @param string $alias
 	 * @param array  $onCondition
 	 * @param array  $param
+	 *
 	 * @return $this
 	 * @throws Exception
 	 */
@@ -546,6 +511,7 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 
 	/**
 	 * @param string $field
+	 *
 	 * @return $this
 	 */
 	public function max(string $field): static
@@ -643,10 +609,11 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 	 * @param array|Closure|string $conditionArray
 	 * @param string               $opera
 	 * @param null                 $value
+	 *
 	 * @return QueryTrait
 	 * @throws
 	 */
-    public function whereOr(array|Closure|string $conditionArray = [], string $opera = '=', $value = null): static
+	public function whereOr(array|Closure|string $conditionArray = [], string $opera = '=', $value = NULL): static
 	{
 		if ($conditionArray instanceof Closure) {
 			$conditionArray = $this->makeClosureFunction($conditionArray);
@@ -666,6 +633,7 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 	/**
 	 * @param string $column
 	 * @param string $value
+	 *
 	 * @return $this
 	 */
 	public function whereLike(string $column, string $value): static
@@ -679,6 +647,7 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 	/**
 	 * @param string $column
 	 * @param string $value
+	 *
 	 * @return $this
 	 */
 	public function whereLeftLike(string $column, string $value): static
@@ -692,6 +661,7 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 	/**
 	 * @param string $column
 	 * @param string $value
+	 *
 	 * @return $this
 	 */
 	public function whereRightLike(string $column, string $value): static
@@ -705,6 +675,7 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 	/**
 	 * @param string $column
 	 * @param string $value
+	 *
 	 * @return $this
 	 */
 	public function whereNotLike(string $column, string $value): static
@@ -717,19 +688,24 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 
 	/**
 	 * @param string              $columns
-     * @param array|Closure $value
+	 * @param array|Closure|Query $value
+	 *
 	 * @return $this
-     * @throws
+	 * @throws Exception
 	 */
-    public function whereIn(string $columns, array|Closure $value): static
+	public function whereIn(string $columns, array|Closure|Query $value): static
 	{
-        if ($value instanceof Closure) {
-            $value = $this->makeClosureFunction($value);
-        }
-        if (count($value) < 1) {
-            $value = [-1];
-        }
+		if (is_array($value)) {
+			if (count($value) < 1)
+				throw new Exception('Value must be an not empty array');
+
 			$this->where[] = $columns . ' IN (' . implode(',', $value) . ')';
+		} else if ($value instanceof Query) {
+			$this->where[] = $columns . ' IN (' . $value->build() . ')';
+			$this->mergeParams($value->params);
+		} else {
+			$this->where[] = $columns . ' IN (' . $this->makeClosureFunction($value) . ')';
+		}
 		return $this;
 	}
 
@@ -740,13 +716,14 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 	 */
 	public function queryInstance(): Query
 	{
-        return new Query();
+		return new Query;
 	}
 
 
 	/**
 	 * @param string $columns
 	 * @param array  $value
+	 *
 	 * @return $this
 	 */
 	public function whereNotIn(string $columns, array $value): static
@@ -763,6 +740,7 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 	 * @param string    $column
 	 * @param int|float $start
 	 * @param int|float $end
+	 *
 	 * @return $this
 	 */
 	public function whereBetween(string $column, int|float $start, int|float $end): static
@@ -783,6 +761,7 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 	 * @param string    $column
 	 * @param int|float $start
 	 * @param int|float $end
+	 *
 	 * @return $this
 	 */
 	public function whereNotBetween(string $column, int|float $start, int|float $end): static
@@ -801,6 +780,7 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 
 	/**
 	 * @param mixed $value
+	 *
 	 * @return $this
 	 */
 	public function pushParam(mixed $value): static
@@ -813,9 +793,10 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 	/**
 	 * @param array|string $column
 	 * @param mixed        $value
+	 *
 	 * @return $this
 	 */
-    public function where(array|string $column, mixed $value = null): static
+	public function where(array|string $column, mixed $value = NULL): static
 	{
 		if (func_num_args() === 2) {
 			return $this->addArray([$column => $value]);
@@ -832,6 +813,7 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 	 * @param string $column
 	 * @param string $opera
 	 * @param mixed  $value
+	 *
 	 * @return $this
 	 */
 	public function whereMath(string $column, string $opera, mixed $value): static
@@ -844,6 +826,7 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 
 	/**
 	 * @param Closure $closure
+	 *
 	 * @return $this
 	 */
 	public function whereClosure(Closure $closure): static
@@ -855,6 +838,7 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 
 	/**
 	 * @param Closure|array $closure
+	 *
 	 * @return string
 	 * @throws
 	 */
@@ -866,6 +850,7 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 		} else {
 			$generate->addArray($closure);
 		}
+		$this->mergeParams($generate->params);
 		return $generate->build();
 	}
 
@@ -876,7 +861,7 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 	 *
 	 * @return $this
 	 */
-    public function groupBy(string $name, string $having = NULL): static
+	public function groupBy(string $name, ?string $having = NULL): static
 	{
 		$this->group = $name;
 		if (empty($having)) {
@@ -901,6 +886,7 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 
 	/**
 	 * @param int $offset
+	 *
 	 * @return $this
 	 */
 	public function offset(int $offset): static
@@ -929,12 +915,13 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 
 	/**
 	 * @param array $array
+	 *
 	 * @return $this
 	 */
 	private function addArray(array $array): static
 	{
 		foreach ($array as $key => $value) {
-            if ($value === null) {
+			if ($value === NULL) {
 				continue;
 			}
 			$this->where[] = is_numeric($key) ? $value : $this->sprintf($key, $value);
@@ -947,10 +934,21 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 	 * @param string $column
 	 * @param mixed  $value
 	 * @param string $opera
+	 *
 	 * @return string
 	 */
 	private function sprintf(string $column, mixed $value, string $opera = '='): string
 	{
+		if (!is_numeric($value)) {
+			if (str_contains($column, '.')) {
+				[$alias, $field] = explode('.', $value);
+			} else {
+				$alias = '';
+			}
+			if (in_array($alias, $this->_alias)) {
+				return $column . ' ' . $opera . ' ' . $value;
+			}
+		}
 		$this->pushParam($value);
 		return $column . ' ' . $opera . ' ?';
 	}
@@ -959,6 +957,7 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 	/**
 	 * @param string $querySql
 	 * @param array  $params
+	 *
 	 * @return Command
 	 */
 	public function buildCommand(string $querySql, array $params = []): Command

Traits/When.php

@@ -21,9 +21,27 @@ class When
 	public ActiveQuery|ISqlBuilder $query;
 
 
-    private array $_condition = [];
+	/**
+	 * @var array
+	 */
+	private array $_condition = [] {
+		&get {
+			return $this->_condition;
+		}
+	}
 
-    private string $else = '';
+
+	/**
+	 * @var string
+	 */
+	private string $else = '' {
+		get {
+			return $this->else;
+		}
+		set(string $value) {
+			$this->else = $value;
+		}
+	}
 
 
 	/**
@@ -63,7 +81,8 @@ class When
 	/**
 	 * @return string
 	 */
-    #[Pure] public function end(): string
+	#[Pure]
+	public function end(): string
 	{
 		if (empty($this->_condition)) {
 			return '';

composer.json

@@ -9,10 +9,10 @@
   ],
   "license": "MIT",
   "require": {
-    "php": ">=8.3",
+    "php": ">=8.5",
     "ext-json": "*",
     "ext-pdo": "*",
-    "game-worker/kiri-pool": "~v1.0"
+    "game-worker/kiri-pool": "^v1.0"
   },
   "autoload": {
     "psr-4": {

test.php

@@ -0,0 +1,23 @@
+<?php
+
+
+use Database\Query;
+
+class Users extends \Database\Model
+{
+
+
+	public function hasD()
+	{
+		return $this->hasOne(static::class, 'id', 'id')->with([]);
+	}
+}
+
+Users::query()
+	->select(['*', (new Query(Users::class))
+		->where(['id' => 2])])
+	->from(function (Query $query) {
+		$query->from(Users::class)
+			->where(['id' => 1])
+			->groupBy('name DESC');
+	})->toSql();