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

@@ -288,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

@@ -30,6 +30,14 @@ use ReturnTypeWillChange;
 use ReflectionException;
 use validator\Validator;
 
+
+enum Driver
+{
+	case Mysql;
+	case Pgsql;
+}
+
+
 /**
  * Class BOrm
  *
@@ -291,7 +299,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
 	 */
 	protected static function instance(): static
 	{
-        return new static();
+		return new static;
 	}
 
 
@@ -567,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;
 		}
@@ -582,7 +590,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
 	 */
 	private function resolve(array $rule): Validator
 	{
-        $validate = new Validator();
+		$validate = new Validator;
 		foreach ($rule as $val) {
 			$field = array_shift($val);
 			if (is_string($field)) {
@@ -644,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;
 	}
 
@@ -713,12 +728,20 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
 	 */
 	public function __get(string $name): mixed
 	{
-        $value = $this->_attributes[$name] ?? NULL;
-        if (!method_exists($this, 'get' . ucfirst($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)}();
 	}
 
 
@@ -853,7 +876,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
 	 */
 	public static function populate(array $data): static
 	{
-        $model                 = new static();
+		$model                 = new static;
 		$model->_attributes    = $data;
 		$model->_oldAttributes = $data;
 		$model->setIsNowExample();
@@ -869,7 +892,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
 	 */
 	public static function __callStatic(string $name, array $arguments)
 	{
-        return (new static())->{$name}(...$arguments);
+		return (new static)->{$name}(...$arguments);
 	}
 
 

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];
@@ -134,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;
     }
 
 
@@ -263,6 +264,7 @@ class Connection extends Component
                 $pdo->rollback();
             }
             $this->release($pdo);
+            Context::remove($this->cds);
         }
     }
 
@@ -282,6 +284,7 @@ class Connection extends Component
                 $pdo->commit();
             }
             $this->release($pdo);
+            Context::remove($this->cds);
         }
     }
 
@@ -301,6 +304,8 @@ class Connection extends Component
             $pdo->rollback();
         }
         $this->release($pdo);
+        Context::remove($this->cds);
+        $this->storey = 0;
     }
 
 
@@ -312,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);
     }
 
 
@@ -356,15 +361,22 @@ class Connection extends Component
      */
     public function newConnect(): \PDO
     {
-        $pdo = new PDO($this->database, $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'] ?? [],

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
@@ -282,6 +285,7 @@ class Model extends Base\Model
 
         $primaryKey = str_replace('\\', '_', $modelName) . '_' . $foreignKey . '_' . $value;
         if (!$relation->hasIdentification($primaryKey)) {
+	        /** @var $modelName ModelInterface */
             $relation->bindIdentification($primaryKey, $modelName::query()->where([$foreignKey => $value]));
         }
         return $primaryKey;
@@ -343,6 +347,7 @@ class Model extends Base\Model
 
         $primaryKey = str_replace('\\', '_', $modelName) . '_' . $foreignKey . '_' . implode('_', $value);
         if (!$relation->hasIdentification($primaryKey)) {
+			/** @var $modelName ModelInterface */
             $relation->bindIdentification($primaryKey, $modelName::query()->whereIn($foreignKey, $value));
         }
 

SqlBuilder.php

@@ -9,6 +9,7 @@ namespace Database;
 use JetBrains\PhpStorm\Pure;
 use Kiri;
 use Kiri\Abstracts\Component;
+use Database\Traits\QueryTrait;
 
 
 /**
@@ -52,7 +53,7 @@ class SqlBuilder extends Component
 	 */
 	public function getCondition(): string
 	{
-        return $this->where($this->query->getWhere());
+		return $this->where($this->query->where);
 	}
 
 
@@ -74,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);
 	}
 
 
@@ -108,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();
 	}
 
 
@@ -122,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];
 		}
@@ -144,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();
 	}
 
 
@@ -152,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));
 	}
@@ -207,7 +212,7 @@ class SqlBuilder extends Component
 	public function one(): string
 	{
 		$this->query->offset(0)->limit(1);
-        return $this->makeSelect($this->query->getSelect()) . $this->make() . $this->makeLimit();
+		return $this->all();
 	}
 
 
@@ -217,7 +222,7 @@ class SqlBuilder extends Component
 	 */
 	public function all(): string
 	{
-        return $this->makeSelect($this->query->getSelect()) . $this->make() . $this->makeLimit();
+		return $this->makeSelect($this->query) . ' ' . $this->make() . ' ' . $this->makeLimit();
 	}
 
 
@@ -227,7 +232,7 @@ class SqlBuilder extends Component
 	 */
 	public function count(): string
 	{
-        return $this->makeSelect(['COUNT(*)']) . $this->make();
+		return $this->makeSelect(['COUNT(*)']) . ' ' . $this->make();
 	}
 
 
@@ -237,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;
 	}
 
@@ -257,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;
 	}
 
 
@@ -285,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 '';
 	}
@@ -297,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 '';
 	}
@@ -309,18 +326,26 @@ class SqlBuilder extends Component
 	 */
 	private function makeCondition(): string
 	{
-        $condition = $this->where($this->query->getWhere());
+		$condition = $this->where($this->query->where);
 		if (empty($condition)) {
 			return '';
 		}
-        return ' WHERE ' . $condition;
+		return 'WHERE ' . $condition;
 	}
 
 
+	/**
+	 * @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 '';
 	}
@@ -346,7 +371,7 @@ class SqlBuilder extends Component
 	 */
 	public function truncate(): string
 	{
-        return sprintf('TRUNCATE %s', $this->query->getFrom());
+		return sprintf('TRUNCATE %s', $this->getFromAlias());
 	}
 
 
@@ -399,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,8 +12,6 @@ namespace Database\Traits;
 use Database\ModelInterface;
 use Database\Collection;
 use Database\Relation;
-use Kiri;
-use Kiri\Di\Context;
 
 /**
  * Class HasBase

Traits/QueryTrait.php

@@ -27,26 +27,105 @@ use Kiri\Abstracts\Component;
  */
 abstract class QueryTrait extends Component implements ActiveQueryInterface, ISqlBuilder
 {
-    protected array      $where  = [];
-    protected array      $select = ['t1.*'];
-    protected array      $join   = [];
-    protected array      $order  = [];
-    protected int        $offset = -1;
-    protected int        $limit  = -1;
-    protected string     $group  = '';
-    protected string     $from   = '';
-    protected string     $alias  = '';
-    protected array      $filter = [];
+	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 = [];
+	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
+	}
 
 
 	/**
@@ -63,17 +142,6 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 	}
 
 
-    /**
-     * @param array $where
-     *
-     * @return void
-     */
-    public function setWhere(array $where): void
-    {
-        $this->where = $where;
-    }
-
-
 	/**
 	 * @param Closure|Query $callback
 	 * @param array         $attributes
@@ -84,7 +152,7 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 	{
 		if ($callback instanceof Query) {
 			$this->where[] = 'NOT EXISTS(' . $callback->build() . ')';
-            $this->mergeParams($callback->getParams());
+			$this->mergeParams($callback->params);
 		} else {
 			$this->where[] = 'NOT EXISTS(' . $this->makeClosureFunction($callback) . ')';
 		}
@@ -105,7 +173,7 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 	{
 		if ($callback instanceof Query) {
 			$this->where[] = 'EXISTS(' . $callback->build() . ')';
-            $this->mergeParams($callback->getParams());
+			$this->mergeParams($callback->params);
 		} else {
 			$this->where[] = 'EXISTS(' . $this->makeClosureFunction($callback) . ')';
 		}
@@ -116,194 +184,6 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 	}
 
 
-    /**
-     * @param array $select
-     *
-     * @return void
-     */
-    public function setSelect(array $select): void
-    {
-        $this->select = $select;
-    }
-
-
-    /**
-     * @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
-    {
-        $this->params = $params;
-    }
-
-
-    /**
-     * @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 array $params
 	 * @return void
@@ -456,7 +336,7 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 	{
 		if ($tableName instanceof Query) {
 			$this->from = '(' . $tableName->build() . ')';
-            $this->mergeParams($tableName->getParams());
+			$this->mergeParams($tableName->params);
 		} else if ($tableName instanceof Closure) {
 			$this->from = '(' . $this->makeClosureFunction($tableName) . ')';
 		} else if (class_exists($tableName)) {
@@ -816,12 +696,13 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 	public function whereIn(string $columns, array|Closure|Query $value): static
 	{
 		if (is_array($value)) {
-            if (count($value) < 1) throw new Exception('Value must be an not empty array');
+			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->getParams());
+			$this->mergeParams($value->params);
 		} else {
 			$this->where[] = $columns . ' IN (' . $this->makeClosureFunction($value) . ')';
 		}
@@ -835,7 +716,7 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 	 */
 	public function queryInstance(): Query
 	{
-        return new Query();
+		return new Query;
 	}
 
 
@@ -969,7 +850,7 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 		} else {
 			$generate->addArray($closure);
 		}
-        $this->mergeParams($generate->getParams());
+		$this->mergeParams($generate->params);
 		return $generate->build();
 	}
 
@@ -980,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)) {
@@ -1058,8 +939,12 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 	 */
 	private function sprintf(string $column, mixed $value, string $opera = '='): string
 	{
-        if (is_string($value)) {
+		if (!is_numeric($value)) {
+			if (str_contains($column, '.')) {
 				[$alias, $field] = explode('.', $value);
+			} else {
+				$alias = '';
+			}
 			if (in_array($alias, $this->_alias)) {
 				return $column . ' ' . $opera . ' ' . $value;
 			}

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": {