fix: fixed an error when rolling back a transaction that did not execute begin (#166)

* fix: fixed an error when rolling back a transaction that did not execute begin

* test: fix cursor rollback

* chore: update CHANGELOG

* chore: fill release date

Author: halnique

CHANGELOG.md

@@ -12,6 +12,11 @@ Changed
 Fixed
 - `Schema\Grammar::compileAdd()` `Schema\Grammar::compileChange()` `Schema\Grammar::compileChange()` now create separate statements (#159)
 
+# v6.1.2 (2024-01-16)
+
+Fixed
+- Fixed an error when rolling back a transaction that did not execute begin (#166)
+
 # v6.1.1 (2023-12-11)
 
 Fixed

src/Concerns/ManagesTransactions.php

@@ -168,7 +168,7 @@ protected function performRollBack($toLevel)
 
         if ($this->currentTransaction !== null) {
             try {
-                if ($this->currentTransaction->state() === Transaction::STATE_ACTIVE) {
+                if ($this->currentTransaction->state() === Transaction::STATE_ACTIVE && $this->currentTransaction->id() !== null) {
                     $this->currentTransaction->rollBack();
                 }
             } finally {

tests/SessionNotFoundTest.php

@@ -160,13 +160,13 @@ public function test_session_not_found_on_cursor(): void
         $passes = 0;
 
         $conn->transaction(function () use ($conn, &$passes) {
-            $cursor = $conn->cursor('SELECT 12345');
-
             if ($passes === 0) {
                 $this->deleteSession($conn);
                 $passes++;
             }
 
+            $cursor = $conn->cursor('SELECT 12345');
+
             $this->assertEquals([12345], $cursor->current());
 
             $passes++;