From 67fdee8fd97c9a1144abf10eadfb68ae009fae6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=91=E6=9E=97?= <as2252258@163.com>
Date: Sun, 2 Apr 2023 19:57:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Command.php | 32 ++++++++++++--------------------
 1 file changed, 12 insertions(+), 20 deletions(-)

diff --git a/Command.php b/Command.php
index f8c55a8..d5b505d 100644
--- a/Command.php
+++ b/Command.php
@@ -69,21 +69,19 @@ class Command extends Component
 			[$pdo, $statement] = $this->search();
 
 			$statement->execute($this->params);
-			$data = $statement->fetchAll(PDO::FETCH_ASSOC);
 
-			$this->db->release($pdo);
-
-			return $data;
+			return $statement->fetchAll(PDO::FETCH_ASSOC);
 		} catch (\Throwable $throwable) {
 			if (str_contains($throwable->getMessage(), 'MySQL server has gone away')) {
 				$this->db->restore();
 
 				return $this->one();
 			}
+			return $this->printErrorMessage($throwable);
+		} finally {
 			if (isset($pdo)) {
 				$this->db->release($pdo);
 			}
-			return $this->printErrorMessage($throwable);
 		}
 	}
 
@@ -97,21 +95,19 @@ class Command extends Component
 			[$pdo, $statement] = $this->search();
 
 			$statement->execute($this->params);
-			$data = $statement->fetch(PDO::FETCH_ASSOC);
 
-			$this->db->release($pdo);
-
-			return $data;
+			return $statement->fetch(PDO::FETCH_ASSOC);
 		} catch (\Throwable $throwable) {
 			if (str_contains($throwable->getMessage(), 'MySQL server has gone away')) {
 				$this->db->restore();
 
 				return $this->one();
 			}
+			return $this->printErrorMessage($throwable);
+		} finally {
 			if (isset($pdo)) {
 				$this->db->release($pdo);
 			}
-			return $this->printErrorMessage($throwable);
 		}
 	}
 
@@ -125,21 +121,19 @@ class Command extends Component
 			[$pdo, $statement] = $this->search();
 
 			$statement->execute($this->params);
-			$data = $statement->fetchColumn(PDO::FETCH_ASSOC);
 
-			$this->db->release($pdo);
-
-			return $data;
+			return $statement->fetchColumn(PDO::FETCH_ASSOC);
 		} catch (\Throwable $throwable) {
 			if (str_contains($throwable->getMessage(), 'MySQL server has gone away')) {
 				$this->db->restore();
 
 				return $this->fetchColumn();
 			}
+			return $this->printErrorMessage($throwable);
+		} finally {
 			if (isset($pdo)) {
 				$this->db->release($pdo);
 			}
-			return $this->printErrorMessage($throwable);
 		}
 	}
 
@@ -153,21 +147,19 @@ class Command extends Component
 			[$pdo, $statement] = $this->search();
 
 			$statement->execute($this->params);
-			$data = $statement->rowCount();
 
-			$this->db->release($pdo);
-
-			return $data;
+			return $statement->rowCount();
 		} catch (\Throwable $throwable) {
 			if (str_contains($throwable->getMessage(), 'MySQL server has gone away')) {
 				$this->db->restore();
 
 				return $this->rowCount();
 			}
+			return $this->printErrorMessage($throwable);
+		} finally {
 			if (isset($pdo)) {
 				$this->db->release($pdo);
 			}
-			return $this->printErrorMessage($throwable);
 		}
 	}