Update DB.php

Author: GXhua

src/DB.php

@@ -1,13 +1,14 @@
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 /**
  * This file is part of Simps.
  *
  * @link     https://simps.io
  * @document https://doc.simps.io
  * @license  https://github.com/simple-swoole/simps/blob/master/LICENSE
  */
+
 namespace Simps\DB;
 
 use PDO;
@@ -17,16 +18,16 @@
 
 class DB
 {
+
     protected $pool;
 
     /** @var PDO */
     protected $pdo;
-
     private $in_transaction = false;
 
     public function __construct($config = null)
     {
-        if (! empty($config)) {
+        if (!empty($config)) {
             $this->pool = \Simps\DB\PDO::getInstance($config);
         } else {
             $this->pool = \Simps\DB\PDO::getInstance();
@@ -36,7 +37,13 @@ public function __construct($config = null)
     public function quote(string $string, int $parameter_type = PDO::PARAM_STR)
     {
         $this->realGetConn();
-        $ret = $this->pdo->quote($string, $parameter_type);
+        try {
+            $ret = $this->pdo->quote($string, $parameter_type);
+        } catch (\Exception $exc) {
+            $this->release($this->pdo);
+            throw $exc;
+        }
+
         $this->release($this->pdo);
         return $ret;
     }
@@ -47,7 +54,12 @@ public function beginTransaction(): void
             throw new RuntimeException('do not support nested transaction now');
         }
         $this->realGetConn();
-        $this->pdo->beginTransaction();
+        try {
+            $this->pdo->beginTransaction();
+        } catch (\Exception $exc) {
+            $this->release($this->pdo);
+            throw $exc;
+        }
         $this->in_transaction = true;
         Coroutine::defer(function () {
             if ($this->in_transaction) {
@@ -58,29 +70,46 @@ public function beginTransaction(): void
 
     public function commit(): void
     {
-        $this->pdo->commit();
         $this->in_transaction = false;
+        try {
+            $this->pdo->commit();
+        } catch (\Exception $exc) {
+            $this->release($this->pdo);
+            throw $exc;
+        }
         $this->release($this->pdo);
     }
 
     public function rollBack(): void
     {
-        $this->pdo->rollBack();
         $this->in_transaction = false;
+
+        try {
+            $this->pdo->rollBack();
+        } catch (\Exception $exc) {
+            $this->release($this->pdo);
+            throw $exc;
+        }
+
         $this->release($this->pdo);
     }
 
     public function query(string $query, array $bindings = []): array
     {
         $this->realGetConn();
+        try {
 
-        $statement = $this->pdo->prepare($query);
+            $statement = $this->pdo->prepare($query);
 
-        $this->bindValues($statement, $bindings);
+            $this->bindValues($statement, $bindings);
 
-        $statement->execute();
+            $statement->execute();
 
-        $ret = $statement->fetchAll();
+            $ret = $statement->fetchAll();
+        } catch (\Exception $exc) {
+            $this->release($this->pdo);
+            throw $exc;
+        }
 
         $this->release($this->pdo);
 
@@ -97,14 +126,19 @@ public function fetch(string $query, array $bindings = [])
     public function execute(string $query, array $bindings = []): int
     {
         $this->realGetConn();
+        try {
 
-        $statement = $this->pdo->prepare($query);
+            $statement = $this->pdo->prepare($query);
 
-        $this->bindValues($statement, $bindings);
+            $this->bindValues($statement, $bindings);
 
-        $statement->execute();
+            $statement->execute();
 
-        $ret = $statement->rowCount();
+            $ret = $statement->rowCount();
+        } catch (\Exception $exc) {
+            $this->release($this->pdo);
+            throw $exc;
+        }
 
         $this->release($this->pdo);
 
@@ -114,8 +148,14 @@ public function execute(string $query, array $bindings = []): int
     public function exec(string $sql): int
     {
         $this->realGetConn();
+        try {
+
+            $ret = $this->pdo->exec($sql);
+        } catch (\Exception $exc) {
+            $this->release($this->pdo);
+            throw $exc;
+        }
 
-        $ret = $this->pdo->exec($sql);
 
         $this->release($this->pdo);
 
@@ -126,13 +166,19 @@ public function insert(string $query, array $bindings = []): int
     {
         $this->realGetConn();
 
-        $statement = $this->pdo->prepare($query);
+        try {
+            $statement = $this->pdo->prepare($query);
+
+            $this->bindValues($statement, $bindings);
 
-        $this->bindValues($statement, $bindings);
+            $statement->execute();
 
-        $statement->execute();
+            $ret = (int) $this->pdo->lastInsertId();
+        } catch (\Exception $exc) {
+            $this->release($this->pdo);
+            throw $exc;
+        }
 
-        $ret = (int) $this->pdo->lastInsertId();
 
         $this->release($this->pdo);
 
@@ -145,7 +191,7 @@ public function release($connection = null)
             $this->in_transaction = false;
         }
 
-        if (! $this->in_transaction) {
+        if (!$this->in_transaction) {
             $this->pool->close($connection);
             return true;
         }
@@ -157,17 +203,16 @@ protected function bindValues(PDOStatementProxy $statement, array $bindings): vo
     {
         foreach ($bindings as $key => $value) {
             $statement->bindValue(
-                is_string($key) ? $key : $key + 1,
-                $value,
-                is_int($value) ? PDO::PARAM_INT : PDO::PARAM_STR
+                    is_string($key) ? $key : $key + 1, $value, is_int($value) ? PDO::PARAM_INT : PDO::PARAM_STR
             );
         }
     }
 
     private function realGetConn()
     {
-        if (! $this->in_transaction) {
+        if (!$this->in_transaction) {
             $this->pdo = $this->pool->getConnection();
         }
     }
+
 }