fix: backport #166

colopl · Nov 19, 2024 · 0792bd9 · 0792bd9
1 parent 2d1d098
commit 0792bd9
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/Concerns/ManagesTransactions.php b/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 {

diff --git a/tests/Query/BuilderTest.php b/tests/Query/BuilderTest.php
@@ -768,7 +768,7 @@ public function test_whereLike(): void
             $caughtException = $ex;
         }
         if (getenv('SPANNER_EMULATOR_HOST')) {
-            $this->assertStringContainsString('INTERNAL', $caughtException?->getMessage());
+            $this->assertStringContainsString('Invalid UTF-8', $caughtException?->getMessage());
         } else {
             $this->assertStringContainsString('Invalid request proto: an error was encountered during deserialization of the request proto.', $caughtException?->getMessage());
         }

diff --git a/tests/SessionNotFoundTest.php b/tests/SessionNotFoundTest.php
@@ -164,13 +164,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++;