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

@@ -22,208 +22,272 @@ class ActiveQuery extends QueryTrait implements ISqlBuilder
 {
 
 
-    public bool     $asArray = FALSE;
-    protected mixed $_mock   = null;
+	public bool     $asArray = FALSE;
+	protected mixed $_mock   = NULL;
 
 
-    /**
-     * @param bool $asArray
-     * @return static
-     */
-    public function asArray(bool $asArray = true): static
-    {
-        $this->asArray = $asArray;
-        return $this;
-    }
+	/**
+	 * @param bool $asArray
+	 *
+	 * @return static
+	 */
+	public function asArray(bool $asArray = TRUE): static
+	{
+		$this->asArray = $asArray;
+		return $this;
+	}
 
-    /**
-     * @param array $methods
-     * @return $this
-     */
-    public function with(array $methods): static
-    {
-        $this->modelClass->setWith($methods);
-        return $this;
-    }
+	/**
+	 * @param array $methods
+	 *
+	 * @return $this
+	 */
+	public function with(array $methods): static
+	{
+		$this->modelClass->setWith($methods);
+		return $this;
+	}
 
 
-    /**
-     * @return ModelInterface|array|null|bool
-     * @throws
-     */
-    public function first(): ModelInterface|null|array|bool
-    {
-        $data = $this->buildCommand($this->builder->one())->one();
-        if (is_array($data)) {
-            return $this->populate($data);
-        }
-        return null;
-    }
+	/**
+	 * @return ModelInterface|array|null|bool
+	 * @throws
+	 */
+	public function first(): ModelInterface|null|array|bool
+	{
+		$data = $this->buildCommand($this->builder->one())->one();
+		if (is_array($data)) {
+			return $this->populate($data);
+		}
+		return NULL;
+	}
 
-    /**
-     * @return bool|Collection
-     */
-    public function get(): bool|Collection
-    {
-        $data = $this->buildCommand($this->builder->all())->all();
-        if (is_array($data)) {
-            return new Collection($this, $this->modelClass, $data);
-        }
-        return false;
-    }
+	/**
+	 * @return bool|Collection
+	 */
+	public function get(): bool|Collection
+	{
+		$data = $this->buildCommand($this->builder->all())->all();
+		if (is_array($data)) {
+			return new Collection($this, $this->modelClass, $data);
+		}
+		return FALSE;
+	}
 
 
-    /**
-     * @throws
-     */
-    public function flush(): bool
-    {
-        return (bool)$this->buildCommand($this->builder->truncate())->exec();
-    }
+	/**
+	 * @param string    $column
+	 * @param int|float $amount
+	 *
+	 * @return bool
+	 */
+	public function increment(string $column, int|float $amount = 1): bool
+	{
+		return (bool)$this->buildCommand($this->builder->mathematics([$column => $amount]))->exec();
+	}
 
 
-    /**
-     * @param int $size
-     * @param Closure $closure
-     * @return void
-     */
-    public function chunk(int $size, Closure $closure): void
-    {
-        if ($this->offset === -1) $this->offset = 0;
-        $data = $this->offset($this->offset)->limit($size)->get();
-        if (!$data || $data->isEmpty()) {
-            return;
-        }
-        if (Context::inCoroutine()) {
-            Coroutine::create(fn() => $closure($data));
-        } else {
-            call_user_func($closure, $data);
-        }
-        $this->offset += $size;
-        $this->chunk($size, $closure);
-    }
-
-    /**
-     * @param string $field
-     * @param string|null $setKey
-     *
-     * @return array|null
-     */
-    public function column(string $field, ?string $setKey = null): ?array
-    {
-        return $this->get()->column($field, $setKey);
-    }
+	/**
+	 * @param array $attributes
+	 *
+	 * @return bool
+	 */
+	public function increments(array $attributes): bool
+	{
+		return (bool)$this->buildCommand($this->builder->mathematics($attributes))->exec();
+	}
 
 
-    /**
-     * @param mixed $value
-     * @return $this
-     */
-    public function withMock(mixed $value): static
-    {
-        $this->_mock = $value;
-        return $this;
-    }
+	/**
+	 * @param string    $column
+	 * @param int|float $amount
+	 *
+	 * @return bool
+	 */
+	public function decrement(string $column, int|float $amount = 1): bool
+	{
+		return (bool)$this->buildCommand($this->builder->mathematics([$column => $amount], '-'))->exec();
+	}
 
 
-    /**
-     * @return mixed
-     */
-    public function mock(): mixed
-    {
-        return $this->_mock;
-    }
+	/**
+	 * @param array $attributes
+	 *
+	 * @return bool
+	 */
+	public function decrements(array $attributes): bool
+	{
+		return (bool)$this->buildCommand($this->builder->mathematics($attributes, '-'))->exec();
+	}
 
 
-    /**
-     * @param array $data
-     * @return ModelInterface|array
-     * @throws
-     */
-    public function populate(array $data): ModelInterface|array
-    {
-        $model = $this->modelClass->populates($data);
-
-        return $this->asArray ? $model->toArray() : $model;
-    }
+	/**
+	 * @throws
+	 */
+	public function flush(): bool
+	{
+		return (bool)$this->buildCommand($this->builder->truncate())->exec();
+	}
 
 
-    /**
-     * @return int
-     * @throws
-     */
-    public function count(): int
-    {
-        return $this->buildCommand($this->builder->count())->rowCount();
-    }
+	/**
+	 * @param int     $size
+	 * @param Closure $closure
+	 *
+	 * @return void
+	 */
+	public function chunk(int $size, Closure $closure): void
+	{
+		if ($this->offset === -1) $this->offset = 0;
+		$data = $this->offset($this->offset)->limit($size)->get();
+		if (!$data || $data->isEmpty()) {
+			return;
+		}
+		if (Context::inCoroutine()) {
+			Coroutine::create(fn() => $closure($data));
+		} else {
+			call_user_func($closure, $data);
+		}
+		$this->offset += $size;
+		$this->chunk($size, $closure);
+	}
+
+	/**
+	 * @param string      $field
+	 * @param string|null $setKey
+	 *
+	 * @return array|null
+	 */
+	public function column(string $field, ?string $setKey = NULL): ?array
+	{
+		return $this->get()->column($field, $setKey);
+	}
 
 
-    /**
-     * @param array $data
-     * @return bool
-     * @throws
-     */
-    public function update(array $data): bool
-    {
-        if (count($data) < 1) {
-            return true;
-        }
-        $generate = $this->builder->update($data);
-        if (!is_bool($generate)) {
-            return (bool)$this->buildCommand($generate)->exec();
-        } else {
-            return $generate;
-        }
-    }
-
-    /**
-     * @param array $data
-     * @return bool
-     */
-    public function insert(array $data): bool
-    {
-        $sql = $this->builder->insert($data, isset($data[0]));
-
-        return (bool)$this->buildCommand($sql)->exec();
-    }
-
-    /**
-     * @param string $filed
-     *
-     * @return mixed
-     * @throws
-     */
-    public function value(string $filed): mixed
-    {
-        return $this->first()[$filed] ?? NULL;
-    }
-
-    /**
-     * @return bool
-     * @throws
-     */
-    public function exists(): bool
-    {
-        return $this->buildCommand($this->limit(1)->builder->exists())->exists();
-    }
+	/**
+	 * @param mixed $value
+	 *
+	 * @return $this
+	 */
+	public function withMock(mixed $value): static
+	{
+		$this->_mock = $value;
+		return $this;
+	}
 
 
-    /**
-     * @param string $sql
-     * @param array $params
-     * @return int|bool
-     */
-    public function execute(string $sql, array $params = []): int|bool
-    {
-        return $this->buildCommand($sql, $params)->exec();
-    }
+	/**
+	 * @return mixed
+	 */
+	public function mock(): mixed
+	{
+		return $this->_mock;
+	}
 
 
-    /**
-     * @return bool
-     */
-    public function delete(): bool
-    {
-        return $this->buildCommand($this->builder->delete())->delete();
-    }
+	/**
+	 * @param array $data
+	 *
+	 * @return ModelInterface|array
+	 * @throws
+	 */
+	public function populate(array $data): ModelInterface|array
+	{
+		$model = $this->modelClass->populates($data);
+
+		return $this->asArray ? $model->toArray() : $model;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function toSql(): string
+	{
+		return $this->builder->get();
+	}
+
+
+	/**
+	 * @return int
+	 * @throws
+	 */
+	public function count(): int
+	{
+		return $this->buildCommand($this->builder->count())->rowCount();
+	}
+
+
+	/**
+	 * @param array $data
+	 *
+	 * @return bool
+	 * @throws
+	 */
+	public function update(array $data): bool
+	{
+		if (count($data) < 1) {
+			return TRUE;
+		}
+		$generate = $this->builder->update($data);
+		if (!is_bool($generate)) {
+			return (bool)$this->buildCommand($generate)->exec();
+		} else {
+			return $generate;
+		}
+	}
+
+	/**
+	 * @param array $data
+	 *
+	 * @return bool
+	 */
+	public function insert(array $data): bool
+	{
+		$sql = $this->builder->insert($data, isset($data[0]));
+
+		return (bool)$this->buildCommand($sql)->exec();
+	}
+
+
+	/**
+	 * @param string $filed
+	 *
+	 * @return mixed
+	 * @throws
+	 */
+	public function value(string $filed): mixed
+	{
+		return $this->first()[$filed] ?? NULL;
+	}
+
+	/**
+	 * @return bool
+	 * @throws
+	 */
+	public function exists(): bool
+	{
+		return $this->buildCommand($this->limit(1)->builder->exists())->exists();
+	}
+
+
+	/**
+	 * @param string $sql
+	 * @param array  $params
+	 *
+	 * @return int|bool
+	 */
+	public function execute(string $sql, array $params = []): int|bool
+	{
+		return $this->buildCommand($sql, $params)->exec();
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function delete(): bool
+	{
+		return $this->buildCommand($this->builder->delete())->delete();
+	}
 }

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
@@ -267,4 +267,4 @@ interface ActiveQueryInterface
     public function offset(int $offset): QueryTrait;
 
 
-}
+}

Base/Model.php

@@ -1,4 +1,5 @@
-<?php /** @noinspection ALL */
+<?php
+/** @noinspection ALL */
 /**
  * Created by PhpStorm.
  * User: whwyy
@@ -22,12 +23,21 @@ use Database\ModelInterface;
 use Database\Relation;
 use Database\SqlBuilder;
 use Exception;
+use Kiri\Di\Context;
 use Kiri;
 use Kiri\Abstracts\Component;
 use ReturnTypeWillChange;
 use ReflectionException;
 use validator\Validator;
 
+
+enum Driver
+{
+    case Mysql;
+    case Pgsql;
+}
+
+
 /**
  * Class BOrm
  *
@@ -61,7 +71,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
     /**
      * @var bool
      */
-    protected bool $skipValidate = false;
+    protected bool $skipValidate = FALSE;
 
 
     /**
@@ -104,6 +114,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
 
     /**
      * @param array $data
+     *
      * @return Model
      */
     public function setWith(array $data): static
@@ -136,7 +147,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
      */
     public function clean(): void
     {
-        $this->_attributes    = [];
+        $this->_attributes = [];
         $this->_oldAttributes = [];
     }
 
@@ -162,6 +173,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
 
     /**
      * @param bool $bool
+     *
      * @return $this
      */
     public function setIsNowExample(bool $bool = FALSE): static
@@ -210,9 +222,9 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
     public function hasPrimaryValue(): bool
     {
         if ($this->hasPrimary()) {
-            return $this->getPrimaryValue() === null;
+            return $this->getPrimaryValue() === NULL;
         }
-        return false;
+        return FALSE;
     }
 
 
@@ -222,40 +234,44 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
      */
     public function getPrimaryValue(): ?int
     {
-        if ($this->hasPrimary()) {
-            return (int)$this->_oldAttributes[$this->getPrimary()] ?? null;
+        if ($this->hasPrimary() && isset($this->_oldAttributes[$this->getPrimary()])) {
+            return (int)$this->_oldAttributes[$this->getPrimary()];
         } else {
-            return null;
+            return NULL;
         }
     }
 
     /**
      * @param int|string|array $param
+     *
      * @return Model|null
      * @throws
      */
-    public static function findOne(int|string|array $param): ?static
+    public static function findOne(int|string|array|null $param): ?static
     {
-        $model = static::instance();
-        $query = new ActiveQuery($model);
+        if (empty($param)) {
+            return NULL;
+        }
+        $query = new ActiveQuery($model = static::instance());
         $query->from($model->getTable())->alias('t1');
         if (is_numeric($param)) {
-            $query->where([$model->getPrimary() => $param]);
+            $query->where([$model->getPrimary() => +$param]);
         } else if (is_array($param)) {
             $query->where($param);
         } else {
             $query->whereRaw($param);
         }
-        $data = $query->first();
-        if ($data === false) {
+        if (($data = $query->first()) === FALSE) {
             throw new Exception($model->getLastError());
+        } else {
+            return $data;
         }
-        return $data;
     }
 
 
     /**
      * @param int $param
+     *
      * @return Model|null
      * @throws
      */
@@ -289,6 +305,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
 
     /**
      * @param int|string|array $condition
+     *
      * @return static|null
      * @throws
      */
@@ -300,6 +317,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
 
     /**
      * @param string|array $condition
+     *
      * @return Collection
      * @throws
      */
@@ -323,7 +341,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
     public static function query(): ActiveQuery
     {
         $model = new ActiveQuery(static::instance());
-        $model->from($model->getTable())->alias('t1');
+        $model->select()->from($model->getTable())->alias('t1');
         return $model;
     }
 
@@ -377,6 +395,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
     /**
      * @param string $name
      * @param mixed $value
+     *
      * @return mixed
      */
     public function setAttribute(string $name, mixed $value): mixed
@@ -391,6 +410,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
     /**
      * @param string $name
      * @param mixed $value
+     *
      * @return mixed
      */
     public function setOldAttribute(string $name, mixed $value): mixed
@@ -404,6 +424,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
 
     /**
      * @param array $param
+     *
      * @return $this
      * @throws
      */
@@ -418,6 +439,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
 
     /**
      * @param array $param
+     *
      * @return $this
      */
     public function setOldAttributes(array $param): static
@@ -435,15 +457,18 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
      */
     private function insert(): bool|static
     {
-        $sql    = SqlBuilder::builder($query = static::query())->insert($this->_attributes);
-        $lastId = $this->getConnection()->createCommand($sql, $query->params)->save();
-        if ($lastId === false) {
-            return false;
+        $sql = SqlBuilder::builder($query = static::query())->insert($this->_attributes);
+        $lastId = $this->getConnection()->createCommand($sql, $query->params)->exec();
+        if ($lastId === FALSE) {
+            return FALSE;
         }
-        if ($this->hasPrimary()) {
-            $this->_attributes[$this->getPrimary()] = $lastId;
+        if (!$this->hasPrimary()) {
+            return $this->refresh()->afterSave($this->_attributes, []);
         }
-        return $this;
+
+        $this->_attributes[$this->getPrimary()] = $lastId;
+
+        return $this->refresh()->afterSave($this->_attributes, [$this->getPrimary() => $lastId]);
     }
 
 
@@ -451,6 +476,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
      * @param array $old
      * @param array $condition
      * @param array $change
+     *
      * @return $this|bool
      * @throws
      */
@@ -458,13 +484,13 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
     {
         $query = static::query()->where($condition);
         if (count($change) < 1) {
-            return true;
+            return TRUE;
         }
         $generate = SqlBuilder::builder($query)->update($change);
-        if ($generate === false) {
-            return false;
+        if ($generate === FALSE) {
+            return FALSE;
         }
-        if (!$this->getConnection()->createCommand($generate, $query->params)->save()) {
+        if (!$this->getConnection()->createCommand($generate, $query->params)->exec()) {
             return FALSE;
         }
         return $this->refresh()->afterSave($old, $change);
@@ -494,7 +520,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
     protected function arrayIntersect(array $params): array
     {
         $condition = [];
-        $oldPrams  = [];
+        $oldPrams = [];
         foreach ($this->_oldAttributes as $key => $attribute) {
             if (!array_key_exists($key, $params) || $params[$key] == $attribute) {
                 $condition[$key] = $attribute;
@@ -524,11 +550,12 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
 
     /**
      * @param array $value
+     *
      * @return $this
      */
     public function populates(array $value): static
     {
-        $this->_attributes    = $value;
+        $this->_attributes = $value;
         $this->_oldAttributes = $value;
         $this->setIsNowExample();
         return $this;
@@ -537,6 +564,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
 
     /**
      * @param array $rule
+     *
      * @return bool
      * @throws
      */
@@ -547,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;
         }
@@ -556,6 +584,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
 
     /**
      * @param array $rule
+     *
      * @return Validator
      * @throws
      */
@@ -576,6 +605,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
 
     /**
      * @param string $name
+     *
      * @return null
      * @throws
      */
@@ -591,18 +621,19 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
      */
     public function getRelation(): ?Relation
     {
-        return Kiri::getDi()->get(Relation::class);
+        return di(Relation::class);
     }
 
 
     /**
      * @param string $attribute
+     *
      * @return bool
      * @throws
      */
     public function has(string $attribute): bool
     {
-        return true;
+        return TRUE;
     }
 
 
@@ -612,7 +643,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
      */
     public function getTable(): string
     {
-        $connection  = $this->getConnection();
+        $connection = $this->getConnection();
         $tablePrefix = $connection->tablePrefix;
         if (empty($this->table)) {
             throw new Exception('You need add static method `tableName` and return table name.');
@@ -621,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;
     }
 
@@ -628,6 +666,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
     /**
      * @param array $oldAttributes
      * @param array $changeAttributes
+     *
      * @return bool
      */
     public function afterSave(array $oldAttributes, array $changeAttributes): bool
@@ -638,6 +677,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
 
     /**
      * @param self $model
+     *
      * @return bool
      * @throws
      */
@@ -653,6 +693,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
     public function refresh(): static
     {
         $this->_oldAttributes = $this->_attributes;
+        $this->isNewExample = FALSE;
         return $this;
     }
 
@@ -660,17 +701,21 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
     /**
      * @param string $name
      * @param mixed $value
+     *
      * @return void
      */
     public function __set(string $name, mixed $value): void
     {
-        if ($this->hasRelateMethod($name, 'set')) {
-            $this->{'set' . ucfirst($name)}($value);
+        $prefix = 'set' . ucfirst($name);
+        if (method_exists($this, $prefix)) {
+            $this->{$prefix}($value);
+            return;
+        }
+
+        $method = $prefix . 'Attribute';
+        if (method_exists($this, $method)) {
+            $this->_attributes[$name] = $this->{$method}($value);
         } else {
-            $method = 'set' . ucfirst($name) . 'Attribute';
-            if (method_exists($this, $method)) {
-                $value = $this->{$method} ($value);
-            }
             $this->_attributes[$name] = $value;
         }
     }
@@ -678,12 +723,13 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
 
     /**
      * @param string $name
+     *
      * @return mixed
      */
     public function __get(string $name): mixed
     {
-        $value = $this->_attributes[$name] ?? null;
-        if (!$this->hasRelateMethod($name)) {
+        $value = $this->_attributes[$name] ?? NULL;
+        if (!method_exists($this, 'get' . ucfirst($name))) {
             return $this->withPropertyOverride($name, $value);
         } else {
             return $this->withRelate($name);
@@ -694,9 +740,10 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
     /**
      * @param string $name
      * @param mixed|null $value
+     *
      * @return mixed
      */
-    protected function withPropertyOverride(string $name, mixed $value = null): mixed
+    protected function withPropertyOverride(string $name, mixed $value = NULL): mixed
     {
         $method = 'get' . ucfirst($name) . 'Attribute';
         if (method_exists($this, $method)) {
@@ -710,16 +757,26 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
     /**
      * @param string $name
      * @param string $prefix
+     *
      * @return bool
      */
-    protected function hasRelateMethod(string $name, string $prefix = 'get'): bool
+    protected function hasRelateMethod(string $name): bool
     {
-        return method_exists($this, $prefix . ucfirst($name));
+        $reflection = $this->container->get(static::class);
+        if (!$reflection->hasMethod($name)) {
+            return FALSE;
+        }
+        if ($reflection->getMethod($name)->isStatic() || !$reflection->getMethod($name)->isPublic()) {
+            return FALSE;
+        } else {
+            return TRUE;
+        }
     }
 
 
     /**
      * @param string $name
+     *
      * @return mixed
      */
     protected function withRelate(string $name): mixed
@@ -734,6 +791,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
 
     /**
      * @param $name
+     *
      * @return bool
      */
     public function __isset(string $name): bool
@@ -744,6 +802,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
 
     /**
      * @param mixed $offset
+     *
      * @return bool
      * @throws
      */
@@ -754,6 +813,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
 
     /**
      * @param mixed $offset
+     *
      * @return mixed
      * @throws
      */
@@ -765,18 +825,22 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
     /**
      * @param mixed $offset
      * @param mixed $value
+     *
      * @throws
      */
-    #[ReturnTypeWillChange] public function offsetSet(mixed $offset, mixed $value): void
+    #[ReturnTypeWillChange]
+    public function offsetSet(mixed $offset, mixed $value): void
     {
         $this->__set($offset, $value);
     }
 
     /**
      * @param mixed $offset
+     *
      * @throws
      */
-    #[ReturnTypeWillChange] public function offsetUnset(mixed $offset): void
+    #[ReturnTypeWillChange]
+    public function offsetUnset(mixed $offset): void
     {
         if (!isset($this->_attributes[$offset]) && !isset($this->_oldAttributes[$offset])) {
             return;
@@ -787,6 +851,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
 
     /**
      * @param string ...$params
+     *
      * @return array
      */
     public function unset(string ...$params): array
@@ -797,13 +862,14 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
 
     /**
      * @param array $data
+     *
      * @return static
      * @throws
      */
     public static function populate(array $data): static
     {
-        $model                 = new static();
-        $model->_attributes    = $data;
+        $model = new static();
+        $model->_attributes = $data;
         $model->_oldAttributes = $data;
         $model->setIsNowExample();
         return $model;
@@ -813,6 +879,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
     /**
      * @param string $name
      * @param array $arguments
+     *
      * @return mixed
      */
     public static function __callStatic(string $name, array $arguments)
@@ -823,11 +890,12 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
 
     /**
      * @param string $field
+     *
      * @return array
      */
     public function getOldAttribute(string $field): mixed
     {
-        return $this->_oldAttributes[$field] ?? null;
+        return $this->_oldAttributes[$field] ?? NULL;
     }
 
 }

Base/PDO.php

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

Collection.php

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

Command.php

@@ -47,15 +47,6 @@ class Command extends Component
         return (bool)$this->_prepare();
     }
 
-    /**
-     * @return bool
-     * @throws
-     */
-    public function save(): bool
-    {
-        return (bool)$this->_prepare();
-    }
-
 
     /**
      * @return bool|array
@@ -118,6 +109,7 @@ class Command extends Component
     {
         $client = $this->connection->getConnection();
         try {
+            $startTime = microtime(true);
             if (($prepare = $client->prepare($this->sql)) === false) {
                 throw new Exception('(' . $prepare->errorInfo()[0] . ')' . $client->errorInfo()[2]);
             }
@@ -127,15 +119,19 @@ class Command extends Component
             $result = $method == 'rowCount' ? $prepare->rowCount() : $prepare->{$method}(PDO::FETCH_ASSOC);
             $prepare->closeCursor();
 
-            $this->connection->println($this->sql, $this->params);
+            $this->connection->println($startTime, microtime(true), $this->sql, $this->params);
 
             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);
         }
@@ -160,6 +156,7 @@ class Command extends Component
     {
         $client = $this->connection->getConnection();
         try {
+            $startTime = microtime(true);
             if (($prepare = $client->prepare($this->sql)) === false) {
                 throw new Exception('(' . $prepare->errorInfo()[0] . ')' . $prepare->errorInfo()[2]);
             }
@@ -170,15 +167,19 @@ class Command extends Component
 
             $result = $client->lastInsertId();
 
-            $this->connection->println($this->sql, $this->params);
+            $this->connection->println($startTime, microtime(true), $this->sql, $this->params);
 
             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);
         }
@@ -191,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];
@@ -67,6 +68,14 @@ class Connection extends Component
     #[Container(LoggerInterface::class)]
     public StdoutLogger $logger;
 
+
+    /**
+     * @var EventProvider
+     */
+    #[Container(EventProvider::class)]
+    public EventProvider $eventProvider;
+
+
     /**
      * @param Pool $connections
      */
@@ -79,14 +88,16 @@ class Connection extends Component
 
 
     /**
+     * @param float $startTime
+     * @param float $endTime
      * @param string $sql
      * @param array $params
      * @return void
      */
-    public function println(string $sql, array $params = []): void
+    public function println(float $startTime, float $endTime, string $sql, array $params = []): void
     {
         if (is_callable($this->_println)) {
-            call_user_func($this->_println, $sql, $params);
+            call_user_func($this->_println, $startTime, $endTime, $sql, $params);
         }
     }
 
@@ -97,14 +108,13 @@ class Connection extends Component
      */
     public function init(): void
     {
-        $eventProvider = Kiri::getDi()->get(EventProvider::class);
-        $eventProvider->on(BeginTransaction::class, [$this, 'beginTransaction'], 0);
-        $eventProvider->on(Rollback::class, [$this, 'rollback'], 0);
-        $eventProvider->on(Commit::class, [$this, 'commit'], 0);
-        $eventProvider->on(OnAfterRequest::class, [$this, 'clear']);
-        $eventProvider->on(OnWorkerExit::class, [$this, 'disconnect']);
-        $eventProvider->on(OnWorkerStart::class, [$this, 'tick']);
-        $eventProvider->on(OnTaskerStart::class, [$this, 'tick']);
+        $this->eventProvider->on(BeginTransaction::class, [$this, 'beginTransaction'], 0);
+        $this->eventProvider->on(Rollback::class, [$this, 'rollback'], 0);
+        $this->eventProvider->on(Commit::class, [$this, 'commit'], 0);
+        $this->eventProvider->on(OnAfterRequest::class, [$this, 'clear']);
+        $this->eventProvider->on(OnWorkerExit::class, [$this, 'disconnect']);
+        $this->eventProvider->on(OnWorkerStart::class, [$this, 'tick']);
+        $this->eventProvider->on(OnTaskerStart::class, [$this, 'tick']);
     }
 
 
@@ -113,7 +123,7 @@ class Connection extends Component
      */
     public function tick(): void
     {
-        $this->timerId = Timer::tick($this->tick_time, fn() => $this->checkClientHealth($this->pool()));
+        $this->timerId = Timer::tick($this->tick_time, fn () => $this->checkClientHealth($this->pool()));
     }
 
 
@@ -125,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]);
+//                }
+//            }
+//        }
     }
 
 
@@ -146,7 +156,7 @@ class Connection extends Component
      */
     private function getName(): string
     {
-        return 'mysql.' . $this->cds;
+        return strtolower($this->driver) . '.' . $this->cds;
     }
 
 
@@ -303,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);
     }
 
 
@@ -347,16 +357,22 @@ class Connection extends Component
      */
     public function newConnect(): \PDO
     {
-        $pdo = new PDO($this->database, $this->cds, $this->username, $this->password, [
-//        $pdo = new \PDO('mysql:dbname=' . $this->database . ';host=' . $this->cds, $this->username, $this->password, [
-            \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
-        ]);
+        $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,
+        ];
+        
+        // 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'] ?? [],

HasCount.php

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

HasMany.php

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

HasOne.php

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

Model.php

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

ModelInterface.php

@@ -18,10 +18,10 @@ interface ModelInterface
 {
 
     /**
-     * @param array|string|int $param
+     * @param array|string|int|null $param
      * @return ModelInterface|null
      */
-    public static function findOne(array|string|int $param): ?static;
+    public static function findOne(array|string|int|null $param): ?static;
 
 
     /**

Relation.php

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

SqlBuilder.php

@@ -1,4 +1,5 @@
-<?php /** @noinspection ALL */
+<?php
+/** @noinspection ALL */
 
 declare(strict_types=1);
 
@@ -51,7 +52,7 @@ class SqlBuilder extends Component
      */
     public function getCondition(): string
     {
-        return $this->where($this->query->where);
+        return $this->where($this->query->getWhere());
     }
 
 
@@ -73,9 +74,9 @@ class SqlBuilder extends Component
      */
     public function update(array $attributes): bool|string
     {
-        $conditions          = $this->query->params;
-        $this->query->params = [];
-        $data                = $this->__updateBuilder($this->makeParams($attributes));
+        $conditions = $this->query->getParams();
+        $this->query->setParams([]);
+        $data = $this->__updateBuilder($this->makeParams($attributes));
         foreach ($conditions as $condition) {
             $this->query->pushParam($condition);
         }
@@ -107,9 +108,9 @@ 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->from . ' SET ' . implode(',', $string) . $this->make();
+        return 'UPDATE ' . $this->query->getFrom() . ' SET ' . implode(',', $string) . $this->make();
     }
 
 
@@ -121,7 +122,7 @@ class SqlBuilder extends Component
      */
     public function insert(array $attributes, bool $isBatch = false): string
     {
-        $update = 'INSERT INTO ' . $this->query->from;
+        $update = 'INSERT INTO ' . $this->query->getFrom();
         if ($isBatch === false) {
             $attributes = [$attributes];
         }
@@ -143,7 +144,7 @@ class SqlBuilder extends Component
      */
     public function delete(): string
     {
-        return 'DELETE FROM ' . $this->query->from . $this->make();
+        return 'DELETE FROM ' . $this->query->getFrom() . $this->make();
     }
 
 
@@ -189,7 +190,7 @@ class SqlBuilder extends Component
         if (is_null($value)) {
             return $keys;
         }
-        if (is_string($value) && $this->isMath($value)) {
+        if (preg_match('/^[+|-]\s\d+$/', (string)$value)) {
             $keys[] = $key . '=' . $key . ' ' . $value;
         } else {
             $this->query->pushParam($value);
@@ -199,23 +200,14 @@ class SqlBuilder extends Component
     }
 
 
-    /**
-     * @param string $value
-     * @return bool
-     */
-    private function isMath(string $value): bool
-    {
-        return str_starts_with($value, '+ ') || str_starts_with($value, '- ');
-    }
-
-
     /**
      * @return string
      * @throws
      */
     public function one(): string
     {
-        return $this->makeSelect($this->query->select) . $this->make() . $this->makeLimit($this->query->limit(1));
+        $this->query->offset(0)->limit(1);
+        return $this->makeSelect($this->query->getSelect()) . $this->make() . $this->makeLimit();
     }
 
 
@@ -225,7 +217,7 @@ class SqlBuilder extends Component
      */
     public function all(): string
     {
-        return $this->makeSelect($this->query->select) . $this->make() . $this->makeLimit($this->query);
+        return $this->makeSelect($this->query->getSelect()) . $this->make() . $this->makeLimit();
     }
 
 
@@ -252,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;
     }
 
@@ -277,12 +286,12 @@ class SqlBuilder extends Component
      */
     private function makeSelect(array $select = ['*']): string
     {
-        $select = "SELECT " . implode(',', $select) . " FROM " . $this->query->from;
-        if ($this->query->alias != "") {
-            $select .= " AS " . $this->query->alias;
+        $select = "SELECT " . implode(',', $select) . " FROM " . $this->query->getFrom();
+        if ($this->query->getAlias() != "") {
+            $select .= " AS " . $this->query->getAlias();
         }
-        if (count($this->query->join) > 0) {
-            $select .= ' ' . implode(' ', $this->query->join);
+        if (count($this->query->getJoin()) > 0) {
+            $select .= ' ' . implode(' ', $this->query->getJoin());
         }
         return $select;
     }
@@ -293,8 +302,8 @@ class SqlBuilder extends Component
      */
     private function makeGroup(): string
     {
-        if ($this->query->group != "") {
-            return ' GROUP BY ' . $this->query->group;
+        if ($this->query->getGroup() != "") {
+            return ' GROUP BY ' . $this->query->getGroup();
         }
         return '';
     }
@@ -305,8 +314,8 @@ class SqlBuilder extends Component
      */
     private function makeOrder(): string
     {
-        if (count($this->query->order) > 0) {
-            return ' ORDER BY ' . implode(',', $this->query->order);
+        if (count($this->query->getOrder()) > 0) {
+            return ' ORDER BY ' . implode(',', $this->query->getOrder());
         }
         return '';
     }
@@ -317,7 +326,7 @@ class SqlBuilder extends Component
      */
     private function makeCondition(): string
     {
-        $condition = $this->where($this->query->where);
+        $condition = $this->where($this->query->getWhere());
         if (empty($condition)) {
             return '';
         }
@@ -325,10 +334,20 @@ class SqlBuilder extends Component
     }
 
 
+    /**
+     * @return string
+     * @throws
+     */
     private function makeLimit(): string
     {
-        if ($this->query->offset >= 0 && $this->query->limit >= 1) {
-            return ' LIMIT ' . $this->query->offset . ',' . $this->query->limit;
+        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 '';
     }
@@ -354,7 +373,7 @@ class SqlBuilder extends Component
      */
     public function truncate(): string
     {
-        return sprintf('TRUNCATE %s', $this->query->from);
+        return sprintf('TRUNCATE %s', $this->query->getFrom());
     }
 
 
@@ -407,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,7 +12,6 @@ namespace Database\Traits;
 use Database\ModelInterface;
 use Database\Collection;
 use Database\Relation;
-use Kiri;
 
 /**
  * Class HasBase
@@ -52,12 +51,16 @@ abstract class HasBase implements \Database\Traits\Relation
      * @param string $name
      * @param array $arguments
      * @return $this|mixed
+     * @throws \Exception
      */
     public function __call(string $name, array $arguments)
     {
         if ($name !== 'get') {
-            $relation = Kiri::getDi()->get(Relation::class);
-            $relation->getQuery($this->name)->$name(...$arguments);
+            $query    = di(Relation::class)->getQuery($this->name);
+            if (is_null($query)) {
+                throw new \Exception('Unknown relation key: ' . $this->name);
+            }
+            $query->$name(...$arguments);
             return $this;
         } else {
             return $this->get();

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

test.php

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