eee

ActiveQuery.php

@@ -288,6 +288,6 @@ class ActiveQuery extends QueryTrait implements ISqlBuilder
 	 */
 	public function delete(): bool
 	{
-		return $this->buildCommand($this->builder->delete())->delete();
+		return (bool)$this->buildCommand($this->builder->delete())->exec();
 	}
 }

Command.php

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

Connection.php

@@ -264,6 +264,7 @@ class Connection extends Component
                 $pdo->rollback();
             }
             $this->release($pdo);
+            Context::remove($this->cds);
         }
     }
 
@@ -283,6 +284,7 @@ class Connection extends Component
                 $pdo->commit();
             }
             $this->release($pdo);
+            Context::remove($this->cds);
         }
     }
 
@@ -302,6 +304,8 @@ class Connection extends Component
             $pdo->rollback();
         }
         $this->release($pdo);
+        Context::remove($this->cds);
+        $this->storey = 0;
     }
 
 

Model.php

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

SqlBuilder.php

@@ -9,6 +9,7 @@ namespace Database;
 use JetBrains\PhpStorm\Pure;
 use Kiri;
 use Kiri\Abstracts\Component;
+use Database\Traits\QueryTrait;
 
 
 /**
@@ -52,7 +53,7 @@ class SqlBuilder extends Component
      */
     public function getCondition(): string
     {
-        return $this->where($this->query->getWhere());
+        return $this->where($this->query->where);
     }
 
 
@@ -74,9 +75,9 @@ class SqlBuilder extends Component
      */
     public function update(array $attributes): bool|string
     {
-        $conditions = $this->query->getParams();
+        $conditions  = $this->query;
-        $this->query->setParams([]);
+        $this->query = [];
-        $data = $this->__updateBuilder($this->makeParams($attributes));
+        $data        = $this->__updateBuilder($this->makeParams($attributes));
         foreach ($conditions as $condition) {
             $this->query->pushParam($condition);
         }
@@ -110,7 +111,7 @@ class SqlBuilder extends Component
         if (empty($string)) {
             return Kiri::getLogger()->logCategory('None data update.');
         }
-        return 'UPDATE ' . $this->query->getFrom() . ' SET ' . implode(',', $string) . $this->make();
+        return 'UPDATE ' . $this->getFromAlias() . ' SET ' . implode(',', $string) . $this->make();
     }
 
 
@@ -122,7 +123,7 @@ class SqlBuilder extends Component
      */
     public function insert(array $attributes, bool $isBatch = false): string
     {
-        $update = 'INSERT INTO ' . $this->query->getFrom();
+        $update = 'INSERT INTO ' . $this->getFromAlias();
         if ($isBatch === false) {
             $attributes = [$attributes];
         }
@@ -144,7 +145,7 @@ class SqlBuilder extends Component
      */
     public function delete(): string
     {
-        return 'DELETE FROM ' . $this->query->getFrom() . $this->make();
+        return 'DELETE FROM ' . $this->getFromAlias() . $this->make();
     }
 
 
@@ -207,7 +208,7 @@ class SqlBuilder extends Component
     public function one(): string
     {
         $this->query->offset(0)->limit(1);
-        return $this->makeSelect($this->query->getSelect()) . $this->make() . $this->makeLimit();
+        return $this->makeSelect($this->query) . $this->make() . $this->makeLimit();
     }
 
 
@@ -217,7 +218,7 @@ class SqlBuilder extends Component
      */
     public function all(): string
     {
-        return $this->makeSelect($this->query->getSelect()) . $this->make() . $this->makeLimit();
+        return $this->makeSelect($this->query) . $this->make() . $this->makeLimit();
     }
 
 
@@ -250,7 +251,6 @@ class SqlBuilder extends Component
     {
         $driver = $this->getDriver();
         if (in_array($driver, ['pgsql', 'postgresql'])) {
-            // PostgreSQL 使用 information_schema
             $tableName = trim($table, '"`');
             return "SELECT 
                 column_name as Field,
@@ -263,7 +263,6 @@ class SqlBuilder extends Component
             WHERE table_name = '$tableName' 
             ORDER BY ordinal_position";
         }
-        // MySQL 使用 SHOW FULL FIELDS
         return 'SHOW FULL FIELDS FROM ' . $table;
     }
 
@@ -281,19 +280,19 @@ class SqlBuilder extends Component
     }
 
     /**
-     * @param array $select
+     * @param mixed $select 列名数组或 QueryTrait 对象
      * @return string
      */
-    private function makeSelect(array $select = ['*']): string
+    private function makeSelect(mixed $select = ['*']): string
     {
-        $select = "SELECT " . implode(',', $select) . " FROM " . $this->query->getFrom();
+        if (!is_array($select)) {
-        if ($this->query->getAlias() != "") {
+            $select = ['*'];
-            $select .= " AS " . $this->query->getAlias();
         }
-        if (count($this->query->getJoin()) > 0) {
+        $sql = "SELECT " . implode(',', $select) . " FROM " . $this->getFromAlias();
-            $select .= ' ' . implode(' ', $this->query->getJoin());
+        if ($this->query->join !== []) {
+            $sql .= ' ' . implode(' ', $this->query->join);
         }
-        return $select;
+        return $sql;
     }
 
 
@@ -302,8 +301,8 @@ class SqlBuilder extends Component
      */
     private function makeGroup(): string
     {
-        if ($this->query->getGroup() != "") {
+        if ($this->query->group !== '' && $this->query->group !== '0') {
-            return ' GROUP BY ' . $this->query->getGroup();
+            return ' GROUP BY ' . $this->query->group;
         }
         return '';
     }
@@ -314,8 +313,8 @@ class SqlBuilder extends Component
      */
     private function makeOrder(): string
     {
-        if (count($this->query->getOrder()) > 0) {
+        if (count($this->query->order) > 0) {
-            return ' ORDER BY ' . implode(',', $this->query->getOrder());
+            return ' ORDER BY ' . implode(',', $this->query->order);
         }
         return '';
     }
@@ -326,7 +325,7 @@ class SqlBuilder extends Component
      */
     private function makeCondition(): string
     {
-        $condition = $this->where($this->query->getWhere());
+        $condition = $this->where($this->query->where);
         if (empty($condition)) {
             return '';
         }
@@ -340,14 +339,12 @@ class SqlBuilder extends Component
      */
     private function makeLimit(): string
     {
-        if ($this->query->getOffset() >= 0 && $this->query->getLimit() >= 1) {
+        if ($this->query->offset >= 0 && $this->query->limit >= 1) {
             $driver = $this->getDriver();
             if (in_array($driver, ['pgsql', 'postgresql'])) {
-                // PostgreSQL 使用 LIMIT ... OFFSET ... 语法
+                return ' LIMIT ' . $this->query->limit . ' OFFSET ' . $this->query->offset;
-                return ' LIMIT ' . $this->query->getLimit() . ' OFFSET ' . $this->query->getOffset();
             }
-            // MySQL 使用 LIMIT offset,limit 语法
+            return ' LIMIT ' . $this->query->offset . ',' . $this->query->limit;
-            return ' LIMIT ' . $this->query->getOffset() . ',' . $this->query->getLimit();
         }
         return '';
     }
@@ -373,7 +370,7 @@ class SqlBuilder extends Component
      */
     public function truncate(): string
     {
-        return sprintf('TRUNCATE %s', $this->query->getFrom());
+        return sprintf('TRUNCATE %s', $this->getFromAlias());
     }
 
 
@@ -434,7 +431,6 @@ class SqlBuilder extends Component
     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();
@@ -443,7 +439,6 @@ class SqlBuilder extends Component
                     }
                 }
             }
-            // 如果是 Db 查询，尝试获取默认 connection
             if (method_exists($this->query, 'getConnection')) {
                 $connection = $this->query->getConnection();
                 if ($connection instanceof Connection) {
@@ -451,12 +446,25 @@ class SqlBuilder extends Component
                 }
             }
         } catch (\Throwable $e) {
-            // 忽略错误，返回默认值
 			$this->getLogger()->json_log($e);
 		}
-        // 默认返回 mysql
         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/QueryTrait.php

@@ -27,26 +27,93 @@ use Kiri\Abstracts\Component;
  */
 abstract class QueryTrait extends Component implements ActiveQueryInterface, ISqlBuilder
 {
-	protected array      $where  = [];
+	public array         $where  = [] {
-	protected array      $select = ['t1.*'];
+		&get {
-	protected array      $join   = [];
+			return $this->where;
-	protected array      $order  = [];
+		}
-	protected int        $offset = -1;
+	}
-	protected int        $limit  = -1;
+	public array         $select = ['t1.*'] {
-	protected string     $group  = '';
+		&get {
-	protected string     $from   = '';
+			return $this->select;
-	protected string     $alias  = '';
+		}
-	protected array      $filter = [];
+	}
+	public array         $join   = [] {
+		&get {
+			return $this->join;
+		}
+	}
+	public array         $order  = [] {
+		&get {
+			return $this->order;
+		}
+	}
+	public int           $offset = -1 {
+		get {
+			return $this->offset;
+		}
+		set {
+			$this->offset = $value;
+		}
+	}
+	public int           $limit  = -1 {
+		get {
+			return $this->limit;
+		}
+		set {
+			$this->limit = $value;
+		}
+	}
+	public string        $group  = '' {
+		get {
+			return $this->group;
+		}
+		set {
+			$this->group = $value;
+		}
+	}
+	public string        $from   = '' {
+		get {
+			return $this->from;
+		}
+		set {
+			$this->from = $value;
+		}
+	}
+	public string        $alias  = '' {
+		get {
+			return $this->alias;
+		}
+		set {
+			$this->alias = $value;
+		}
+	}
+	protected array      $filter = [] {
+		&get {
+			return $this->filter;
+		}
+	}
 	protected bool       $lock   = FALSE;
 	protected SqlBuilder $builder;
-	protected array      $params = [];
+	public array         $params = [] {
-	protected array      $_alias = [];
+		&get {
+			return $this->params;
+		}
+	}
+	protected array      $_alias = [] {
+		&get {
+			return $this->_alias;
+		}
+	}
 
 
 	/**
 	 * @var ModelInterface|string|null
 	 */
-	protected ModelInterface|string|null $modelClass;
+	protected ModelInterface|string|null $modelClass {
+		get {
+			return $this->modelClass;
+		}
+	}
 
 
 	/**
@@ -63,29 +130,9 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 	}
 
 
-	/**
-	 * @return mixed
-	 */
-	public function getModelClass(): mixed
-	{
-		return $this->modelClass;
-	}
-
-
-	/**
-	 * @param array $where
-	 *
-	 * @return void
-	 */
-	public function setWhere(array $where): void
-	{
-		$this->where = $where;
-	}
-
-
 	/**
 	 * @param Closure|Query $callback
-	 * @param array $attributes
+	 * @param array         $attributes
 	 *
 	 * @return $this
 	 */
@@ -93,7 +140,7 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 	{
 		if ($callback instanceof Query) {
 			$this->where[] = 'NOT EXISTS(' . $callback->build() . ')';
-			$this->mergeParams($callback->getParams());
+			$this->mergeParams($callback->params);
 		} else {
 			$this->where[] = 'NOT EXISTS(' . $this->makeClosureFunction($callback) . ')';
 		}
@@ -106,7 +153,7 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 
 	/**
 	 * @param Closure|Query $callback
-	 * @param array $attributes
+	 * @param array         $attributes
 	 *
 	 * @return $this
 	 */
@@ -114,7 +161,7 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 	{
 		if ($callback instanceof Query) {
 			$this->where[] = 'EXISTS(' . $callback->build() . ')';
-			$this->mergeParams($callback->getParams());
+			$this->mergeParams($callback->params);
 		} else {
 			$this->where[] = 'EXISTS(' . $this->makeClosureFunction($callback) . ')';
 		}
@@ -125,194 +172,6 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 	}
 
 
-	/**
-	 * @param array $select
-	 *
-	 * @return void
-	 */
-	public function setSelect(array $select): void
-	{
-		$this->select = $select;
-	}
-
-
-	/**
-	 * @param array $join
-	 *
-	 * @return void
-	 */
-	public function setJoin(array $join): void
-	{
-		$this->join = $join;
-	}
-
-
-	/**
-	 * @param array $order
-	 *
-	 * @return void
-	 */
-	public function setOrder(array $order): void
-	{
-		$this->order = $order;
-	}
-
-
-	/**
-	 * @param int $offset
-	 *
-	 * @return void
-	 */
-	public function setOffset(int $offset): void
-	{
-		$this->offset = $offset;
-	}
-
-
-	/**
-	 * @param int $limit
-	 *
-	 * @return void
-	 */
-	public function setLimit(int $limit): void
-	{
-		$this->limit = $limit;
-	}
-
-
-	/**
-	 * @param string $group
-	 *
-	 * @return void
-	 */
-	public function setGroup(string $group): void
-	{
-		$this->group = $group;
-	}
-
-
-	/**
-	 * @param string $from
-	 *
-	 * @return void
-	 */
-	public function setFrom(string $from): void
-	{
-		$this->from = $from;
-	}
-
-
-	/**
-	 * @param string $alias
-	 *
-	 * @return void
-	 */
-	public function setAlias(string $alias): void
-	{
-		$this->alias = $alias;
-	}
-
-	/**
-	 * @param array $params
-	 *
-	 * @return void
-	 */
-	public function setParams(array $params): void
-	{
-		$this->params = $params;
-	}
-
-
-	/**
-	 * @return array
-	 */
-	public function getWhere(): array
-	{
-		return $this->where;
-	}
-
-
-	/**
-	 * @return array|string[]
-	 */
-	public function getSelect(): array
-	{
-		return $this->select;
-	}
-
-
-	/**
-	 * @return array
-	 */
-	public function getJoin(): array
-	{
-		return $this->join;
-	}
-
-
-	/**
-	 * @return array
-	 */
-	public function getOrder(): array
-	{
-		return $this->order;
-	}
-
-
-	/**
-	 * @return int
-	 */
-	public function getOffset(): int
-	{
-		return $this->offset;
-	}
-
-
-	/**
-	 * @return int
-	 */
-	public function getLimit(): int
-	{
-		return $this->limit;
-	}
-
-
-	/**
-	 * @return string
-	 */
-	public function getGroup(): string
-	{
-		return $this->group;
-	}
-
-
-	/**
-	 * @return string
-	 */
-	public function getFrom(): string
-	{
-		return $this->from;
-	}
-
-
-	/**
-	 * @return string
-	 */
-	public function getAlias(): string
-	{
-		return $this->alias;
-	}
-
-
-	/**
-	 * @return array
-	 */
-	public function getParams(): array
-	{
-		return $this->params;
-	}
-
-
 	/**
 	 * @param array $params
 	 * @return void
@@ -326,7 +185,7 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 
 
 	/**
-	 * @param string $column
+	 * @param string   $column
 	 * @param callable $callable
 	 *
 	 * @return $this
@@ -465,7 +324,7 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 	{
 		if ($tableName instanceof Query) {
 			$this->from = '(' . $tableName->build() . ')';
-			$this->mergeParams($tableName->getParams());
+			$this->mergeParams($tableName->params);
 		} else if ($tableName instanceof Closure) {
 			$this->from = '(' . $this->makeClosureFunction($tableName) . ')';
 		} else if (class_exists($tableName)) {
@@ -480,8 +339,8 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 	/**
 	 * @param string $tableName
 	 * @param string $alias
-	 * @param array $on
+	 * @param array  $on
-	 * @param array $param
+	 * @param array  $param
 	 *
 	 * @return $this
 	 * $query->join([$tableName, ['userId'=>'uuvOd']], $param)
@@ -563,8 +422,8 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 	/**
 	 * @param string $tableName
 	 * @param string $alias
-	 * @param array $onCondition
+	 * @param array  $onCondition
-	 * @param array $param
+	 * @param array  $param
 	 *
 	 * @return $this
 	 * @throws Exception
@@ -585,8 +444,8 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 	/**
 	 * @param string $tableName
 	 * @param string $alias
-	 * @param array $onCondition
+	 * @param array  $onCondition
-	 * @param array $param
+	 * @param array  $param
 	 *
 	 * @return $this
 	 * @throws Exception
@@ -607,8 +466,8 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 	/**
 	 * @param string $tableName
 	 * @param string $alias
-	 * @param array $onCondition
+	 * @param array  $onCondition
-	 * @param array $param
+	 * @param array  $param
 	 *
 	 * @return $this
 	 * @throws Exception
@@ -651,8 +510,8 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 
 
 	/**
-	 * @param string $lngField
+	 * @param string    $lngField
-	 * @param string $latField
+	 * @param string    $latField
 	 * @param int|float $lng1
 	 * @param int|float $lat1
 	 *
@@ -668,7 +527,7 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 
 	/**
 	 * @param string|array $column
-	 * @param string $sort
+	 * @param string       $sort
 	 *
 	 * @return $this
 	 *
@@ -736,8 +595,8 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 
 	/**
 	 * @param array|Closure|string $conditionArray
-	 * @param string $opera
+	 * @param string               $opera
-	 * @param null $value
+	 * @param null                 $value
 	 *
 	 * @return QueryTrait
 	 * @throws
@@ -816,7 +675,7 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 
 
 	/**
-	 * @param string $columns
+	 * @param string              $columns
 	 * @param array|Closure|Query $value
 	 *
 	 * @return $this
@@ -825,12 +684,13 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 	public function whereIn(string $columns, array|Closure|Query $value): static
 	{
 		if (is_array($value)) {
-			if (count($value) < 1) throw new Exception('Value must be an not empty array');
+			if (count($value) < 1)
+				throw new Exception('Value must be an not empty array');
 
 			$this->where[] = $columns . ' IN (' . implode(',', $value) . ')';
 		} else if ($value instanceof Query) {
 			$this->where[] = $columns . ' IN (' . $value->build() . ')';
-			$this->mergeParams($value->getParams());
+			$this->mergeParams($value->params);
 		} else {
 			$this->where[] = $columns . ' IN (' . $this->makeClosureFunction($value) . ')';
 		}
@@ -844,13 +704,13 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 	 */
 	public function queryInstance(): Query
 	{
-		return new Query();
+		return new Query;
 	}
 
 
 	/**
 	 * @param string $columns
-	 * @param array $value
+	 * @param array  $value
 	 *
 	 * @return $this
 	 */
@@ -865,7 +725,7 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 
 
 	/**
-	 * @param string $column
+	 * @param string    $column
 	 * @param int|float $start
 	 * @param int|float $end
 	 *
@@ -886,7 +746,7 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 
 
 	/**
-	 * @param string $column
+	 * @param string    $column
 	 * @param int|float $start
 	 * @param int|float $end
 	 *
@@ -920,7 +780,7 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 
 	/**
 	 * @param array|string $column
-	 * @param mixed $value
+	 * @param mixed        $value
 	 *
 	 * @return $this
 	 */
@@ -940,7 +800,7 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 	/**
 	 * @param string $column
 	 * @param string $opera
-	 * @param mixed $value
+	 * @param mixed  $value
 	 *
 	 * @return $this
 	 */
@@ -978,13 +838,13 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 		} else {
 			$generate->addArray($closure);
 		}
-		$this->mergeParams($generate->getParams());
+		$this->mergeParams($generate->params);
 		return $generate->build();
 	}
 
 
 	/**
-	 * @param string $name
+	 * @param string      $name
 	 * @param string|null $having
 	 *
 	 * @return $this
@@ -1060,7 +920,7 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 
 	/**
 	 * @param string $column
-	 * @param mixed $value
+	 * @param mixed  $value
 	 * @param string $opera
 	 *
 	 * @return string
@@ -1084,7 +944,7 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 
 	/**
 	 * @param string $querySql
-	 * @param array $params
+	 * @param array  $params
 	 *
 	 * @return Command
 	 */

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,7 +9,7 @@
   ],
   "license": "MIT",
   "require": {
-    "php": ">=8.4",
+    "php": ">=8.5",
     "ext-json": "*",
     "ext-pdo": "*",
     "game-worker/kiri-pool": "^v1.0"