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/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,208 +23,264 @@ use Throwable;
 class Command extends Component
 {
 
-    public Connection $connection;
+	/** @var int 数据库操作最大重试次数 */
-    public ?string    $sql    = '';
+	private const MAX_RETRIES = 2;
-    public array      $params = [];
 
-    /**
+	public Connection $connection;
-     * @param array $params
+	public ?string    $sql    = '';
-     * @throws
+	public array      $params = [];
-     */
+
-    public function __construct(array $params = [])
+	/**
-    {
+	 * @param array $params
-        parent::__construct();
+	 * @throws
-        Container::configure($this, $params);
+	 */
-    }
+	public function __construct(array $params = [])
+	{
+		parent::__construct();
+		Container::configure($this, $params);
+	}
 
 
-    /**
+	/**
-     * @return bool
+	 * @return bool
-     * @throws
+	 * @throws
-     */
+	 */
-    public function incrOrDecr(): bool
+	public function incrOrDecr(): bool
-    {
+	{
-        return (bool)$this->_prepare();
+		return (bool)$this->_prepare();
-    }
+	}
 
 
-    /**
+	/**
-     * @return bool|array
+	 * @return bool|array
-     * @throws
+	 * @throws
-     */
+	 */
-    public function all(): bool|array
+	public function all(): bool|array
-    {
+	{
-        return $this->search('fetchAll');
+		return $this->search('fetchAll');
-    }
+	}
 
-    /**
+	/**
-     * @return array|bool|null
+	 * @return array|bool|null
-     * @throws
+	 * @throws
-     */
+	 */
-    public function one(): array|null|bool
+	public function one(): array|null|bool
-    {
+	{
-        return $this->search('fetch');
+		return $this->search('fetch');
-    }
+	}
 
-    /**
+	/**
-     * @return bool
+	 * @return bool
-     * @throws Exception
+	 * @throws Exception
-     */
+	 */
-    public function exists(): bool
+	public function exists(): bool
-    {
+	{
-        $data = $this->search('fetch');
+		$data = $this->search('fetch');
-        if (!$data) {
+		if (!$data) {
-            return false;
+			return false;
-        }
+		}
-        return true;
+		return true;
-    }
+	}
 
-    /**
+	/**
-     * @return mixed
+	 * @return mixed
-     * @throws
+	 * @throws
-     */
+	 */
-    public function fetchColumn(): mixed
+	public function fetchColumn(): mixed
-    {
+	{
-        return $this->search('fetchColumn');
+		return $this->search('fetchColumn');
-    }
+	}
 
-    /**
+	/**
-     * @return mixed
+	 * @return mixed
-     * @throws
+	 * @throws
-     */
+	 */
-    public function rowCount(): int
+	public function rowCount(): int
-    {
+	{
-        $data = $this->search('fetch');
+		$data = $this->search('fetch');
 
-        return !$data ? 0 : +current($data);
+		return !$data ? 0 : +current($data);
-    }
+	}
 
 
-    /**
+	/**
-     * @param string $method
+	 * 执行查询类 SQL 操作，内置断连重试机制
-     * @return mixed
+	 * 当数据库连接断开时自动重试，断开的连接不再归还池中防止污染连接池
-     * @throws
+	 * @param string $method PDO 结果获取方法名
-     */
+	 * @return mixed
-    protected function search(string $method): mixed
+	 * @throws
-    {
+	 */
-        $client = $this->connection->getConnection();
+	protected function search(string $method): mixed
-        try {
+	{
-            $startTime = microtime(true);
+		$retryCount = 0;
-            if (($prepare = $client->prepare($this->sql)) === false) {
-                throw new Exception('(' . $prepare->errorInfo()[0] . ')' . $client->errorInfo()[2]);
-            }
 
-            $prepare->execute($this->params);
+		while ($retryCount <= self::MAX_RETRIES) {
+			$client = $this->connection->getConnection();
+			try {
+				$startTime = microtime(true);
+				if (($prepare = $client->prepare($this->sql)) === false) {
+					throw new Exception('(' . $prepare->errorInfo()[0] . ')' . $client->errorInfo()[2]);
+				}
 
-            $result = $method == 'rowCount' ? $prepare->rowCount() : $prepare->{$method}(PDO::FETCH_ASSOC);
+				$prepare->execute($this->params);
-            $prepare->closeCursor();
 
-            $this->connection->println($startTime, microtime(true), $this->sql, $this->params);
+				$result = $method == 'rowCount' ? $prepare->rowCount() : $prepare->{$method}(PDO::FETCH_ASSOC);
+				$prepare->closeCursor();
 
-            return $result;
+				$this->connection->println($startTime, microtime(true), $this->sql, $this->params);
-        } catch (Throwable $throwable) {
-            if ($this->isRefresh($throwable)) return $this->search($method);
 
-            $errorMsg = $throwable->getMessage() . PHP_EOL . '                 Sql: ' . $this->sql . '.' . json_encode($this->params);
+				$this->connection->release($client);
+				return $result;
+			} catch (Throwable $throwable) {
+				$this->getLogger()->json_log($throwable);
 
-            return $this->getLogger()->failure($errorMsg . PHP_EOL, 'mysql');
+				if ($this->isRefresh($throwable) && $retryCount < self::MAX_RETRIES) {
-        } finally {
+					$retryCount++;
-            $this->connection->release($client);
+					$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()->logCategory($errorMsg . PHP_EOL, 'mysql');
+			}
+		}
+
+		return $this->getLogger()->logCategory('Max retry exceeded for SQL: ' . $this->sql, 'mysql');
+	}
 
 
-    /**
+	/**
-     * @return bool
+	 * @return bool
-     * @throws
+	 * @throws
-     */
+	 */
-    public function flush(): bool
+	public function flush(): bool
-    {
+	{
-        return (bool)$this->_prepare();
+		return (bool)$this->_prepare();
-    }
+	}
 
 
-    /**
+	/**
-     * @return int|bool
+	 * 执行写入类 SQL 操作，内置断连重试机制
-     * @throws
+	 * 当数据库连接断开时自动重试，断开的连接不再归还池中防止污染连接池
-     */
+	 * @return int|bool
-    private function _prepare(): int|bool
+	 * @throws
-    {
+	 */
-        $client = $this->connection->getConnection();
+	private function _prepare(): int|bool
-        try {
+	{
-            $startTime = microtime(true);
+		$retryCount = 0;
-            if (($prepare = $client->prepare($this->sql)) === false) {
-                throw new Exception('(' . $prepare->errorInfo()[0] . ')' . $prepare->errorInfo()[2]);
-            }
-            if ($prepare->execute($this->params) === false) {
-                throw new Exception('(' . $prepare->errorInfo()[0] . ')' . $prepare->errorInfo()[2]);
-            }
-            $prepare->closeCursor();
 
-            $result = $client->lastInsertId();
+		while ($retryCount <= self::MAX_RETRIES) {
+			$client = $this->connection->getConnection();
+			try {
+				$startTime = microtime(true);
+				if (($prepare = $client->prepare($this->sql)) === false) {
+					throw new Exception('(' . $prepare->errorInfo()[0] . ')' . $prepare->errorInfo()[2]);
+				}
+				if ($prepare->execute($this->params) === false) {
+					throw new Exception('(' . $prepare->errorInfo()[0] . ')' . $prepare->errorInfo()[2]);
+				}
 
-            $this->connection->println($startTime, microtime(true), $this->sql, $this->params);
+				$prepare->closeCursor();
 
-            return $result == 0 ? $prepare->rowCount() : (int)$result;
+				$result = $client->lastInsertId();
-        } catch (Throwable $throwable) {
-            if ($this->isRefresh($throwable)) return $this->_prepare();
 
-            $errorMsg = $throwable->getMessage() . PHP_EOL . '                 Sql: ' . $this->sql . '.' . json_encode($this->params);
+				$this->connection->println($startTime, microtime(true), $this->sql, $this->params);
+				if (str_starts_with($this->sql, 'DELETE')) {
+					$this->connection->release($client);
+					return $prepare->rowCount();
+				}
 
-            return $this->getLogger()->failure($errorMsg . PHP_EOL, 'mysql');
+				$this->connection->release($client);
-        } finally {
+				return $result == 0 ? $prepare->rowCount() : (int)$result;
-            $this->connection->release($client);
+			} catch (Throwable $throwable) {
-        }
+				$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, JSON_UNESCAPED_UNICODE);
+
+				return $this->getLogger()->logCategory($errorMsg . PHP_EOL, 'mysql');
+			}
+		}
+
+		return $this->getLogger()->logCategory('Max retry exceeded for SQL: ' . $this->sql, 'mysql');
+	}
 
 
-    /**
+	/**
-     * @param Throwable $throwable
+	 * @param Throwable $throwable
-     * @return bool
+	 * @return bool
-     */
+	 */
-    protected function isRefresh(Throwable $throwable): bool
+	protected function isRefresh(Throwable $throwable): bool
-    {
+	{
-        if (str_contains($throwable->getMessage(), 'MySQL server has gone away')) {
+		$message = $throwable->getMessage();
-            return true;
+
-        }
+		// MySQL 错误处理
-        if (str_contains($throwable->getMessage(), 'Send of 14 bytes failed with errno=32 Broken pipe')) {
+		if (str_contains($message, 'MySQL server has gone away')) {
-            return true;
+			return true;
-        }
+		}
-        if (str_contains($throwable->getMessage(), 'Lost connection to MySQL server during query')) {
+		if (str_contains($message, 'Send of 14 bytes failed with errno=32 Broken pipe')) {
-            return true;
+			return true;
-        }
+		}
-        return false;
+		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;
+	}
 
 
-    /**
+	/**
-     * @return bool
+	 * @return bool
-     * @throws
+	 * @throws
-     */
+	 */
-    public function delete(): bool
+	public function delete(): bool
-    {
+	{
-        return (bool)$this->_prepare();
+		return $this->_prepare();
-    }
+	}
 
 
-    /**
+	/**
-     * @return int|bool
+	 * @return int|bool
-     */
+	 */
-    public function exec(): int|bool
+	public function exec(): int|bool
-    {
+	{
-        return $this->_prepare();
+		return $this->_prepare();
-    }
+	}
 
-    /**
+	/**
-     * @param array $data
+	 * @param array $data
-     * @return $this
+	 * @return $this
-     */
+	 */
-    public function bindValues(array $data = []): static
+	public function bindValues(array $data = []): static
-    {
+	{
-        if (count($data) > 0) {
+		if (count($data) > 0) {
-            $this->params = array_merge($this->params, $data);
+			$this->params = array_merge($this->params, $data);
-        }
+		}
-        return $this;
+		return $this;
-    }
+	}
 
 }

Condition/Condition.php

@@ -43,10 +43,9 @@ abstract class Condition extends Component
     public function setValue($params): void
     {
         if (is_array($params)) {
-            $values = [];
+            $values = array_map(function ($value) {
-            foreach ($params as $item => $value) {
+                return is_numeric($value) ? $value : '\'' . $value . '\'';
-                $values[$item] = 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());
+//        $length = $pool->size($this->getName());
-        for ($i = 0; $i < $length; $i++) {
+//        for ($i = 0; $i < $length; $i++) {
-            try {
+//            try {
-                if (($client = $this->validator($pool)) === false) {
+//                if (($client = $this->validator($pool)) === false) {
-                    break;
+//                    break;
-                }
+//                }
-                $pool->push($this->getName(), $client);
+//                $pool->push($this->getName(), $client);
-            } catch (\Throwable $exception) {
+//            } catch (\Throwable $exception) {
-                if (!str_contains($exception->getMessage(), 'Client timeout.')) {
+//                if (!str_contains($exception->getMessage(), 'Client timeout.')) {
-                    $this->logger->error(throwable($exception), [$this->cds]);
+//                    $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);
-            \PDO::ATTR_CASE               => \PDO::CASE_NATURAL,
+        $options = [
-            \PDO::ATTR_ERRMODE            => \PDO::ERRMODE_EXCEPTION,
+            \PDO::ATTR_CASE              => \PDO::CASE_NATURAL,
-            \PDO::ATTR_ORACLE_NULLS       => \PDO::NULL_NATURAL,
+            \PDO::ATTR_ERRMODE           => \PDO::ERRMODE_EXCEPTION,
-            \PDO::ATTR_STRINGIFY_FETCHES  => false,
+            \PDO::ATTR_ORACLE_NULLS      => \PDO::NULL_NATURAL,
-            \PDO::ATTR_EMULATE_PREPARES   => true,
+            \PDO::ATTR_STRINGIFY_FETCHES => false,
-            \PDO::ATTR_TIMEOUT            => $this->timeout,
+            \PDO::ATTR_EMULATE_PREPARES  => true,
-            \PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES ' . $this->charset
+            \PDO::ATTR_TIMEOUT           => $this->timeout,
-        ]);
+        ];
+        
+        // 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));
         }
     }
 
@@ -63,23 +63,25 @@ class DatabasesProviders extends Providers
     }
 
 
-    /**
+	/**
-     * @param array $database
+	 * @param string $key
-     * @return array
+	 * @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) {
-            $connection->rollback();
+			$model->getLogger()->json_log($throwable);
-            return \Kiri::getLogger()->failure($throwable);
+			$connection->rollback();
+            return false;
         }
     }
 
@@ -145,8 +146,9 @@ class Model extends Base\Model
             $connection->commit();
             return $select;
         } catch (\Throwable $throwable) {
-            $connection->rollback();
+			$model->getLogger()->json_log($throwable);
-            return \Kiri::getLogger()->failure($throwable);
+			$connection->rollback();
+			return false;
         }
     }
 
@@ -206,9 +208,10 @@ 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 static::query()->insert($data);
+		}
     }
 
     /**
@@ -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;
 
 
 /**
@@ -18,386 +19,453 @@ use Kiri\Abstracts\Component;
 class SqlBuilder extends Component
 {
 
-    /**
+	/**
-     * @var ActiveQuery|Query|ISqlBuilder|null
+	 * @var ActiveQuery|Query|ISqlBuilder|null
-     */
+	 */
-    public ActiveQuery|Query|ISqlBuilder|null $query;
+	public ActiveQuery|Query|ISqlBuilder|null $query;
 
 
-    /**
+	/**
-     * @param ActiveQuery|Query|ISqlBuilder|null $config
+	 * @param ActiveQuery|Query|ISqlBuilder|null $config
-     */
+	 */
-    public function __construct(ActiveQuery|Query|null|ISqlBuilder $config)
+	public function __construct(ActiveQuery|Query|null|ISqlBuilder $config)
-    {
+	{
-        parent::__construct();
+		parent::__construct();
 
-        $this->query = $config;
+		$this->query = $config;
-    }
+	}
 
 
-    /**
+	/**
-     * @param ISqlBuilder|null $query
+	 * @param ISqlBuilder|null $query
-     * @return $this
+	 * @return $this
-     * @throws
+	 * @throws
-     */
+	 */
-    public static function builder(ISqlBuilder|null $query): static
+	public static function builder(ISqlBuilder|null $query): static
-    {
+	{
-        return new static($query);
+		return new static($query);
-    }
+	}
 
 
-    /**
+	/**
-     * @return string
+	 * @return string
-     * @throws
+	 * @throws
-     */
+	 */
-    public function getCondition(): string
+	public function getCondition(): string
-    {
+	{
-        return $this->where($this->query->getWhere());
+		return $this->where($this->query->where);
-    }
+	}
 
 
-    /**
+	/**
-     * @param array $compiler
+	 * @param array $compiler
-     * @return string
+	 * @return string
-     * @throws
+	 * @throws
-     */
+	 */
-    public function hashCompiler(array $compiler): string
+	public function hashCompiler(array $compiler): string
-    {
+	{
-        return $this->where($compiler);
+		return $this->where($compiler);
-    }
+	}
 
 
-    /**
+	/**
-     * @param array $attributes
+	 * @param array $attributes
-     * @return bool|array
+	 * @return bool|array
-     * @throws
+	 * @throws
-     */
+	 */
-    public function update(array $attributes): bool|string
+	public function update(array $attributes): bool|string
-    {
+	{
-        $conditions = $this->query->getParams();
+		$params              = $this->query->params;
-        $this->query->setParams([]);
+		$this->query->params = [];
-        $data = $this->__updateBuilder($this->makeParams($attributes));
+		$array               = $this->makeParams($attributes);
-        foreach ($conditions as $condition) {
+		foreach ($params as $name => $value) {
-            $this->query->pushParam($condition);
+			$this->query->pushParam($value);
-        }
+		}
-        return $data;
+		return $this->__updateBuilder($array);
-    }
+	}
 
 
-    /**
+	/**
-     * @param array $attributes
+	 * @param array  $attributes
-     * @param string $opera
+	 * @param string $opera
-     * @return bool|array
+	 * @return bool|array
-     * @throws
+	 * @throws
-     */
+	 */
-    public function mathematics(array $attributes, string $opera = '+'): bool|string
+	public function mathematics(array $attributes, string $opera = '+'): bool|string
-    {
+	{
-        $string = [];
+		$string = [];
-        foreach ($attributes as $attribute => $value) {
+		foreach ($attributes as $attribute => $value) {
-            $string[] = $attribute . '=' . $attribute . $opera . $value;
+			$string[] = $attribute . '=' . $attribute . $opera . $value;
-        }
+		}
-        return $this->__updateBuilder($string);
+		return $this->__updateBuilder($string);
-    }
+	}
 
 
-    /**
+	/**
-     * @param array $string
+	 * @param array $string
-     * @return string|bool
+	 * @return string|bool
-     * @throws
+	 * @throws
-     */
+	 */
-    private function __updateBuilder(array $string): string|bool
+	private function __updateBuilder(array $string): string|bool
-    {
+	{
-        if (empty($string)) {
+		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();
+	}
 
 
-    /**
+	/**
-     * @param array $attributes
+	 * @param array $attributes
-     * @param false $isBatch
+	 * @param false $isBatch
-     * @return array
+	 * @return array
-     * @throws
+	 * @throws
-     */
+	 */
-    public function insert(array $attributes, bool $isBatch = false): string
+	public function insert(array $attributes, bool $isBatch = false): string
-    {
+	{
-        $update = 'INSERT INTO ' . $this->query->getFrom();
+		$update = 'INSERT INTO ' . $this->getFromAlias();
-        if ($isBatch === false) {
+		if ($isBatch === false) {
-            $attributes = [$attributes];
+			$attributes = [$attributes];
-        }
+		}
-        $update .= '(' . implode(',', $this->getFields($attributes)) . ') VALUES ';
+		$update .= '(' . implode(',', $this->getFields($attributes)) . ') VALUES ';
 
-        $keys = [];
+		$keys = [];
-        foreach ($attributes as $attribute) {
+		foreach ($attributes as $attribute) {
-            $_keys = $this->makeParams($attribute, true);
+			$_keys = $this->makeParams($attribute, true);
 
-            $keys[] = implode(',', $_keys);
+			$keys[] = implode(',', $_keys);
-        }
+		}
-        return $update . '(' . implode('),(', $keys) . ')';
+		return $update . '(' . implode('),(', $keys) . ')';
-    }
+	}
 
 
-    /**
+	/**
-     * @return string
+	 * @return string
-     * @throws
+	 * @throws
-     */
+	 */
-    public function delete(): string
+	public function delete(): string
-    {
+	{
-        return 'DELETE FROM ' . $this->query->getFrom() . $this->make();
+		return 'DELETE FROM ' .
-    }
+			$this->getFromAlias() . ' ' .
+			$this->make();
+	}
 
 
-    /**
+	/**
-     * @param $attributes
+	 * @param $attributes
-     * @return array
+	 * @return array
-     */
+	 */
-    #[Pure] private function getFields(array $attributes): array
+	#[Pure]
-    {
+	private function getFields(array $attributes): array
-        return array_keys(current($attributes));
+	{
-    }
+		return array_keys(current($attributes));
+	}
 
 
-    /**
+	/**
-     * @param array $attributes
+	 * @param array $attributes
-     * @param bool $isInsert
+	 * @param bool  $isInsert
-     * @return array[]
+	 * @return array[]
-     * a=:b,
+	 * a=:b,
-     */
+	 */
-    private function makeParams(array $attributes, bool $isInsert = false): array
+	private function makeParams(array $attributes, bool $isInsert = false): array
-    {
+	{
-        $keys = [];
+		$keys = [];
-        foreach ($attributes as $key => $value) {
+		foreach ($attributes as $key => $value) {
-            if ($isInsert === true) {
+			if ($isInsert === true) {
-                $keys[] = '?';
+				$keys[] = '?';
-                $this->query->pushParam($value);
+				$this->query->pushParam($value);
-            } else {
+			} else {
-                $keys = $this->resolveParams($key, $value, $keys);
+				$keys = $this->resolveParams($key, $value, $keys);
-            }
+			}
-        }
+		}
-        return $keys;
+		return $keys;
-    }
+	}
 
 
-    /**
+	/**
-     * @param string $key
+	 * @param string $key
-     * @param mixed $value
+	 * @param mixed  $value
-     * @param array $keys
+	 * @param array  $keys
-     * @return array
+	 * @return array
-     */
+	 */
-    private function resolveParams(string $key, mixed $value, array $keys): array
+	private function resolveParams(string $key, mixed $value, array $keys): array
-    {
+	{
-        if (is_null($value)) {
+		if (is_null($value)) {
-            return $keys;
+			return $keys;
-        }
+		}
-        if (preg_match('/^[+|-]\s\d+$/', (string)$value)) {
+		if (preg_match('/^[+|-]\s\d+$/', (string)$value)) {
-            $keys[] = $key . '=' . $key . ' ' . $value;
+			$keys[] = $key . '=' . $key . ' ' . $value;
-        } else {
+		} else {
-            $this->query->pushParam($value);
+			$this->query->pushParam($value);
-            $keys[] = $key . '= ?';
+			$keys[] = $key . '= ?';
-        }
+		}
-        return $keys;
+		return $keys;
-    }
+	}
 
 
-    /**
+	/**
-     * @return string
+	 * @return string
-     * @throws
+	 * @throws
-     */
+	 */
-    public function one(): string
+	public function one(): string
-    {
+	{
-        $this->query->offset(0)->limit(1);
+		$this->query->offset(0)->limit(1);
-        return $this->makeSelect($this->query->getSelect()) . $this->make() . $this->makeLimit();
+		return $this->all();
-    }
+	}
 
 
-    /**
+	/**
-     * @return string
+	 * @return string
-     * @throws
+	 * @throws
-     */
+	 */
-    public function all(): string
+	public function all(): string
-    {
+	{
-        return $this->makeSelect($this->query->getSelect()) . $this->make() . $this->makeLimit();
+		return $this->makeSelect($this->query) . ' ' . $this->make() . ' ' . $this->makeLimit();
-    }
+	}
 
 
-    /**
+	/**
-     * @return string
+	 * @return string
-     * @throws
+	 * @throws
-     */
+	 */
-    public function count(): string
+	public function count(): string
-    {
+	{
-        return $this->makeSelect(['COUNT(*)']) . $this->make();
+		return $this->makeSelect(['COUNT(*)']) . ' ' . $this->make();
-    }
+	}
 
 
-    /**
+	/**
-     * @return string
+	 * @return string
-     * @throws
+	 * @throws
-     */
+	 */
-    public function exists(): string
+	public function exists(): string
-    {
+	{
-        return $this->makeSelect(['0']) . $this->make();
+		return $this->makeSelect(['0']) . ' ' . $this->make();
-    }
+	}
 
 
-    /**
+	/**
-     * @param string $table
+	 * @param string $table
-     * @return string
+	 * @return string
-     */
+	 * @throws
-    public function columns(string $table): string
+	 */
-    {
+	public function columns(string $table): string
-        return 'SHOW FULL FIELDS FROM ' . $table;
+	{
-    }
+		$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;
+	}
 
 
-    /**
+	/**
-     * @return string
+	 * @return string
-     * @throws
+	 * @throws
-     */
+	 */
-    private function make(): string
+	private function make(): string
-    {
+	{
-        $select = $this->makeCondition();
+		return $this->makeCondition() . ' ' . $this->makeGroup() . ' ' . $this->makeOrder();
-        $select .= $this->makeGroup();
+	}
-        $select .= $this->makeOrder();
-        return $select;
-    }
 
-    /**
+	/**
-     * @param array $select
+	 * @param mixed $select 列名数组或 QueryTrait 对象
-     * @return string
+	 * @return string
-     */
+	 */
-    private function makeSelect(array $select = ['*']): string
+	private function makeSelect(mixed $select = ['*']): string
-    {
+	{
-        $select = "SELECT " . implode(',', $select) . " FROM " . $this->query->getFrom();
+		if (!is_array($select)) {
-        if ($this->query->getAlias() != "") {
+			$select = ['*'];
-            $select .= " AS " . $this->query->getAlias();
+		}
-        }
+		$sql = 'SELECT ' . implode(',', $select) . ' FROM ' . $this->getFromAlias();
-        if (count($this->query->getJoin()) > 0) {
+		if ($this->query->join !== []) {
-            $select .= ' ' . implode(' ', $this->query->getJoin());
+			$sql .= ' ' . implode(' ', $this->query->join);
-        }
+		}
-        return $select;
+		return $sql;
-    }
+	}
 
 
-    /**
+	/**
-     * @return string
+	 * @return string
-     */
+	 */
-    private function makeGroup(): string
+	private function makeGroup(): string
-    {
+	{
-        if ($this->query->getGroup() != "") {
+		if ($this->query->group !== '' && $this->query->group !== '0') {
-            return ' GROUP BY ' . $this->query->getGroup();
+			return 'GROUP BY ' . $this->query->group;
-        }
+		}
-        return '';
+		return '';
-    }
+	}
 
 
-    /**
+	/**
-     * @return string
+	 * @return string
-     */
+	 */
-    private function makeOrder(): string
+	private function makeOrder(): string
-    {
+	{
-        if (count($this->query->getOrder()) > 0) {
+		if (count($this->query->order) > 0) {
-            return ' ORDER BY ' . implode(',', $this->query->getOrder());
+			return 'ORDER BY ' . implode(',', $this->query->order);
-        }
+		}
-        return '';
+		return '';
-    }
+	}
 
 
-    /**
+	/**
-     * @return string
+	 * @return string
-     */
+	 */
-    private function makeCondition(): string
+	private function makeCondition(): string
-    {
+	{
-        $condition = $this->where($this->query->getWhere());
+		$condition = $this->where($this->query->where);
-        if (empty($condition)) {
+		if (empty($condition)) {
-            return '';
+			return '';
-        }
+		}
-        return ' WHERE ' . $condition;
+		return 'WHERE ' . $condition;
-    }
+	}
 
 
-    private function makeLimit(): string
+	/**
-    {
+	 * @return string
-        if ($this->query->getOffset() >= 0 && $this->query->getLimit() >= 1) {
+	 * @throws
-            return ' LIMIT ' . $this->query->getOffset() . ',' . $this->query->getLimit();
+	 */
-        }
+	private function makeLimit(): string
-        return '';
+	{
-    }
+		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 '';
+	}
 
 
-    /**
+	/**
-     * @param false $isCount
+	 * @param false $isCount
-     * @return string
+	 * @return string
-     * @throws
+	 * @throws
-     */
+	 */
-    public function get(bool $isCount = false): string
+	public function get(bool $isCount = false): string
-    {
+	{
-        if ($isCount === false) {
+		if ($isCount === false) {
-            return $this->all();
+			return $this->all();
-        }
+		}
-        return $this->count();
+		return $this->count();
-    }
+	}
 
 
-    /**
+	/**
-     * @return string
+	 * @return string
-     * @throws
+	 * @throws
-     */
+	 */
-    public function truncate(): string
+	public function truncate(): string
-    {
+	{
-        return sprintf('TRUNCATE %s', $this->query->getFrom());
+		return sprintf('TRUNCATE %s', $this->getFromAlias());
-    }
+	}
 
 
-    /**
+	/**
-     * @param array $where
+	 * @param array $where
-     * @return string
+	 * @return string
-     */
+	 */
-    private function where(array $where): string
+	private function where(array $where): string
-    {
+	{
-        if (count($where) < 1) {
+		if (count($where) < 1) {
-            return '';
+			return '';
-        }
+		}
-        $_tmp = [];
+		$_tmp = [];
-        foreach ($where as $key => $value) {
+		foreach ($where as $key => $value) {
-            $_tmp[] = $this->resolveCondition($key, $value);
+			$_tmp[] = $this->resolveCondition($key, $value);
-        }
+		}
-        return implode(' AND ', $_tmp);
+		return implode(' AND ', $_tmp);
-    }
+	}
 
 
-    /**
+	/**
-     * @param string $field
+	 * @param string $field
-     * @param mixed $condition
+	 * @param mixed  $condition
-     * @return string
+	 * @return string
-     */
+	 */
-    private function resolveCondition(string|int $field, mixed $condition): string
+	private function resolveCondition(string|int $field, mixed $condition): string
-    {
+	{
-        if (is_string($field)) {
+		if (is_string($field)) {
-            $this->query->pushParam($condition);
+			$this->query->pushParam($condition);
-            return $field . ' = ?';
+			return $field . ' = ?';
-        } else if (is_string($condition)) {
+		} else if (is_string($condition)) {
-            return $condition;
+			return $condition;
-        } else {
+		} else {
-            return implode(' AND ', $this->_hashMap($condition));
+			return implode(' AND ', $this->_hashMap($condition));
-        }
+		}
-    }
+	}
 
 
-    /**
+	/**
-     * @param $condition
+	 * @param $condition
-     * @return array
+	 * @return array
-     */
+	 */
-    private function _hashMap(array $condition): array
+	private function _hashMap(array $condition): array
-    {
+	{
-        $_array = [];
+		$_array = [];
-        foreach ($condition as $key => $value) {
+		foreach ($condition as $key => $value) {
-            $this->query->pushParam($value);
+			$this->query->pushParam($value);
-            $_array[] = $key . '= ?';
+			$_array[] = $key . '= ?';
-        }
+		}
-        return $_array;
+		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/When.php

@@ -18,61 +18,80 @@ use JetBrains\PhpStorm\Pure;
 class When
 {
 
-    public ActiveQuery|ISqlBuilder $query;
+	public ActiveQuery|ISqlBuilder $query;
 
 
-    private array $_condition = [];
+	/**
-
+	 * @var array
-    private string $else = '';
+	 */
+	private array $_condition = [] {
+		&get {
+			return $this->_condition;
+		}
+	}
 
 
-    /**
+	/**
-     * CaseWhen constructor.
+	 * @var string
-     * @param string $column
+	 */
-     * @param ActiveQuery|ISqlBuilder $activeQuery
+	private string $else = '' {
-     */
+		get {
-    public function __construct(public string $column, public ActiveQuery|ISqlBuilder $activeQuery)
+			return $this->else;
-    {
+		}
-        $this->_condition[] = 'CASE ' . $column;
+		set(string $value) {
-    }
+			$this->else = $value;
+		}
+	}
 
 
-    /**
+	/**
-     * @param string|int $condition
+	 * CaseWhen constructor.
-     * @param string $then
+	 * @param string                  $column
-     * @return $this
+	 * @param ActiveQuery|ISqlBuilder $activeQuery
-     * @throws
+	 */
-     */
+	public function __construct(public string $column, public ActiveQuery|ISqlBuilder $activeQuery)
-    public function when(string|int $condition, string $then): static
+	{
-    {
+		$this->_condition[] = 'CASE ' . $column;
-        $this->_condition[] = sprintf('WHEN %s THEN %s', $condition, $then);
+	}
-
-        return $this;
-    }
 
 
-    /**
+	/**
-     * @param string $alias
+	 * @param string|int $condition
-     */
+	 * @param string     $then
-    public function else(string $alias): void
+	 * @return $this
-    {
+	 * @throws
-        $this->else = $alias;
+	 */
-    }
+	public function when(string|int $condition, string $then): static
+	{
+		$this->_condition[] = sprintf('WHEN %s THEN %s', $condition, $then);
+
+		return $this;
+	}
 
 
-    /**
+	/**
-     * @return string
+	 * @param string $alias
-     */
+	 */
-    #[Pure] public function end(): string
+	public function else(string $alias): void
-    {
+	{
-        if (empty($this->_condition)) {
+		$this->else = $alias;
-            return '';
+	}
-        }
+
-        $prefix = implode(' ', $this->_condition);
+
-        if (!empty($this->else)) {
+	/**
-            $prefix .= ' ELSE ' . $this->else;
+	 * @return string
-        }
+	 */
-        return '(' . $prefix . ' END)';
+	#[Pure]
-    }
+	public function end(): string
+	{
+		if (empty($this->_condition)) {
+			return '';
+		}
+		$prefix = implode(' ', $this->_condition);
+		if (!empty($this->else)) {
+			$prefix .= ' ELSE ' . $this->else;
+		}
+		return '(' . $prefix . ' END)';
+	}
 
 }

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