修复 MySQL 检查是否离线的错误码索引

src/Components/pgsql/src/Db/Contract/IPgsqlDb.php

@@ -13,5 +13,5 @@ interface IPgsqlDb extends IDb
      *
      * @param string|null $code
      */
-    public function checkCodeIsOffline($code): bool;
+    public function checkCodeIsOffline(string $sqlState, $code = null): bool;
 }

src/Components/pgsql/src/Db/Drivers/Swoole/Driver.php

@@ -268,6 +268,10 @@
                 {
                     return $this->instance->resultDiag['sqlstate'] ?? null;
                 }
+                elseif (null !== $this->instance->error)
+                {
+                    return '08006'; // connection_failure
+                }
                 else
                 {
                     return '';

src/Components/pgsql/src/Db/Drivers/SwooleNew/Driver.php

@@ -261,6 +261,10 @@
                 {
                     return $this->instance->resultDiag['sqlstate'] ?? null;
                 }
+                elseif (null !== $this->instance->error)
+                {
+                    return '08006'; // connection_failure
+                }
                 else
                 {
                     return '';

src/Components/pgsql/src/Db/Drivers/SwooleNew/Statement.php

@@ -132,6 +132,10 @@
         {
             return $this->stmt->resultDiag['sqlstate'] ?? null;
         }
+        elseif (null !== $this->stmt->error)
+        {
+            return '08006'; // connection_failure
+        }
         else
         {
             return '';

src/Components/pgsql/src/Db/PgsqlBase.php

@@ -6,6 +6,7 @@
 
 use Imi\Db\Drivers\Base;
 use Imi\Db\Query\Interfaces\IQuery;
+use Imi\Db\SqlState;
 use Imi\Pgsql\Db\Contract\IPgsqlDb;
 use Imi\Pgsql\Db\Query\PgsqlQuery;
 
@@ -29,11 +30,9 @@
 
     /**
      * {@inheritDoc}
-     *
-     * @see http://www.postgres.cn/docs/13/errcodes-appendix.html
      */
-    public function checkCodeIsOffline($code): bool
+    public function checkCodeIsOffline(string $sqlState, $code = null): bool
     {
-        return null === $code || '57P01' === $code;
+        return SqlState::checkCodeIsOffline($sqlState);
     }
 }

src/Components/swoole/src/Db/Driver/Swoole/Driver.php

@@ -94,7 +94,7 @@
         {
             return true;
         }
-        if ($this->checkCodeIsOffline($instance->errno))
+        if ($this->checkCodeIsOffline('HY000', $instance->errno))
         {
             $this->close();
         }
@@ -170,7 +170,7 @@
     {
         if (!$this->inTransaction() && !$this->instance->begin())
         {
-            if ($this->checkCodeIsOffline($this->instance->errno))
+            if ($this->checkCodeIsOffline('HY000', $this->instance->errno))
             {
                 $this->close();
             }
@@ -190,7 +190,7 @@
     {
         if (!$this->instance->commit())
         {
-            if ($this->checkCodeIsOffline($this->instance->errno))
+            if ($this->checkCodeIsOffline('HY000', $this->instance->errno))
             {
                 $this->close();
             }
@@ -219,7 +219,7 @@
         {
             $this->getTransaction()->rollBack($levels);
         }
-        elseif ($this->checkCodeIsOffline($this->instance->errno))
+        elseif ($this->checkCodeIsOffline('HY000', $this->instance->errno))
         {
             $this->close();
         }
@@ -297,7 +297,7 @@
         $this->lastStmt = null;
         $this->lastSql = $sql;
         $instance = $this->instance;
-        if (false === $instance->query($sql) && $this->checkCodeIsOffline($this->instance->errno))
+        if (false === $instance->query($sql) && $this->checkCodeIsOffline('HY000', $this->instance->errno))
         {
             $this->close();
 
@@ -372,7 +372,7 @@
             {
                 $errorCode = $this->errorCode();
                 $errorInfo = $this->errorInfo();
-                if ($this->checkCodeIsOffline($errorCode))
+                if ($this->checkCodeIsOffline('HY000', $errorCode))
                 {
                     $this->close();
                 }
@@ -400,7 +400,7 @@
         {
             $errorCode = $this->errorCode();
             $errorInfo = $this->errorInfo();
-            if ($this->checkCodeIsOffline($errorCode))
+            if ($this->checkCodeIsOffline('HY000', $errorCode))
             {
                 $this->close();
             }

src/Components/swoole/src/Db/Driver/Swoole/Statement.php

@@ -159,7 +159,7 @@
                 $dbInstance = $db->getInstance();
                 $errorCode = $dbInstance->errorCode();
                 $errorInfo = $dbInstance->errorInfo();
-                if ($db->checkCodeIsOffline($errorCode))
+                if ($db->checkCodeIsOffline('HY000', $errorCode))
                 {
                     $db->close();
                 }
@@ -221,7 +221,7 @@
             {
                 $errorCode = $this->errorCode();
                 $errorInfo = $this->errorInfo();
-                if ($this->db->checkCodeIsOffline($errorCode))
+                if ($this->db->checkCodeIsOffline('HY000', $errorCode))
                 {
                     $this->db->close();
                 }

src/Db/Drivers/TPdoDriver.php

@@ -86,15 +86,16 @@
             {
                 return true;
             }
-            // @phpstan-ignore-next-line
-            if ($this->checkCodeIsOffline($instance->errorCode()))
+            $errorInfo = $instance->errorInfo();
+            if ($this->checkCodeIsOffline($errorInfo[0], $errorInfo[1]))
             {
                 $this->close();
             }
         }
         catch (\PDOException $e)
         {
-            if (isset($e->errorInfo[0]) && $this->checkCodeIsOffline($e->errorInfo[0]))
+            $errorInfo = $instance->errorInfo();
+            if ($this->checkCodeIsOffline($errorInfo[0], $errorInfo[1]))
             {
                 $this->close();
             }
@@ -149,12 +150,13 @@
      */
     public function beginTransaction(): bool
     {
+        $instance = $this->instance;
         try
         {
-            if (!$this->inTransaction() && !$this->instance->beginTransaction())
+            if (!$this->inTransaction() && !$instance->beginTransaction())
             {
-                // @phpstan-ignore-next-line
-                if ($this->checkCodeIsOffline($this->instance->errorCode()))
+                $errorInfo = $instance->errorInfo();
+                if ($this->checkCodeIsOffline($errorInfo[0], $errorInfo[1]))
                 {
                     $this->close();
                 }
@@ -166,7 +168,8 @@
         }
         catch (\PDOException $e)
         {
-            if (isset($e->errorInfo[0]) && $this->checkCodeIsOffline($e->errorInfo[0]))
+            $errorInfo = $instance->errorInfo();
+            if ($this->checkCodeIsOffline($errorInfo[0], $errorInfo[1]))
             {
                 $this->close();
             }
@@ -185,8 +188,8 @@
         {
             if (!$this->instance->commit())
             {
-                // @phpstan-ignore-next-line
-                if ($this->checkCodeIsOffline($this->instance->errorCode()))
+                $errorInfo = $this->instance->errorInfo();
+                if ($this->checkCodeIsOffline($errorInfo[0], $errorInfo[1]))
                 {
                     $this->close();
                 }
@@ -196,7 +199,8 @@
         }
         catch (\PDOException $e)
         {
-            if (isset($e->errorInfo[0]) && $this->checkCodeIsOffline($e->errorInfo[0]))
+            $errorInfo = $this->instance->errorInfo();
+            if ($this->checkCodeIsOffline($errorInfo[0], $errorInfo[1]))
             {
                 $this->close();
             }
@@ -219,7 +223,8 @@
             }
             catch (\PDOException $e)
             {
-                if (isset($e->errorInfo[0]) && $this->checkCodeIsOffline($e->errorInfo[0]))
+                $errorInfo = $this->instance->errorInfo();
+                if ($this->checkCodeIsOffline($errorInfo[0], $errorInfo[1]))
                 {
                     $this->close();
                 }
@@ -236,9 +241,13 @@
             $this->getTransaction()->rollBack($levels);
         }
         // @phpstan-ignore-next-line
-        elseif ($this->checkCodeIsOffline($this->instance->errorCode()))
+        else
         {
-            $this->close();
+            $errorInfo = $this->instance->errorInfo();
+            if ($this->checkCodeIsOffline($errorInfo[0], $errorInfo[1]))
+            {
+                $this->close();
+            }
         }
 
         return $result;
@@ -328,7 +337,8 @@
         }
         catch (\PDOException $e)
         {
-            if (isset($e->errorInfo[0]) && $this->checkCodeIsOffline($e->errorInfo[0]))
+            $errorInfo = $this->instance->errorInfo();
+            if ($this->checkCodeIsOffline($errorInfo[0], $errorInfo[1]))
             {
                 $this->close();
             }
@@ -405,7 +415,8 @@
             }
             catch (\PDOException $e)
             {
-                if (isset($e->errorInfo[0]) && $this->checkCodeIsOffline($e->errorInfo[0]))
+                $errorInfo = $this->instance->errorInfo();
+                if ($this->checkCodeIsOffline($errorInfo[0], $errorInfo[1]))
                 {
                     $this->close();
                 }
@@ -439,7 +450,8 @@
         }
         catch (\PDOException $e)
         {
-            if (isset($e->errorInfo[0]) && $this->checkCodeIsOffline($e->errorInfo[0]))
+            $errorInfo = $this->instance->errorInfo();
+            if ($this->checkCodeIsOffline($errorInfo[0], $errorInfo[1]))
             {
                 $this->close();
             }

src/Db/Drivers/TPdoStatement.php

@@ -125,9 +125,9 @@
      */
     public function execute(array $inputParameters = null): bool
     {
+        $statement = $this->statement;
         try
         {
-            $statement = $this->statement;
             $statement->closeCursor();
             if ($inputParameters)
             {
@@ -147,18 +147,19 @@
             if (!$result)
             {
                 $errorCode = $this->errorCode();
-                $errorInfo = $this->errorInfo();
-                if ($this->db->checkCodeIsOffline($errorCode))
+                $errorInfo = $statement->errorInfo();
+                if ($this->db->checkCodeIsOffline($errorInfo[0], $errorInfo[1]))
                 {
                     $this->db->close();
                 }
-                throw new DbException('SQL query error [' . $errorCode . '] ' . $errorInfo . \PHP_EOL . 'sql: ' . $this->getSql() . \PHP_EOL);
+                throw new DbException('SQL query error [' . $errorCode . '] ' . $errorInfo[2] . \PHP_EOL . 'sql: ' . $this->getSql() . \PHP_EOL);
             }
             $this->updateLastInsertId();
         }
         catch (\PDOException $e)
         {
-            if (isset($e->errorInfo[0]) && $this->db->checkCodeIsOffline($e->errorInfo[0]))
+            $errorInfo = $statement->errorInfo();
+            if ($this->db->checkCodeIsOffline($errorInfo[0], $errorInfo[1]))
             {
                 $this->db->close();
             }

src/Db/Interfaces/IDb.php

@@ -152,5 +152,5 @@ public function getOption(): array;
      *
      * @param mixed $code
      */
-    public function checkCodeIsOffline($code): bool;
+    public function checkCodeIsOffline(string $sqlState, $code = null): bool;
 }

src/Db/Mysql/Contract/IMysqlDb.php

@@ -13,5 +13,5 @@ interface IMysqlDb extends IDb
      *
      * @param int $code
      */
-    public function checkCodeIsOffline($code): bool;
+    public function checkCodeIsOffline(string $sqlState, $code = null): bool;
 }

src/Db/Mysql/Drivers/MysqlBase.php

@@ -8,6 +8,7 @@
 use Imi\Db\Mysql\Contract\IMysqlDb;
 use Imi\Db\Mysql\Query\MysqlQuery;
 use Imi\Db\Query\Interfaces\IQuery;
+use Imi\Db\SqlState;
 
 abstract class MysqlBase extends Base implements IMysqlDb
 {
@@ -32,7 +33,7 @@
      *
      * @see https://github.com/mysql/mysql-server/blob/HEAD/include/errmsg.h
      */
-    public function checkCodeIsOffline($code): bool
+    public function checkCodeIsOffline(string $sqlState, $code = null): bool
     {
         return \in_array($code, [
             2001, // CR_SOCKET_CREATE_ERROR
@@ -45,6 +46,6 @@
             2012, // CR_SERVER_HANDSHAKE_ERR
             2013, // CR_SERVER_LOST
             2026, // CR_SSL_CONNECTION_ERROR
-        ]);
+        ]) || SqlState::checkCodeIsOffline($sqlState);
     }
 }