变更

Command.php

@@ -61,59 +61,39 @@ class Command extends Component
 
 
 	/**
-	 * @return array|null
+	 * @return bool|array|null
 	 * @throws Exception
 	 */
-	public function all(): ?array
+	public function all(): null|bool|array
 	{
-		$pdo = $this->db->getSlaveClient();
+		return $this->_query(self::FETCH_ALL);
-
-		$result = $pdo->fetchAll($this->sql, $this->params);
-
-		$this->db->release($pdo);
-		return $result;
 	}
 
 	/**
-	 * @return array|null
+	 * @return bool|array|null
 	 * @throws Exception
 	 */
-	public function one(): ?array
+	public function one(): null|bool|array
 	{
-		$pdo = $this->db->getSlaveClient();
+		return $this->_query(self::FETCH);
-
-		$result = $pdo->fetch($this->sql, $this->params);
-
-		$this->db->release($pdo);
-		return $result;
 	}
 
 	/**
-	 * @return mixed
+	 * @return bool|array|null
 	 * @throws Exception
 	 */
-	public function fetchColumn(): mixed
+	public function fetchColumn(): null|bool|array
 	{
-		$pdo = $this->db->getSlaveClient();
+		return $this->_query(self::FETCH_COLUMN);
-
-		$result = $pdo->fetchColumn($this->sql, $this->params);
-
-		$this->db->release($pdo);
-		return $result;
 	}
 
 	/**
-	 * @return int|null
+	 * @return int|bool
 	 * @throws Exception
 	 */
-	public function rowCount(): ?int
+	public function rowCount(): int|bool
 	{
-		$pdo = $this->db->getSlaveClient();
+		return $this->_query(self::ROW_COUNT);
-
-		$result = $pdo->rowCount($this->sql, $this->params);
-
-		$this->db->release($pdo);
-		return $result;
 	}
 
 
@@ -140,15 +120,75 @@ class Command extends Component
 	 */
 	private function _execute(): bool|int
 	{
-		$pdo = $this->db->getPdo();
+		return $this->result(static function (PDO $pdo) {
+			$prepare = $pdo->prepare($this->sql);
+			if ($prepare === false || $prepare->execute($this->params) === false) {
+				throw new Exception(($prepare ?? $pdo)->errorInfo()[1]);
+			}
 
-		$result = $pdo->execute($this->sql, $this->params);
+			$result = (int)$pdo->lastInsertId();
+			$prepare->closeCursor();
 
-		$this->db->release($pdo);
+			return $result == 0 ? true : $result;
-
+		});
-		return $result == 0 ? true : $result;
 	}
 
+	/**
+	 * @param string $type
+	 * @return bool|array|int|null
+	 * @throws Exception
+	 */
+	private function _query(string $type): bool|array|int|null
+	{
+		return $this->result(static function (PDO $pdo) use ($type) {
+			$prepare = $pdo->query($this->sql);
+			if ($prepare === false || $prepare->execute($this->params) === false) {
+				throw new Exception(($prepare ?? $pdo)->errorInfo()[1]);
+			}
+			$result = match ($type) {
+				Command::FETCH_COLUMN => $prepare->fetchColumn(PDO::FETCH_ASSOC),
+				Command::ROW_COUNT => $prepare->rowCount(),
+				Command::FETCH_ALL => $prepare->fetchAll(PDO::FETCH_ASSOC),
+				Command::FETCH => $prepare->fetch(PDO::FETCH_ASSOC),
+			};
+			$prepare->closeCursor();
+			return $result;
+		});
+	}
+
+
+	/**
+	 * @param \Closure $callback
+	 * @return bool|mixed
+	 * @throws Exception
+	 */
+	private function result(\Closure $callback): mixed
+	{
+		$pdo = $this->db->getPdo();
+		try {
+			return $callback($pdo);
+		} catch (\Throwable $throwable) {
+			if (str_contains($throwable->getMessage(), 'MySQL server has gone away')) {
+				return $this->result($callback);
+			}
+			return $this->error($throwable);
+		} finally {
+			$this->db->release($pdo);
+		}
+	}
+
+
+	/**
+	 * @param \Throwable $throwable
+	 * @return bool
+	 */
+	private function error(\Throwable $throwable): bool
+	{
+		$message = $this->sql . '(' . json_encode($this->params, JSON_UNESCAPED_UNICODE) . ');';
+		return $this->logger->addError($message . PHP_EOL . $throwable->getMessage(), 'mysql');
+	}
+
+
 	/**
 	 * @return array<Mysql\PDO, PDOStatement>|bool
 	 * @throws Exception

Connection.php

@@ -150,10 +150,10 @@ class Connection extends Component
 
 
 	/**
-	 * @return Mysql\PDO
+	 * @return PDO
 	 * @throws Exception
 	 */
-	public function getMasterClient(): Mysql\PDO
+	public function getMasterClient(): PDO
 	{
 		$client = $this->connection->get($this->cds);
 		if ($client === false) {
@@ -163,10 +163,10 @@ class Connection extends Component
 	}
 
 	/**
-	 * @return Mysql\PDO
+	 * @return PDO
 	 * @throws Exception
 	 */
-	public function getSlaveClient(): Mysql\PDO
+	public function getSlaveClient(): PDO
 	{
 		$client = $this->connection->get($this->cds);
 		if ($client === false) {
@@ -189,10 +189,10 @@ class Connection extends Component
 
 	/**
 	 * @param bool $restore
-	 * @return Mysql\PDO
+	 * @return PDO
-	 * @throws ConfigException
+	 * @throws Exception
 	 */
-	public function getPdo(bool $restore = false): Mysql\PDO
+	public function getPdo(bool $restore = false): PDO
 	{
 		if ($restore === true) {
 			return Context::set($this->cds, $this->getMasterClient());
@@ -258,7 +258,7 @@ class Connection extends Component
 	 * 回收链接
 	 * @throws
 	 */
-	public function release(Mysql\PDO $PDO)
+	public function release(PDO $PDO)
 	{
 		if ($PDO->inTransaction() === false) {
 			$this->connection->addItem($this->cds, $PDO);
@@ -267,16 +267,6 @@ class Connection extends Component
 	}
 
 
-	/**
-	 * @param bool $isMaster
-	 * @return string
-	 */
-	private function alias(bool $isMaster): string
-	{
-		return !$isMaster ? ($this->slaveConfig['cds'] ?? $this->cds) . 'slave' : $this->cds . 'master';
-	}
-
-
 	/**
 	 *
 	 * 回收链接
@@ -284,8 +274,7 @@ class Connection extends Component
 	 */
 	public function clear_connection()
 	{
-		$this->connection->connection_clear($this->alias(true));
+		$this->connection->connection_clear($this->cds);
-		$this->connection->connection_clear($this->alias(false));
 	}
 
 
@@ -294,8 +283,7 @@ class Connection extends Component
 	 */
 	public function disconnect()
 	{
-		$this->connection->connection_clear($this->alias(true));
+		$this->connection->connection_clear($this->cds);
-		$this->connection->connection_clear($this->alias(false));
 	}
 
 }