eee

Base/Model.php

@@ -487,6 +487,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
 			return TRUE;
 		}
 		$generate = SqlBuilder::builder($query)->update($change);
+		var_dump($generate, $query->params);
 		if ($generate === FALSE) {
 			return FALSE;
 		}

Command.php

@@ -23,6 +23,9 @@ use Throwable;
 class Command extends Component
 {
 
+	/** @var int 数据库操作最大重试次数 */
+	private const MAX_RETRIES = 2;
+
 	public Connection $connection;
 	public ?string    $sql    = '';
 	public array      $params = [];
@@ -101,12 +104,17 @@ class Command extends Component
 
 
 	/**
-	 * @param string $method
+	 * 执行查询类 SQL 操作，内置断连重试机制
+	 * 当数据库连接断开时自动重试，断开的连接不再归还池中防止污染连接池
+	 * @param string $method PDO 结果获取方法名
 	 * @return mixed
 	 * @throws
 	 */
 	protected function search(string $method): mixed
 	{
+		$retryCount = 0;
+
+		while ($retryCount <= self::MAX_RETRIES) {
 			$client = $this->connection->getConnection();
 			try {
 				$startTime = microtime(true);
@@ -121,22 +129,28 @@ class Command extends Component
 
 				$this->connection->println($startTime, microtime(true), $this->sql, $this->params);
 
+				$this->connection->release($client);
 				return $result;
 			} catch (Throwable $throwable) {
 				$this->getLogger()->json_log($throwable);
 
-			if ($this->isRefresh($throwable)) {
+				if ($this->isRefresh($throwable) && $retryCount < self::MAX_RETRIES) {
-				return $this->search($method);
+					$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');
-		} finally {
-			$this->connection->release($client);
 			}
 		}
 
+		return $this->getLogger()->logCategory('Max retry exceeded for SQL: ' . $this->sql, 'mysql');
+	}
+
 
 	/**
 	 * @return bool
@@ -149,17 +163,24 @@ class Command extends Component
 
 
 	/**
+	 * 执行写入类 SQL 操作，内置断连重试机制
+	 * 当数据库连接断开时自动重试，断开的连接不再归还池中防止污染连接池
 	 * @return int|bool
 	 * @throws
 	 */
 	private function _prepare(): int|bool
 	{
+		$retryCount = 0;
+
+		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]);
 				}
@@ -170,25 +191,32 @@ class Command extends Component
 
 				$this->connection->println($startTime, microtime(true), $this->sql, $this->params);
 				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)) {
+				if ($this->isRefresh($throwable) && $retryCount < self::MAX_RETRIES) {
-				return $this->_prepare();
+					$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');
-		} finally {
-			$this->connection->release($client);
 			}
 		}
 
+		return $this->getLogger()->logCategory('Max retry exceeded for SQL: ' . $this->sql, 'mysql');
+	}
+
 
 	/**
 	 * @param Throwable $throwable

Connection.php

@@ -154,7 +154,7 @@ class Connection extends Component
     /**
      * @return string
      */
-    private function getName(): string
+    public function getName(): string
     {
         return strtolower($this->driver) . '.' . $this->cds;
     }
@@ -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;
     }
 
 
@@ -368,9 +372,9 @@ class Connection extends Component
         ];
         
         // MySQL 特定的选项
-        if ($driver === 'mysql') {
+//        if ($driver === 'mysql') {
-            $options[\PDO::MYSQL_ATTR_INIT_COMMAND] = 'SET NAMES ' . $this->charset;
+//            $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) {

DatabasesProviders.php

@@ -35,7 +35,7 @@ class DatabasesProviders extends Providers
             return;
         }
         foreach ($databases as $key => $database) {
-            $this->set($key, $this->_settings($database));
+            $this->set($key, $this->_settings($key, $database));
         }
     }
 
@@ -64,14 +64,15 @@ class DatabasesProviders extends Providers
 
 
 	/**
+	 * @param string $key
 	 * @param array  $database
 	 * @return array
 	 */
-    private function _settings(array $database): array
+    private function _settings(string $key, array $database): array
     {
         $clientPool = $database['pool'] ?? ['min' => 1, 'max' => 5, 'tick' => 60];
         return [
-            'id'          => $database['id'],
+            'id'          => $key,
             'cds'         => $database['cds'],
             'class'       => Connection::class,
             'username'    => $database['username'],

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);
+		return $this->where($this->query->where);
 	}
 
 
@@ -74,13 +75,13 @@ class SqlBuilder extends Component
 	 */
 	public function update(array $attributes): bool|string
 	{
-        $conditions  = $this->query;
+		$params              = $this->query->params;
-        $this->query = [];
+		$this->query->params = [];
-        $data        = $this->__updateBuilder($this->makeParams($attributes));
+		$array               = $this->makeParams($attributes);
-        foreach ($conditions as $condition) {
+		foreach ($params as $name => $value) {
-            $this->query->pushParam($condition);
+			$this->query->pushParam($value);
 		}
-        return $data;
+		return $this->__updateBuilder($array);
 	}
 
 
@@ -110,7 +111,8 @@ class SqlBuilder extends Component
 		if (empty($string)) {
 			return Kiri::getLogger()->logCategory('None data update.');
 		}
-        return 'UPDATE ' . $this->query . ' SET ' . implode(',', $string) . $this->make();
+
+		return 'UPDATE ' . $this->getFromAlias() . ' ' . 'SET' . ' ' . implode(', ', $string) . ' ' . $this->make();
 	}
 
 
@@ -122,7 +124,7 @@ class SqlBuilder extends Component
 	 */
 	public function insert(array $attributes, bool $isBatch = false): string
 	{
-        $update = 'INSERT INTO ' . $this->query;
+		$update = 'INSERT INTO ' . $this->getFromAlias(true);
 		if ($isBatch === false) {
 			$attributes = [$attributes];
 		}
@@ -144,7 +146,7 @@ class SqlBuilder extends Component
 	 */
 	public function delete(): string
 	{
-        return 'DELETE FROM ' . $this->query . $this->make();
+		return 'DELETE FROM ' . $this->getFromAlias() . ' ' . $this->make();
 	}
 
 
@@ -152,7 +154,8 @@ class SqlBuilder extends Component
 	 * @param $attributes
 	 * @return array
 	 */
-    #[Pure] private function getFields(array $attributes): array
+	#[Pure]
+	private function getFields(array $attributes): array
 	{
 		return array_keys(current($attributes));
 	}
@@ -207,7 +210,7 @@ class SqlBuilder extends Component
 	public function one(): string
 	{
 		$this->query->offset(0)->limit(1);
-        return $this->makeSelect($this->query) . $this->make() . $this->makeLimit();
+		return $this->all();
 	}
 
 
@@ -217,7 +220,7 @@ class SqlBuilder extends Component
 	 */
 	public function all(): string
 	{
-        return $this->makeSelect($this->query) . $this->make() . $this->makeLimit();
+		return $this->makeSelect($this->query->select) . ' ' . $this->make() . ' ' . $this->makeLimit();
 	}
 
 
@@ -227,7 +230,7 @@ class SqlBuilder extends Component
 	 */
 	public function count(): string
 	{
-        return $this->makeSelect(['COUNT(*)']) . $this->make();
+		return $this->makeSelect(['COUNT(*)']) . ' ' . $this->make();
 	}
 
 
@@ -237,7 +240,7 @@ class SqlBuilder extends Component
 	 */
 	public function exists(): string
 	{
-        return $this->makeSelect(['0']) . $this->make();
+		return $this->makeSelect(['0']) . ' ' . $this->make();
 	}
 
 
@@ -250,7 +253,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 +265,6 @@ class SqlBuilder extends Component
             WHERE table_name = '$tableName' 
             ORDER BY ordinal_position";
 		}
-        // MySQL 使用 SHOW FULL FIELDS
 		return 'SHOW FULL FIELDS FROM ' . $table;
 	}
 
@@ -274,26 +275,23 @@ class SqlBuilder extends Component
 	 */
 	private function make(): string
 	{
-        $select = $this->makeCondition();
+		return $this->makeCondition() . ' ' . $this->makeGroup() . ' ' . $this->makeOrder();
-        $select .= $this->makeGroup();
-        $select .= $this->makeOrder();
-        return $select;
 	}
 
 	/**
-     * @param array $select
+	 * @param mixed $select 列名数组或 QueryTrait 对象
 	 * @return string
 	 */
-    private function makeSelect(array $select = ['*']): string
+	private function makeSelect(mixed $select = ['*']): string
 	{
-        $select = "SELECT " . implode(',', $select) . " FROM " . $this->query;
+		if (!is_array($select)) {
-        if ($this->query != "") {
+			$select = ['*'];
-            $select .= " AS " . $this->query;
 		}
-        if (count($this->query) > 0) {
+		$sql = 'SELECT ' . implode(',', $select) . ' FROM ' . $this->getFromAlias();
-            $select .= ' ' . implode(' ', $this->query);
+		if ($this->query->join !== []) {
+			$sql .= ' ' . implode(' ', $this->query->join);
 		}
-        return $select;
+		return $sql;
 	}
 
 
@@ -302,8 +300,8 @@ class SqlBuilder extends Component
 	 */
 	private function makeGroup(): string
 	{
-        if ($this->query != "") {
+		if ($this->query->group !== '' && $this->query->group !== '0') {
-            return ' GROUP BY ' . $this->query;
+			return 'GROUP BY ' . $this->query->group;
 		}
 		return '';
 	}
@@ -314,8 +312,8 @@ class SqlBuilder extends Component
 	 */
 	private function makeOrder(): string
 	{
-        if (count($this->query) > 0) {
+		if (count($this->query->order) > 0) {
-            return ' ORDER BY ' . implode(',', $this->query);
+			return 'ORDER BY ' . implode(',', $this->query->order);
 		}
 		return '';
 	}
@@ -326,7 +324,7 @@ class SqlBuilder extends Component
 	 */
 	private function makeCondition(): string
 	{
-        $condition = $this->where($this->query);
+		$condition = $this->where($this->query->where);
 		if (empty($condition)) {
 			return '';
 		}
@@ -340,14 +338,12 @@ class SqlBuilder extends Component
 	 */
 	private function makeLimit(): string
 	{
-        if ($this->query >= 0 && $this->query >= 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 . ' OFFSET ' . $this->query;
 			}
-            // MySQL 使用 LIMIT offset,limit 语法
+			return 'LIMIT ' . $this->query->offset . ',' . $this->query->limit;
-            return ' LIMIT ' . $this->query . ',' . $this->query;
 		}
 		return '';
 	}
@@ -373,7 +369,7 @@ class SqlBuilder extends Component
 	 */
 	public function truncate(): string
 	{
-        return sprintf('TRUNCATE %s', $this->query);
+		return sprintf('TRUNCATE %s', $this->getFromAlias());
 	}
 
 
@@ -434,7 +430,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 +438,6 @@ class SqlBuilder extends Component
 					}
 				}
 			}
-            // 如果是 Db 查询，尝试获取默认 connection
 			if (method_exists($this->query, 'getConnection')) {
 				$connection = $this->query->getConnection();
 				if ($connection instanceof Connection) {
@@ -451,12 +445,29 @@ class SqlBuilder extends Component
 				}
 			}
 		} catch (\Throwable $e) {
-            // 忽略错误，返回默认值
 			$this->getLogger()->json_log($e);
 		}
-        // 默认返回 mysql
 		return 'mysql';
 	}
 
 
+	/**
+	 * 获取 FROM 子句（表名 + 别名）
+	 * QueryTrait 对象有 $from 和 $alias 属性
+	 * @return string
+	 */
+	private function getFromAlias(bool $insert = false): string
+	{
+		$from = $this->query->from;
+		if ($insert) {
+			return $from;
+		}
+
+		if ($this->query->alias !== '' && $this->query->alias !== '0') {
+			$from .= ' AS ' . $this->query->alias;
+		}
+		return $from;
+	}
+
+
 }

Traits/QueryTrait.php

@@ -116,6 +116,18 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 	}
 
 
+	public function __get(string $name)
+	{
+		if (property_exists($this, $name)) {
+			return $this->$name;
+		}
+		if (method_exists($this, $name)) {
+			return $this->$name();
+		}
+		return parent::__get($name); // TODO: Change the autogenerated stub
+	}
+
+
 	/**
 	 * Comply constructor.
 	 * @throws