Reset transaction level to zero, when reconnent to mysql server. (#1565)

CHANGELOG.md

@@ -2,7 +2,8 @@
 
 ## Fixed
 
-- [#1563](https://github.com/hyperf/hyperf/pull/1563) Fixed crontab's `onOneServer` option not resetting mutex on shutdown
+- [#1563](https://github.com/hyperf/hyperf/pull/1563) Fixed crontab's `onOneServer` option not resetting mutex on shutdown.
+- [#1565](https://github.com/hyperf/hyperf/pull/1565) Reset transaction level to zero, when reconnent to mysql server.
 
 # v1.1.25 - 2020-04-09
 

src/db/src/AbstractConnection.php

@@ -58,6 +58,10 @@ public function getActiveConnection()
 
     public function retry(\Throwable $throwable, $name, $arguments)
     {
+        if ($this->transactionLevel() > 0) {
+            throw $throwable;
+        }
+
         if ($this->causedByLostConnection($throwable)) {
             try {
                 $this->reconnect();

src/db/src/MySQLConnection.php

@@ -78,7 +78,7 @@ public function reconnect(): bool
 
         $this->connection = $connection;
         $this->lastUseTime = microtime(true);
-
+        $this->transactions = 0;
         return true;
     }
 

src/db/src/PDOConnection.php

@@ -93,6 +93,7 @@ public function reconnect(): bool
 
         $this->connection = $pdo;
         $this->lastUseTime = microtime(true);
+        $this->transactions = 0;
         return true;
     }
 

src/db/tests/Cases/PDODriverTest.php

@@ -115,4 +115,17 @@ public function testStaticCall()
 
         $this->assertSame('Hyperf', $res['name']);
     }
+
+    public function testTransactionLevelWhenReconnect()
+    {
+        $container = $this->getContainer();
+        $factory = $container->get(PoolFactory::class);
+        $pool = $factory->getPool('default');
+        $connection = $pool->get();
+        $this->assertSame(0, $connection->transactionLevel());
+        $connection->beginTransaction();
+        $this->assertSame(1, $connection->transactionLevel());
+        $connection->reconnect();
+        $this->assertSame(0, $connection->transactionLevel());
+    }
 }