修改DB事务回滚BUG (swoft-cloud/swoft-component#173)

swoft-cloud · Aug 9, 2018 · 00eee11 · 00eee11
1 parent c51130a
commit 00eee11
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 1 deletion.
diff --git a/src/Driver/Mysql/MysqlConnection.php b/src/Driver/Mysql/MysqlConnection.php
@@ -106,12 +106,13 @@ public function execute(array $params = [])
     public function receive()
     {
         $result = $this->connection->recv();
+        $this->recv = true;
+
         if ($result === false) {
             throw new MysqlException('Mysql recv error，connectError=' . $this->connection->connect_error . ' error=' . $this->connection->error);
         }
         $this->connection->setDefer(false);
 
-        $this->recv   = true;
         $this->result = $result;
 
         return $result;

diff --git a/test/Cases/Mysql/SqlTest.php b/test/Cases/Mysql/SqlTest.php
@@ -142,4 +142,35 @@ public function testUpdateByCo($id)
             $this->testUpdate($id);
         });
     }
+
+    public function testErrorSql()
+    {
+        Db::beginTransaction();
+
+        try {
+            $user = new User();
+            $user->setName('limx');
+            $user->setSex(1);
+            $user->setAge(27);
+            $user->setDesc('Swoft');
+            $id = $user->save()->getResult();
+
+            $sql = 'SELECT des FROM `user` WHERE id = ?';
+            $res = Db::query($sql, [$id])->getResult();
+            $this->assertTrue(false);
+            Db::commit();
+        } catch (\Exception $ex) {
+            Db::rollback();
+
+            $user = User::findById($id)->getResult();
+            $this->assertNull($user);
+        }
+    }
+
+    public function testErrorSqlByCo()
+    {
+        go(function () {
+            $this->testErrorSql();
+        });
+    }
 }