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;
+	public bool     $asArray = FALSE;
-    protected mixed $_mock   = null;
+	protected mixed $_mock   = NULL;
 
 
-    /**
+	/**
-     * @param bool $asArray
+	 * @param bool $asArray
-     * @return static
+	 *
-     */
+	 * @return static
-    public function asArray(bool $asArray = true): static
+	 */
-    {
+	public function asArray(bool $asArray = TRUE): static
-        $this->asArray = $asArray;
+	{
-        return $this;
+		$this->asArray = $asArray;
-    }
+		return $this;
+	}
 
-    /**
+	/**
-     * @param array $methods
+	 * @param array $methods
-     * @return $this
+	 *
-     */
+	 * @return $this
-    public function with(array $methods): static
+	 */
-    {
+	public function with(array $methods): static
-        $this->modelClass->setWith($methods);
+	{
-        return $this;
+		$this->modelClass->setWith($methods);
-    }
+		return $this;
+	}
 
 
-    /**
+	/**
-     * @return ModelInterface|array|null|bool
+	 * @return ModelInterface|array|null|bool
-     * @throws
+	 * @throws
-     */
+	 */
-    public function first(): ModelInterface|null|array|bool
+	public function first(): ModelInterface|null|array|bool
-    {
+	{
-        $data = $this->buildCommand($this->builder->one())->one();
+		$data = $this->buildCommand($this->builder->one())->one();
-        if (is_array($data)) {
+		if (is_array($data)) {
-            return $this->populate($data);
+			return $this->populate($data);
-        }
+		}
-        return null;
+		return NULL;
-    }
+	}
 
-    /**
+	/**
-     * @return bool|Collection
+	 * @return bool|Collection
-     */
+	 */
-    public function get(): bool|Collection
+	public function get(): bool|Collection
-    {
+	{
-        $data = $this->buildCommand($this->builder->all())->all();
+		$data = $this->buildCommand($this->builder->all())->all();
-        if (is_array($data)) {
+		if (is_array($data)) {
-            return new Collection($this, $this->modelClass, $data);
+			return new Collection($this, $this->modelClass, $data);
-        }
+		}
-        return false;
+		return FALSE;
-    }
+	}
 
 
-    /**
+	/**
-     * @throws
+	 * @param string    $column
-     */
+	 * @param int|float $amount
-    public function flush(): bool
+	 *
-    {
+	 * @return bool
-        return (bool)$this->buildCommand($this->builder->truncate())->exec();
+	 */
-    }
+	public function increment(string $column, int|float $amount = 1): bool
+	{
+		return (bool)$this->buildCommand($this->builder->mathematics([$column => $amount]))->exec();
+	}
 
 
-    /**
+	/**
-     * @param int $size
+	 * @param array $attributes
-     * @param Closure $closure
+	 *
-     * @return void
+	 * @return bool
-     */
+	 */
-    public function chunk(int $size, Closure $closure): void
+	public function increments(array $attributes): bool
-    {
+	{
-        if ($this->offset === -1) $this->offset = 0;
+		return (bool)$this->buildCommand($this->builder->mathematics($attributes))->exec();
-        $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 mixed $value
+	 * @param string    $column
-     * @return $this
+	 * @param int|float $amount
-     */
+	 *
-    public function withMock(mixed $value): static
+	 * @return bool
-    {
+	 */
-        $this->_mock = $value;
+	public function decrement(string $column, int|float $amount = 1): bool
-        return $this;
+	{
-    }
+		return (bool)$this->buildCommand($this->builder->mathematics([$column => $amount], '-'))->exec();
+	}
 
 
-    /**
+	/**
-     * @return mixed
+	 * @param array $attributes
-     */
+	 *
-    public function mock(): mixed
+	 * @return bool
-    {
+	 */
-        return $this->_mock;
+	public function decrements(array $attributes): bool
-    }
+	{
+		return (bool)$this->buildCommand($this->builder->mathematics($attributes, '-'))->exec();
+	}
 
 
-    /**
+	/**
-     * @param array $data
+	 * @throws
-     * @return ModelInterface|array
+	 */
-     * @throws
+	public function flush(): bool
-     */
+	{
-    public function populate(array $data): ModelInterface|array
+		return (bool)$this->buildCommand($this->builder->truncate())->exec();
-    {
+	}
-        $model = $this->modelClass->populates($data);
-
-        return $this->asArray ? $model->toArray() : $model;
-    }
 
 
-    /**
+	/**
-     * @return int
+	 * @param int     $size
-     * @throws
+	 * @param Closure $closure
-     */
+	 *
-    public function count(): int
+	 * @return void
-    {
+	 */
-        return $this->buildCommand($this->builder->count())->rowCount();
+	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
+	 * @param mixed $value
-     * @return bool
+	 *
-     * @throws
+	 * @return $this
-     */
+	 */
-    public function update(array $data): bool
+	public function withMock(mixed $value): static
-    {
+	{
-        if (count($data) < 1) {
+		$this->_mock = $value;
-            return true;
+		return $this;
-        }
+	}
-        $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
+	 * @return mixed
-     * @param array $params
+	 */
-     * @return int|bool
+	public function mock(): mixed
-     */
+	{
-    public function execute(string $sql, array $params = []): int|bool
+		return $this->_mock;
-    {
+	}
-        return $this->buildCommand($sql, $params)->exec();
-    }
 
 
-    /**
+	/**
-     * @return bool
+	 * @param array $data
-     */
+	 *
-    public function delete(): bool
+	 * @return ModelInterface|array
-    {
+	 * @throws
-        return $this->buildCommand($this->builder->delete())->delete();
+	 */
-    }
+	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 (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
@@ -267,4 +267,4 @@ interface ActiveQueryInterface
     public function offset(int $offset): QueryTrait;
 
 
-}
+}

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

@@ -1,237 +1,288 @@
-<?php
+<?php
-/**
+/**
- * Created by PhpStorm.
+ * Created by PhpStorm.
- * User: whwyy
+ * User: whwyy
- * Date: 2018/3/30 0030
+ * Date: 2018/3/30 0030
- * Time: 15:23
+ * Time: 15:23
- */
+ */
-declare(strict_types=1);
+declare(strict_types=1);
-
+
-namespace Database;
+namespace Database;
-
+
-
+
-use Exception;
+use Exception;
-use Kiri\Abstracts\Component;
+use Kiri\Abstracts\Component;
-use Kiri\Di\Container;
+use Kiri\Di\Container;
-use PDO;
+use PDO;
-use Throwable;
+use Throwable;
-
+
-/**
+/**
- * Class Command
+ * Class Command
- * @package Database
+ * @package Database
- */
+ */
-class Command extends Component
+class Command extends Component
-{
+{
-
+
-    public Connection $connection;
+	/** @var int 数据库操作最大重试次数 */
-    public ?string    $sql    = '';
+	private const MAX_RETRIES = 2;
-    public array      $params = [];
+
-
+	public Connection $connection;
-    /**
+	public ?string    $sql    = '';
-     * @param array $params
+	public array      $params = [];
-     * @throws
+	
-     */
+	/**
-    public function __construct(array $params = [])
+	 * @param array $params
-    {
+	 * @throws
-        parent::__construct();
+	 */
-        Container::configure($this, $params);
+	public function __construct(array $params = [])
-    }
+	{
-
+		parent::__construct();
-
+		Container::configure($this, $params);
-    /**
+	}
-     * @return bool
+	
-     * @throws
+	
-     */
+	/**
-    public function incrOrDecr(): bool
+	 * @return bool
-    {
+	 * @throws
-        return (bool)$this->_prepare();
+	 */
-    }
+	public function incrOrDecr(): bool
-
+	{
-    /**
+		return (bool)$this->_prepare();
-     * @return bool
+	}
-     * @throws
+	
-     */
+	
-    public function save(): bool
+	/**
-    {
+	 * @return bool|array
-        return (bool)$this->_prepare();
+	 * @throws
-    }
+	 */
-
+	public function all(): bool|array
-
+	{
-    /**
+		return $this->search('fetchAll');
-     * @return bool|array
+	}
-     * @throws
+	
-     */
+	/**
-    public function all(): bool|array
+	 * @return array|bool|null
-    {
+	 * @throws
-        return $this->search('fetchAll');
+	 */
-    }
+	public function one(): array|null|bool
-
+	{
-    /**
+		return $this->search('fetch');
-     * @return array|bool|null
+	}
-     * @throws
+	
-     */
+	/**
-    public function one(): array|null|bool
+	 * @return bool
-    {
+	 * @throws Exception
-        return $this->search('fetch');
+	 */
-    }
+	public function exists(): bool
-
+	{
-    /**
+		$data = $this->search('fetch');
-     * @return bool
+		if (!$data) {
-     * @throws Exception
+			return false;
-     */
+		}
-    public function exists(): bool
+		return true;
-    {
+	}
-        $data = $this->search('fetch');
+	
-        if (!$data) {
+	/**
-            return false;
+	 * @return mixed
-        }
+	 * @throws
-        return true;
+	 */
-    }
+	public function fetchColumn(): mixed
-
+	{
-    /**
+		return $this->search('fetchColumn');
-     * @return mixed
+	}
-     * @throws
+	
-     */
+	/**
-    public function fetchColumn(): mixed
+	 * @return mixed
-    {
+	 * @throws
-        return $this->search('fetchColumn');
+	 */
-    }
+	public function rowCount(): int
-
+	{
-    /**
+		$data = $this->search('fetch');
-     * @return mixed
+		
-     * @throws
+		return !$data ? 0 : +current($data);
-     */
+	}
-    public function rowCount(): int
+	
-    {
+	
-        $data = $this->search('fetch');
+	/**
-
+	 * 执行查询类 SQL 操作，内置断连重试机制
-        return !$data ? 0 : +current($data);
+	 * 当数据库连接断开时自动重试，断开的连接不再归还池中防止污染连接池
-    }
+	 * @param string $method PDO 结果获取方法名
-
+	 * @return mixed
-
+	 * @throws
-    /**
+	 */
-     * @param string $method
+	protected function search(string $method): mixed
-     * @return mixed
+	{
-     * @throws
+		$retryCount = 0;
-     */
+
-    protected function search(string $method): mixed
+		while ($retryCount <= self::MAX_RETRIES) {
-    {
+			$client = $this->connection->getConnection();
-        $client = $this->connection->getConnection();
+			try {
-        try {
+				$startTime = microtime(true);
-            if (($prepare = $client->prepare($this->sql)) === false) {
+				if (($prepare = $client->prepare($this->sql)) === false) {
-                throw new Exception('(' . $prepare->errorInfo()[0] . ')' . $client->errorInfo()[2]);
+					throw new Exception('(' . $prepare->errorInfo()[0] . ')' . $client->errorInfo()[2]);
-            }
+				}
-
+				
-            $prepare->execute($this->params);
+				$prepare->execute($this->params);
-
+				
-            $result = $method == 'rowCount' ? $prepare->rowCount() : $prepare->{$method}(PDO::FETCH_ASSOC);
+				$result = $method == 'rowCount' ? $prepare->rowCount() : $prepare->{$method}(PDO::FETCH_ASSOC);
-            $prepare->closeCursor();
+				$prepare->closeCursor();
-
+				
-            $this->connection->println($this->sql, $this->params);
+				$this->connection->println($startTime, microtime(true), $this->sql, $this->params);
-
+				
-            return $result;
+				$this->connection->release($client);
-        } catch (Throwable $throwable) {
+				return $result;
-            if ($this->isRefresh($throwable)) return $this->search($method);
+			} catch (Throwable $throwable) {
-
+				$this->getLogger()->json_log($throwable);
-            $errorMsg = $throwable->getMessage() . PHP_EOL . '                 Sql: ' . $this->sql . '.' . json_encode($this->params);
+				
-
+				if ($this->isRefresh($throwable) && $retryCount < self::MAX_RETRIES) {
-            return $this->getLogger()->failure($errorMsg . PHP_EOL, 'mysql');
+					$retryCount++;
-        } finally {
+					$this->connection->connections->abandon($this->connection->getName());
-            $this->connection->release($client);
+					continue;
-        }
+				}
-    }
+				
-
+				$this->connection->release($client);
-
+				
-    /**
+				$errorMsg = $throwable->getMessage() . PHP_EOL . '                 Sql: ' . $this->sql . '.' . json_encode($this->params);
-     * @return bool
+				
-     * @throws
+				return $this->getLogger()->logCategory($errorMsg . PHP_EOL, 'mysql');
-     */
+			}
-    public function flush(): bool
+		}
-    {
+
-        return (bool)$this->_prepare();
+		$errorMsg = 'Max retry exceeded for SQL: ' . $this->sql;
-    }
+		return $this->getLogger()->logCategory($errorMsg, 'mysql');
-
+	}
-
+	
-    /**
+	
-     * @return int|bool
+	/**
-     * @throws
+	 * @return bool
-     */
+	 * @throws
-    private function _prepare(): int|bool
+	 */
-    {
+	public function flush(): bool
-        $client = $this->connection->getConnection();
+	{
-        try {
+		return (bool)$this->_prepare();
-            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]);
+	 * 执行写入类 SQL 操作，内置断连重试机制
-            }
+	 * 当数据库连接断开时自动重试，断开的连接不再归还池中防止污染连接池
-            $prepare->closeCursor();
+	 * @return int|bool
-
+	 * @throws
-            $result = $client->lastInsertId();
+	 */
-
+	private function _prepare(): int|bool
-            $this->connection->println($this->sql, $this->params);
+	{
-
+		$retryCount = 0;
-            return $result == 0 ? $prepare->rowCount() : (int)$result;
+
-        } catch (Throwable $throwable) {
+		while ($retryCount <= self::MAX_RETRIES) {
-            if ($this->isRefresh($throwable)) return $this->_prepare();
+			$client = $this->connection->getConnection();
-
+			try {
-            $errorMsg = $throwable->getMessage() . PHP_EOL . '                 Sql: ' . $this->sql . '.' . json_encode($this->params);
+				$startTime = microtime(true);
-
+				if (($prepare = $client->prepare($this->sql)) === false) {
-            return $this->getLogger()->failure($errorMsg . PHP_EOL, 'mysql');
+					throw new Exception('(' . $prepare->errorInfo()[0] . ')' . $prepare->errorInfo()[2]);
-        } finally {
+				}
-            $this->connection->release($client);
+				if ($prepare->execute($this->params) === false) {
-        }
+					throw new Exception('(' . $prepare->errorInfo()[0] . ')' . $prepare->errorInfo()[2]);
-    }
+				}
-
+				
-
+				$prepare->closeCursor();
-    /**
+				
-     * @param Throwable $throwable
+				$result = $client->lastInsertId();
-     * @return bool
+				
-     */
+				$this->connection->println($startTime, microtime(true), $this->sql, $this->params);
-    protected function isRefresh(Throwable $throwable): bool
+				if (str_starts_with($this->sql, 'DELETE')) {
-    {
+					$this->connection->release($client);
-        if (str_contains($throwable->getMessage(), 'MySQL server has gone away')) {
+					return $prepare->rowCount();
-            return true;
+				}
-        }
+				
-        if (str_contains($throwable->getMessage(), 'Send of 14 bytes failed with errno=32 Broken pipe')) {
+				$this->connection->release($client);
-            return true;
+				return $result == 0 ? $prepare->rowCount() : (int)$result;
-        }
+			} catch (Throwable $throwable) {
-        if (str_contains($throwable->getMessage(), 'Lost connection to MySQL server during query')) {
+				$this->getLogger()->json_log($throwable);
-            return true;
+				
-        }
+				if ($this->isRefresh($throwable) && $retryCount < self::MAX_RETRIES) {
-        return false;
+					$retryCount++;
-    }
+					$this->connection->connections->abandon($this->connection->getName());
-
+					continue;
-
+				}
-    /**
+				
-     * @return bool
+				$this->connection->release($client);
-     * @throws
+				
-     */
+				$errorMsg = $throwable->getMessage() . PHP_EOL . '                 Sql: ' . $this->sql . '.' . json_encode($this->params, JSON_UNESCAPED_UNICODE);
-    public function delete(): bool
+				
-    {
+				return $this->getLogger()->logCategory($errorMsg . PHP_EOL, 'mysql');
-        return (bool)$this->_prepare();
+			}
-    }
+		}
-
+
-
+		$errorMsg = 'Max retry exceeded for SQL: ' . $this->sql;
-    /**
+		return $this->getLogger()->logCategory($errorMsg, 'mysql');
-     * @return int|bool
+	}
-     */
+	
-    public function exec(): int|bool
+	
-    {
+	/**
-        return $this->_prepare();
+	 * @param Throwable $throwable
-    }
+	 * @return bool
-
+	 */
-    /**
+	protected function isRefresh(Throwable $throwable): bool
-     * @param array $data
+	{
-     * @return $this
+		$message = $throwable->getMessage();
-     */
+		
-    public function bindValues(array $data = []): static
+		// MySQL 错误处理
-    {
+		if (str_contains($message, 'MySQL server has gone away')) {
-        if (count($data) > 0) {
+			return true;
-            $this->params = array_merge($this->params, $data);
+		}
-        }
+		if (str_contains($message, 'Send of 14 bytes failed with errno=32 Broken pipe')) {
-        return $this;
+			return true;
-    }
+		}
-
+		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
+	 * @throws
+	 */
+	public function delete(): bool
+	{
+		return $this->_prepare();
+	}
+	
+	
+	/**
+	 * @return int|bool
+	 */
+	public function exec(): int|bool
+	{
+		return $this->_prepare();
+	}
+	
+	/**
+	 * @param array $data
+	 * @return $this
+	 */
+	public function bindValues(array $data = []): static
+	{
+		if (count($data) > 0) {
+			$this->params = array_merge($this->params, $data);
+		}
+		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];
@@ -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);
+        $this->eventProvider->on(BeginTransaction::class, [$this, 'beginTransaction'], 0);
-        $eventProvider->on(BeginTransaction::class, [$this, 'beginTransaction'], 0);
+        $this->eventProvider->on(Rollback::class, [$this, 'rollback'], 0);
-        $eventProvider->on(Rollback::class, [$this, 'rollback'], 0);
+        $this->eventProvider->on(Commit::class, [$this, 'commit'], 0);
-        $eventProvider->on(Commit::class, [$this, 'commit'], 0);
+        $this->eventProvider->on(OnAfterRequest::class, [$this, 'clear']);
-        $eventProvider->on(OnAfterRequest::class, [$this, 'clear']);
+        $this->eventProvider->on(OnWorkerExit::class, [$this, 'disconnect']);
-        $eventProvider->on(OnWorkerExit::class, [$this, 'disconnect']);
+        $this->eventProvider->on(OnWorkerStart::class, [$this, 'tick']);
-        $eventProvider->on(OnWorkerStart::class, [$this, 'tick']);
+        $this->eventProvider->on(OnTaskerStart::class, [$this, 'tick']);
-        $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());
+//        $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]);
-                }
+//                }
-            }
+//            }
-        }
+//        }
     }
 
 
@@ -146,7 +156,7 @@ class Connection extends Component
      */
     private function getName(): string
     {
-        return 'mysql.' . $this->cds;
+        return strtolower($this->driver) . '.' . $this->cds;
     }
 
 
@@ -238,61 +248,65 @@ class Connection extends Component
     }
 
 
-    /**
+    /**
-     * @throws
+     * @throws
-     * 事务回滚
+     * 事务回滚
-     */
+     */
-    public function rollback(): void
+    public function rollback(): void
-    {
+    {
-        $this->storey--;
+        $this->storey--;
-        if ($this->storey == 0) {
+        if ($this->storey == 0) {
-            if (!Context::exists($this->cds)) {
+            if (!Context::exists($this->cds)) {
-                return;
+                return;
-            }
+            }
-            $pdo = $this->getTransactionClient();
+            $pdo = $this->getTransactionClient();
-            if ($pdo->inTransaction()) {
+            if ($pdo->inTransaction()) {
-                $pdo->rollback();
+                $pdo->rollback();
-            }
+            }
-            $this->release($pdo);
+            $this->release($pdo);
-        }
+            Context::remove($this->cds);
-    }
+        }
-
+    }
-    /**
+
-     * @throws
+    /**
-     * 事务提交
+     * @throws
-     */
+     * 事务提交
-    public function commit(): void
+     */
-    {
+    public function commit(): void
-        $this->storey--;
+    {
-        if ($this->storey == 0) {
+        $this->storey--;
-            if (!Context::exists($this->cds)) {
+        if ($this->storey == 0) {
-                return;
+            if (!Context::exists($this->cds)) {
-            }
+                return;
-            $pdo = $this->getTransactionClient();
+            }
-            if ($pdo->inTransaction()) {
+            $pdo = $this->getTransactionClient();
-                $pdo->commit();
+            if ($pdo->inTransaction()) {
-            }
+                $pdo->commit();
-            $this->release($pdo);
+            }
-        }
+            $this->release($pdo);
-    }
+            Context::remove($this->cds);
-
+        }
-
+    }
-    /**
+
-     * @return void
+
-     * @throws
+    /**
-     */
+     * @return void
-    public function clear(): void
+     * @throws
-    {
+     */
-        /** @var PDO $pdo */
+    public function clear(): void
-        $pdo = Context::get($this->cds);
+    {
-        if ($pdo === null) {
+        /** @var PDO $pdo */
-            return;
+        $pdo = Context::get($this->cds);
-        }
+        if ($pdo === null) {
-        if ($this->inTransaction()) {
+            return;
-            $pdo->rollback();
+        }
-        }
+        if ($this->inTransaction()) {
-        $this->release($pdo);
+            $pdo->rollback();
-    }
+        }
+        $this->release($pdo);
+        Context::remove($this->cds);
+        $this->storey = 0;
+    }
 
 
     /**
@@ -303,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);
     }
 
 
@@ -347,16 +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 = new \PDO('mysql:dbname=' . $this->database . ';host=' . $this->cds, $this->username, $this->password, [
+        $options = [
-            \PDO::ATTR_CASE               => \PDO::CASE_NATURAL,
+            \PDO::ATTR_CASE              => \PDO::CASE_NATURAL,
-            \PDO::ATTR_ERRMODE            => \PDO::ERRMODE_EXCEPTION,
+            \PDO::ATTR_ERRMODE           => \PDO::ERRMODE_EXCEPTION,
-            \PDO::ATTR_ORACLE_NULLS       => \PDO::NULL_NATURAL,
+            \PDO::ATTR_ORACLE_NULLS      => \PDO::NULL_NATURAL,
-            \PDO::ATTR_STRINGIFY_FETCHES  => false,
+            \PDO::ATTR_STRINGIFY_FETCHES => false,
-            \PDO::ATTR_EMULATE_PREPARES   => true,
+            \PDO::ATTR_EMULATE_PREPARES  => true,
-            \PDO::ATTR_TIMEOUT            => $this->timeout,
+            \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'] ?? [],

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 di(Relation::class)->get($this->name);
-        return $relation->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 di(Relation::class)->get($this->name);
-        return $relation->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 di(Relation::class)->first($this->name);
-        return $relation->first($this->name);
     }
 }

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);
+		}
     }
 
     /**
@@ -266,22 +269,23 @@ class Model extends Base\Model
 
 
     /**
-     * @param ModelInterface|string $modelName
+     * @param string $modelName
      * @param string $foreignKey
      * @param string $localKey
      * @return string
      * @throws Exception
      */
-    private function _hasBase(ModelInterface|string $modelName, string $foreignKey, string $localKey): string
+    private function _hasBase(string $modelName, string $foreignKey, string $localKey): string
     {
         if (($value = $this->{$localKey}) === null) {
             throw new Exception("Need join table primary key.");
         }
 
-        $relation = $this->getRelation();
+        $relation = di(Relation::class);
 
-        $primaryKey = $modelName . $foreignKey . $value;
+        $primaryKey = str_replace('\\', '_', $modelName) . '_' . $foreignKey . '_' . $value;
         if (!$relation->hasIdentification($primaryKey)) {
+	        /** @var $modelName ModelInterface */
             $relation->bindIdentification($primaryKey, $modelName::query()->where([$foreignKey => $value]));
         }
         return $primaryKey;
@@ -289,60 +293,61 @@ class Model extends Base\Model
 
 
     /**
-     * @param ModelInterface|string $modelName
+     * @param string $modelName
      * @param string $foreignKey
      * @param string $localKey
      * @return HasOne|ActiveQuery
      * @throws Exception
      */
-    public function hasOne(ModelInterface|string $modelName, string $foreignKey, string $localKey): HasOne|ActiveQuery
+    public function hasOne(string $modelName, string $foreignKey, string $localKey): HasOne|ActiveQuery
     {
         return new HasOne($this->_hasBase($modelName, $foreignKey, $localKey));
     }
 
 
     /**
-     * @param ModelInterface|string $modelName
+     * @param string $modelName
      * @param string $foreignKey
      * @param string $localKey
      * @return ActiveQuery|HasCount
      * @throws Exception
      */
-    public function hasCount(ModelInterface|string $modelName, string $foreignKey, string $localKey): ActiveQuery|HasCount
+    public function hasCount(string $modelName, string $foreignKey, string $localKey): ActiveQuery|HasCount
     {
         return new HasCount($this->_hasBase($modelName, $foreignKey, $localKey));
     }
 
 
     /**
-     * @param ModelInterface|string $modelName
+     * @param string $modelName
      * @param string $foreignKey
      * @param string $localKey
      * @return ActiveQuery|HasMany
      * @throws Exception
      */
-    public function hasMany(ModelInterface|string $modelName, string $foreignKey, string $localKey): ActiveQuery|HasMany
+    public function hasMany(string $modelName, string $foreignKey, string $localKey): ActiveQuery|HasMany
     {
         return new HasMany($this->_hasBase($modelName, $foreignKey, $localKey));
     }
 
     /**
-     * @param ModelInterface|string $modelName
+     * @param string $modelName
      * @param string $foreignKey
      * @param string $localKey
      * @return ActiveQuery|HasMany
      * @throws Exception
      */
-    public function hasIn(ModelInterface|string $modelName, string $foreignKey, string $localKey): ActiveQuery|HasMany
+    public function hasIn(string $modelName, string $foreignKey, string $localKey): ActiveQuery|HasMany
     {
         if (($value = $this->{$localKey}) === null) {
             throw new Exception("Need join table primary key.");
         }
 
-        $relation = $this->getRelation();
+        $relation = di(Relation::class);
 
-        $primaryKey = $modelName . $foreignKey . json_encode($value, JSON_UNESCAPED_UNICODE);
+        $primaryKey = str_replace('\\', '_', $modelName) . '_' . $foreignKey . '_' . implode('_', $value);
         if (!$relation->hasIdentification($primaryKey)) {
+			/** @var $modelName ModelInterface */
             $relation->bindIdentification($primaryKey, $modelName::query()->whereIn($foreignKey, $value));
         }
 

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)) {
+        if (!Context::exists($_identification)) {
-            return Context::get($_identification);
+            Context::set($_identification, $this->_query[$_identification]->first());
         }
-        $activeModel = $this->_query[$_identification]->first();
+        return Context::get($_identification);
-        unset($this->_query[$_identification]);
-        return Context::set($_identification, $activeModel);
     }
 
 
@@ -69,12 +69,10 @@ class Relation extends Component
      */
     public function count(string $_identification): mixed
     {
-        if (Context::exists($_identification)) {
+        if (!Context::exists($_identification)) {
-            return Context::get($_identification);
+            Context::set($_identification, $this->_query[$_identification]->count());
         }
-        $activeModel = $this->_query[$_identification]->count();
+        return Context::get($_identification);
-        unset($this->_query[$_identification]);
-        return Context::set($_identification, $activeModel);
     }
 
 
@@ -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();
+        return Context::get($_identification);
-        unset($this->_query[$_identification]);
-        return Context::set($_identification, $activeModel);
     }
 
 }

SqlBuilder.php

@@ -1,411 +1,470 @@
-<?php /** @noinspection ALL */
+<?php
-
+/** @noinspection ALL */
-declare(strict_types=1);
+
-
+declare(strict_types=1);
-namespace Database;
+
-
+namespace Database;
-
+
-use JetBrains\PhpStorm\Pure;
+
-use Kiri;
+use JetBrains\PhpStorm\Pure;
-use Kiri\Abstracts\Component;
+use Kiri;
-
+use Kiri\Abstracts\Component;
-
+use Database\Traits\QueryTrait;
-/**
+
- * Class SqlBuilder
+
- * @package Database
+/**
- */
+ * Class SqlBuilder
-class SqlBuilder extends Component
+ * @package Database
-{
+ */
-
+class SqlBuilder extends Component
-    /**
+{
-     * @var ActiveQuery|Query|ISqlBuilder|null
+
-     */
+    /**
-    public ActiveQuery|Query|ISqlBuilder|null $query;
+     * @var ActiveQuery|Query|ISqlBuilder|null
-
+     */
-
+    public ActiveQuery|Query|ISqlBuilder|null $query;
-    /**
+
-     * @param ActiveQuery|Query|ISqlBuilder|null $config
+
-     */
+    /**
-    public function __construct(ActiveQuery|Query|null|ISqlBuilder $config)
+     * @param ActiveQuery|Query|ISqlBuilder|null $config
-    {
+     */
-        parent::__construct();
+    public function __construct(ActiveQuery|Query|null|ISqlBuilder $config)
-
+    {
-        $this->query = $config;
+        parent::__construct();
-    }
+
-
+        $this->query = $config;
-
+    }
-    /**
+
-     * @param ISqlBuilder|null $query
+
-     * @return $this
+    /**
-     * @throws
+     * @param ISqlBuilder|null $query
-     */
+     * @return $this
-    public static function builder(ISqlBuilder|null $query): static
+     * @throws
-    {
+     */
-        return new static($query);
+    public static function builder(ISqlBuilder|null $query): static
-    }
+    {
-
+        return new static($query);
-
+    }
-    /**
+
-     * @return string
+
-     * @throws
+    /**
-     */
+     * @return string
-    public function getCondition(): string
+     * @throws
-    {
+     */
-        return $this->where($this->query->where);
+    public function getCondition(): string
-    }
+    {
-
+        return $this->where($this->query->where);
-
+    }
-    /**
+
-     * @param array $compiler
+
-     * @return string
+    /**
-     * @throws
+     * @param array $compiler
-     */
+     * @return string
-    public function hashCompiler(array $compiler): string
+     * @throws
-    {
+     */
-        return $this->where($compiler);
+    public function hashCompiler(array $compiler): string
-    }
+    {
-
+        return $this->where($compiler);
-
+    }
-    /**
+
-     * @param array $attributes
+
-     * @return bool|array
+    /**
-     * @throws
+     * @param array $attributes
-     */
+     * @return bool|array
-    public function update(array $attributes): bool|string
+     * @throws
-    {
+     */
-        $conditions          = $this->query->params;
+    public function update(array $attributes): bool|string
-        $this->query->params = [];
+    {
-        $data                = $this->__updateBuilder($this->makeParams($attributes));
+        $conditions  = $this->query;
-        foreach ($conditions as $condition) {
+        $this->query = [];
-            $this->query->pushParam($condition);
+        $data        = $this->__updateBuilder($this->makeParams($attributes));
-        }
+        foreach ($conditions as $condition) {
-        return $data;
+            $this->query->pushParam($condition);
-    }
+        }
-
+        return $data;
-
+    }
-    /**
+
-     * @param array $attributes
+
-     * @param string $opera
+    /**
-     * @return bool|array
+     * @param array $attributes
-     * @throws
+     * @param string $opera
-     */
+     * @return bool|array
-    public function mathematics(array $attributes, string $opera = '+'): bool|string
+     * @throws
-    {
+     */
-        $string = [];
+    public function mathematics(array $attributes, string $opera = '+'): bool|string
-        foreach ($attributes as $attribute => $value) {
+    {
-            $string[] = $attribute . '=' . $attribute . $opera . $value;
+        $string = [];
-        }
+        foreach ($attributes as $attribute => $value) {
-        return $this->__updateBuilder($string);
+            $string[] = $attribute . '=' . $attribute . $opera . $value;
-    }
+        }
-
+        return $this->__updateBuilder($string);
-
+    }
-    /**
+
-     * @param array $string
+
-     * @return string|bool
+    /**
-     * @throws
+     * @param array $string
-     */
+     * @return string|bool
-    private function __updateBuilder(array $string): string|bool
+     * @throws
-    {
+     */
-        if (empty($string)) {
+    private function __updateBuilder(array $string): string|bool
-            return Kiri::getLogger()->failure('None data update.');
+    {
-        }
+        if (empty($string)) {
-        return 'UPDATE ' . $this->query->from . ' SET ' . implode(',', $string) . $this->make();
+            return Kiri::getLogger()->logCategory('None data update.');
-    }
+        }
-
+        return 'UPDATE ' . $this->getFromAlias() . ' SET ' . implode(',', $string) . $this->make();
-
+    }
-    /**
+
-     * @param array $attributes
+
-     * @param false $isBatch
+    /**
-     * @return array
+     * @param array $attributes
-     * @throws
+     * @param false $isBatch
-     */
+     * @return array
-    public function insert(array $attributes, bool $isBatch = false): string
+     * @throws
-    {
+     */
-        $update = 'INSERT INTO ' . $this->query->from;
+    public function insert(array $attributes, bool $isBatch = false): string
-        if ($isBatch === false) {
+    {
-            $attributes = [$attributes];
+        $update = 'INSERT INTO ' . $this->getFromAlias();
-        }
+        if ($isBatch === false) {
-        $update .= '(' . implode(',', $this->getFields($attributes)) . ') VALUES ';
+            $attributes = [$attributes];
-
+        }
-        $keys = [];
+        $update .= '(' . implode(',', $this->getFields($attributes)) . ') VALUES ';
-        foreach ($attributes as $attribute) {
+
-            $_keys = $this->makeParams($attribute, true);
+        $keys = [];
-
+        foreach ($attributes as $attribute) {
-            $keys[] = implode(',', $_keys);
+            $_keys = $this->makeParams($attribute, true);
-        }
+
-        return $update . '(' . implode('),(', $keys) . ')';
+            $keys[] = implode(',', $_keys);
-    }
+        }
-
+        return $update . '(' . implode('),(', $keys) . ')';
-
+    }
-    /**
+
-     * @return string
+
-     * @throws
+    /**
-     */
+     * @return string
-    public function delete(): string
+     * @throws
-    {
+     */
-        return 'DELETE FROM ' . $this->query->from . $this->make();
+    public function delete(): string
-    }
+    {
-
+        return 'DELETE FROM ' . $this->getFromAlias() . $this->make();
-
+    }
-    /**
+
-     * @param $attributes
+
-     * @return array
+    /**
-     */
+     * @param $attributes
-    #[Pure] private function getFields(array $attributes): array
+     * @return array
-    {
+     */
-        return array_keys(current($attributes));
+    #[Pure] private function getFields(array $attributes): array
-    }
+    {
-
+        return array_keys(current($attributes));
-
+    }
-    /**
+
-     * @param array $attributes
+
-     * @param bool $isInsert
+    /**
-     * @return array[]
+     * @param array $attributes
-     * a=:b,
+     * @param bool $isInsert
-     */
+     * @return array[]
-    private function makeParams(array $attributes, bool $isInsert = false): array
+     * a=:b,
-    {
+     */
-        $keys = [];
+    private function makeParams(array $attributes, bool $isInsert = false): array
-        foreach ($attributes as $key => $value) {
+    {
-            if ($isInsert === true) {
+        $keys = [];
-                $keys[] = '?';
+        foreach ($attributes as $key => $value) {
-                $this->query->pushParam($value);
+            if ($isInsert === true) {
-            } else {
+                $keys[] = '?';
-                $keys = $this->resolveParams($key, $value, $keys);
+                $this->query->pushParam($value);
-            }
+            } else {
-        }
+                $keys = $this->resolveParams($key, $value, $keys);
-        return $keys;
+            }
-    }
+        }
-
+        return $keys;
-
+    }
-    /**
+
-     * @param string $key
+
-     * @param mixed $value
+    /**
-     * @param array $keys
+     * @param string $key
-     * @return array
+     * @param mixed $value
-     */
+     * @param array $keys
-    private function resolveParams(string $key, mixed $value, array $keys): array
+     * @return array
-    {
+     */
-        if (is_null($value)) {
+    private function resolveParams(string $key, mixed $value, array $keys): array
-            return $keys;
+    {
-        }
+        if (is_null($value)) {
-        if (is_string($value) && $this->isMath($value)) {
+            return $keys;
-            $keys[] = $key . '=' . $key . ' ' . $value;
+        }
-        } else {
+        if (preg_match('/^[+|-]\s\d+$/', (string)$value)) {
-            $this->query->pushParam($value);
+            $keys[] = $key . '=' . $key . ' ' . $value;
-            $keys[] = $key . '= ?';
+        } else {
-        }
+            $this->query->pushParam($value);
-        return $keys;
+            $keys[] = $key . '= ?';
-    }
+        }
-
+        return $keys;
-
+    }
-    /**
+
-     * @param string $value
+
-     * @return bool
+    /**
-     */
+     * @return string
-    private function isMath(string $value): bool
+     * @throws
-    {
+     */
-        return str_starts_with($value, '+ ') || str_starts_with($value, '- ');
+    public function one(): string
-    }
+    {
-
+        $this->query->offset(0)->limit(1);
-
+        return $this->makeSelect($this->query) . $this->make() . $this->makeLimit();
-    /**
+    }
-     * @return string
+
-     * @throws
+
-     */
+    /**
-    public function one(): string
+     * @return string
-    {
+     * @throws
-        return $this->makeSelect($this->query->select) . $this->make() . $this->makeLimit($this->query->limit(1));
+     */
-    }
+    public function all(): string
-
+    {
-
+        return $this->makeSelect($this->query) . $this->make() . $this->makeLimit();
-    /**
+    }
-     * @return string
+
-     * @throws
+
-     */
+    /**
-    public function all(): string
+     * @return string
-    {
+     * @throws
-        return $this->makeSelect($this->query->select) . $this->make() . $this->makeLimit($this->query);
+     */
-    }
+    public function count(): string
-
+    {
-
+        return $this->makeSelect(['COUNT(*)']) . $this->make();
-    /**
+    }
-     * @return string
+
-     * @throws
+
-     */
+    /**
-    public function count(): string
+     * @return string
-    {
+     * @throws
-        return $this->makeSelect(['COUNT(*)']) . $this->make();
+     */
-    }
+    public function exists(): string
-
+    {
-
+        return $this->makeSelect(['0']) . $this->make();
-    /**
+    }
-     * @return string
+
-     * @throws
+
-     */
+    /**
-    public function exists(): string
+     * @param string $table
-    {
+     * @return string
-        return $this->makeSelect(['0']) . $this->make();
+     * @throws
-    }
+     */
-
+    public function columns(string $table): string
-
+    {
-    /**
+        $driver = $this->getDriver();
-     * @param string $table
+        if (in_array($driver, ['pgsql', 'postgresql'])) {
-     * @return string
+            $tableName = trim($table, '"`');
-     */
+            return "SELECT 
-    public function columns(string $table): string
+                column_name as Field,
-    {
+                data_type as Type,
-        return 'SHOW FULL FIELDS FROM ' . $table;
+                is_nullable as Null,
-    }
+                column_default as Default,
-
+                '' as Extra,
-
+                '' as Key
-    /**
+            FROM information_schema.columns 
-     * @return string
+            WHERE table_name = '$tableName' 
-     * @throws
+            ORDER BY ordinal_position";
-     */
+        }
-    private function make(): string
+        return 'SHOW FULL FIELDS FROM ' . $table;
-    {
+    }
-        $select = $this->makeCondition();
+
-        $select .= $this->makeGroup();
+
-        $select .= $this->makeOrder();
+    /**
-        return $select;
+     * @return string
-    }
+     * @throws
-
+     */
-    /**
+    private function make(): string
-     * @param array $select
+    {
-     * @return string
+        $select = $this->makeCondition();
-     */
+        $select .= $this->makeGroup();
-    private function makeSelect(array $select = ['*']): string
+        $select .= $this->makeOrder();
-    {
+        return $select;
-        $select = "SELECT " . implode(',', $select) . " FROM " . $this->query->from;
+    }
-        if ($this->query->alias != "") {
+
-            $select .= " AS " . $this->query->alias;
+    /**
-        }
+     * @param mixed $select 列名数组或 QueryTrait 对象
-        if (count($this->query->join) > 0) {
+     * @return string
-            $select .= ' ' . implode(' ', $this->query->join);
+     */
-        }
+    private function makeSelect(mixed $select = ['*']): string
-        return $select;
+    {
-    }
+        if (!is_array($select)) {
-
+            $select = ['*'];
-
+        }
-    /**
+        $sql = "SELECT " . implode(',', $select) . " FROM " . $this->getFromAlias();
-     * @return string
+        if ($this->query->join !== []) {
-     */
+            $sql .= ' ' . implode(' ', $this->query->join);
-    private function makeGroup(): string
+        }
-    {
+        return $sql;
-        if ($this->query->group != "") {
+    }
-            return ' GROUP BY ' . $this->query->group;
+
-        }
+
-        return '';
+    /**
-    }
+     * @return string
-
+     */
-
+    private function makeGroup(): string
-    /**
+    {
-     * @return string
+        if ($this->query->group !== '' && $this->query->group !== '0') {
-     */
+            return ' GROUP BY ' . $this->query->group;
-    private function makeOrder(): string
+        }
-    {
+        return '';
-        if (count($this->query->order) > 0) {
+    }
-            return ' ORDER BY ' . implode(',', $this->query->order);
+
-        }
+
-        return '';
+    /**
-    }
+     * @return string
-
+     */
-
+    private function makeOrder(): string
-    /**
+    {
-     * @return string
+        if (count($this->query->order) > 0) {
-     */
+            return ' ORDER BY ' . implode(',', $this->query->order);
-    private function makeCondition(): string
+        }
-    {
+        return '';
-        $condition = $this->where($this->query->where);
+    }
-        if (empty($condition)) {
+
-            return '';
+
-        }
+    /**
-        return ' WHERE ' . $condition;
+     * @return string
-    }
+     */
-
+    private function makeCondition(): string
-
+    {
-    private function makeLimit(): string
+        $condition = $this->where($this->query->where);
-    {
+        if (empty($condition)) {
-        if ($this->query->offset >= 0 && $this->query->limit >= 1) {
+            return '';
-            return ' LIMIT ' . $this->query->offset . ',' . $this->query->limit;
+        }
-        }
+        return ' WHERE ' . $condition;
-        return '';
+    }
-    }
+
-
+
-
+    /**
-    /**
+     * @return string
-     * @param false $isCount
+     * @throws
-     * @return string
+     */
-     * @throws
+    private function makeLimit(): string
-     */
+    {
-    public function get(bool $isCount = false): string
+        if ($this->query->offset >= 0 && $this->query->limit >= 1) {
-    {
+            $driver = $this->getDriver();
-        if ($isCount === false) {
+            if (in_array($driver, ['pgsql', 'postgresql'])) {
-            return $this->all();
+                return ' LIMIT ' . $this->query->limit . ' OFFSET ' . $this->query->offset;
-        }
+            }
-        return $this->count();
+            return ' LIMIT ' . $this->query->offset . ',' . $this->query->limit;
-    }
+        }
-
+        return '';
-
+    }
-    /**
+
-     * @return string
+
-     * @throws
+    /**
-     */
+     * @param false $isCount
-    public function truncate(): string
+     * @return string
-    {
+     * @throws
-        return sprintf('TRUNCATE %s', $this->query->from);
+     */
-    }
+    public function get(bool $isCount = false): string
-
+    {
-
+        if ($isCount === false) {
-    /**
+            return $this->all();
-     * @param array $where
+        }
-     * @return string
+        return $this->count();
-     */
+    }
-    private function where(array $where): string
+
-    {
+
-        if (count($where) < 1) {
+    /**
-            return '';
+     * @return string
-        }
+     * @throws
-        $_tmp = [];
+     */
-        foreach ($where as $key => $value) {
+    public function truncate(): string
-            $_tmp[] = $this->resolveCondition($key, $value);
+    {
-        }
+        return sprintf('TRUNCATE %s', $this->getFromAlias());
-        return implode(' AND ', $_tmp);
+    }
-    }
+
-
+
-
+    /**
-    /**
+     * @param array $where
-     * @param string $field
+     * @return string
-     * @param mixed $condition
+     */
-     * @return string
+    private function where(array $where): string
-     */
+    {
-    private function resolveCondition(string|int $field, mixed $condition): string
+        if (count($where) < 1) {
-    {
+            return '';
-        if (is_string($field)) {
+        }
-            $this->query->pushParam($condition);
+        $_tmp = [];
-            return $field . ' = ?';
+        foreach ($where as $key => $value) {
-        } else if (is_string($condition)) {
+            $_tmp[] = $this->resolveCondition($key, $value);
-            return $condition;
+        }
-        } else {
+        return implode(' AND ', $_tmp);
-            return implode(' AND ', $this->_hashMap($condition));
+    }
-        }
+
-    }
+
-
+    /**
-
+     * @param string $field
-    /**
+     * @param mixed $condition
-     * @param $condition
+     * @return string
-     * @return array
+     */
-     */
+    private function resolveCondition(string|int $field, mixed $condition): string
-    private function _hashMap(array $condition): array
+    {
-    {
+        if (is_string($field)) {
-        $_array = [];
+            $this->query->pushParam($condition);
-        foreach ($condition as $key => $value) {
+            return $field . ' = ?';
-            $this->query->pushParam($value);
+        } else if (is_string($condition)) {
-            $_array[] = $key . '= ?';
+            return $condition;
-        }
+        } else {
-        return $_array;
+            return implode(' AND ', $this->_hashMap($condition));
-    }
+        }
-
+    }
-
+
-}
+
+    /**
+     * @param $condition
+     * @return array
+     */
+    private function _hashMap(array $condition): array
+    {
+        $_array = [];
+        foreach ($condition as $key => $value) {
+            $this->query->pushParam($value);
+            $_array[] = $key . '= ?';
+        }
+        return $_array;
+    }
+
+    /**
+     * 获取数据库驱动类型
+     * @return string
+     * @throws
+     */
+    private function getDriver(): string
+    {
+        try {
+            if ($this->query instanceof ActiveQuery && $this->query->modelClass !== null) {
+                if ($this->query->modelClass instanceof Model) {
+                    $connection = $this->query->modelClass->getConnection();
+                    if ($connection instanceof Connection) {
+                        return strtolower($connection->driver ?? 'mysql');
+                    }
+                }
+            }
+            if (method_exists($this->query, 'getConnection')) {
+                $connection = $this->query->getConnection();
+                if ($connection instanceof Connection) {
+                    return strtolower($connection->driver ?? 'mysql');
+                }
+            }
+        } catch (\Throwable $e) {
+			$this->getLogger()->json_log($e);
+		}
+        return 'mysql';
+    }
+
+
+	/**
+	 * 获取 FROM 子句（表名 + 别名）
+	 * QueryTrait 对象有 $from 和 $alias 属性
+	 * @return string
+	 */
+	private function getFromAlias(): string
+	{
+		$from = $this->query->from;
+		if ($this->query->alias !== '' && $this->query->alias !== '0') {
+			$from .= ' AS ' . $this->query->alias;
+		}
+		return $from;
+	}
+
+
+}

Traits/HasBase.php

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

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

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();