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

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
  *
@@ -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;
         }
@@ -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;
     }
 
@@ -699,7 +714,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
 
         $method = $prefix . 'Attribute';
         if (method_exists($this, $method)) {
-            $this->_attributes[$name] = $this->{$method} ($value);
+            $this->_attributes[$name] = $this->{$method}($value);
         } else {
             $this->_attributes[$name] = $value;
         }

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

@@ -123,11 +123,15 @@ class Command extends Component
 
             return $result;
         } catch (Throwable $throwable) {
-            if ($this->isRefresh($throwable)) return $this->search($method);
+            $this->getLogger()->json_log($throwable);
+
+            if ($this->isRefresh($throwable)) {
+				return $this->search($method);
+			}
 
             $errorMsg = $throwable->getMessage() . PHP_EOL . '                 Sql: ' . $this->sql . '.' . json_encode($this->params);
 
-            return $this->getLogger()->failure($errorMsg . PHP_EOL, 'mysql');
+            return $this->getLogger()->logCategory($errorMsg . PHP_EOL, 'mysql');
         } finally {
             $this->connection->release($client);
         }
@@ -167,11 +171,15 @@ class Command extends Component
 
             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);
+            if ($this->isRefresh($throwable)) {
+				return $this->_prepare();
+			}
 
-            return $this->getLogger()->failure($errorMsg . PHP_EOL, 'mysql');
+            $errorMsg = $throwable->getMessage() . PHP_EOL . '                 Sql: ' . $this->sql . '.' . json_encode($this->params, JSON_UNESCAPED_UNICODE);
+
+            return $this->getLogger()->logCategory($errorMsg . PHP_EOL, 'mysql');
         } finally {
             $this->connection->release($client);
         }
@@ -184,15 +192,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;
     }
 

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,19 +135,19 @@ 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]);
+//                }
+//            }
+//        }
     }
 
 
@@ -155,7 +156,7 @@ class Connection extends Component
      */
     private function getName(): string
     {
-        return 'mysql.' . $this->cds;
+        return strtolower($this->driver) . '.' . $this->cds;
     }
 
 
@@ -312,7 +313,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 +357,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

@@ -78,8 +78,9 @@ class DatabasesProviders extends Providers
             '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

SqlBuilder.php

@@ -1,4 +1,5 @@
-<?php /** @noinspection ALL */
+<?php
+/** @noinspection ALL */
 
 declare(strict_types=1);
 
@@ -107,7 +108,7 @@ 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();
     }
@@ -189,7 +190,7 @@ class SqlBuilder extends Component
         if (is_null($value)) {
             return $keys;
         }
-        if (preg_match('/^[+|-]\s\d+$/', $value)) {
+        if (preg_match('/^[+|-]\s\d+$/', (string)$value)) {
             $keys[] = $key . '=' . $key . ' ' . $value;
         } else {
             $this->query->pushParam($value);
@@ -205,7 +206,8 @@ class SqlBuilder extends Component
      */
     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->makeSelect($this->query->getSelect()) . $this->make() . $this->makeLimit();
     }
 
 
@@ -215,7 +217,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->getSelect()) . $this->make() . $this->makeLimit();
     }
 
 
@@ -242,9 +244,26 @@ class SqlBuilder extends Component
     /**
      * @param string $table
      * @return string
+     * @throws
      */
     public function columns(string $table): string
     {
+        $driver = $this->getDriver();
+        if (in_array($driver, ['pgsql', 'postgresql'])) {
+            // PostgreSQL 使用 information_schema
+            $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";
+        }
+        // MySQL 使用 SHOW FULL FIELDS
         return 'SHOW FULL FIELDS FROM ' . $table;
     }
 
@@ -315,9 +334,19 @@ class SqlBuilder extends Component
     }
 
 
+    /**
+     * @return string
+     * @throws
+     */
     private function makeLimit(): string
     {
         if ($this->query->getOffset() >= 0 && $this->query->getLimit() >= 1) {
+            $driver = $this->getDriver();
+            if (in_array($driver, ['pgsql', 'postgresql'])) {
+                // PostgreSQL 使用 LIMIT ... OFFSET ... 语法
+                return ' LIMIT ' . $this->query->getLimit() . ' OFFSET ' . $this->query->getOffset();
+            }
+            // MySQL 使用 LIMIT offset,limit 语法
             return ' LIMIT ' . $this->query->getOffset() . ',' . $this->query->getLimit();
         }
         return '';
@@ -397,5 +426,37 @@ class SqlBuilder extends Component
         return $_array;
     }
 
+    /**
+     * 获取数据库驱动类型
+     * @return string
+     * @throws
+     */
+    private function getDriver(): string
+    {
+        try {
+            // 尝试从 query 对象获取 connection
+            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');
+                    }
+                }
+            }
+            // 如果是 Db 查询，尝试获取默认 connection
+            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);
+		}
+        // 默认返回 mysql
+        return 'mysql';
+    }
+
 
 }

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

@@ -63,6 +63,15 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 	}
 
 
+	/**
+	 * @return mixed
+	 */
+	public function getModelClass(): mixed
+	{
+		return $this->modelClass;
+	}
+
+
 	/**
 	 * @param array $where
 	 *
@@ -84,6 +93,7 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 	{
 		if ($callback instanceof Query) {
 			$this->where[] = 'NOT EXISTS(' . $callback->build() . ')';
+			$this->mergeParams($callback->getParams());
 		} else {
 			$this->where[] = 'NOT EXISTS(' . $this->makeClosureFunction($callback) . ')';
 		}
@@ -104,6 +114,7 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 	{
 		if ($callback instanceof Query) {
 			$this->where[] = 'EXISTS(' . $callback->build() . ')';
+			$this->mergeParams($callback->getParams());
 		} else {
 			$this->where[] = 'EXISTS(' . $this->makeClosureFunction($callback) . ')';
 		}
@@ -302,6 +313,18 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 	}
 
 
+	/**
+	 * @param array $params
+	 * @return void
+	 */
+	public function mergeParams(array $params): void
+	{
+		foreach ($params as $key => $value) {
+			$this->pushParam($value);
+		}
+	}
+
+
 	/**
 	 * @param string $column
 	 * @param callable $callable
@@ -442,6 +465,7 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 	{
 		if ($tableName instanceof Query) {
 			$this->from = '(' . $tableName->build() . ')';
+			$this->mergeParams($tableName->getParams());
 		} else if ($tableName instanceof Closure) {
 			$this->from = '(' . $this->makeClosureFunction($tableName) . ')';
 		} else if (class_exists($tableName)) {
@@ -806,6 +830,7 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 			$this->where[] = $columns . ' IN (' . implode(',', $value) . ')';
 		} else if ($value instanceof Query) {
 			$this->where[] = $columns . ' IN (' . $value->build() . ')';
+			$this->mergeParams($value->getParams());
 		} else {
 			$this->where[] = $columns . ' IN (' . $this->makeClosureFunction($value) . ')';
 		}
@@ -953,6 +978,7 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 		} else {
 			$generate->addArray($closure);
 		}
+		$this->mergeParams($generate->getParams());
 		return $generate->build();
 	}
 
@@ -963,7 +989,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)) {
@@ -1041,6 +1067,16 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 	 */
 	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 . ' ?';
 	}

composer.json

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