fix: avoid setting transaction tag as null (#4685)

Co-authored-by: larkee <larkee@users.noreply.github.com>
googleapis · Oct 20, 2021 · dbde7ff · dbde7ff
1 parent 8b1134b
commit dbde7ff
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/Spanner/src/Operation.php b/Spanner/src/Operation.php
@@ -425,12 +425,15 @@ public function read(Session $session, $table, KeySet $keySet, array $columns, a
      */
     public function transaction(Session $session, array $options = [])
     {
-        $transactionTag = $this->pluck('tag', $options, false);
         $options += [
             'singleUse' => false,
             'isRetry' => false,
-            'requestOptions' => ['transactionTag' => $transactionTag]
+            'requestOptions' => []
         ];
+        $transactionTag = $this->pluck('tag', $options, false);
+        if (isset($transactionTag)) {
+            $options['requestOptions']['transactionTag'] = $transactionTag;
+        }
 
         if (!$options['singleUse']) {
             $res = $this->beginTransaction($session, $options);

diff --git a/Spanner/tests/Unit/OperationTest.php b/Spanner/tests/Unit/OperationTest.php
@@ -304,6 +304,23 @@ public function testTransaction()
         $this->assertEquals(self::TRANSACTION, $t->id());
     }
 
+    public function testTransactionNoTag()
+    {
+        $this->connection->beginTransaction(Argument::allOf(
+            Argument::withEntry('database', self::DATABASE),
+            Argument::withEntry('session', $this->session->name()),
+            Argument::withEntry('requestOptions', [])
+        ))
+            ->shouldBeCalled()
+            ->willReturn(['id' => self::TRANSACTION]);
+
+        $this->operation->___setProperty('connection', $this->connection->reveal());
+
+        $t = $this->operation->transaction($this->session);
+        $this->assertInstanceOf(Transaction::class, $t);
+        $this->assertEquals(self::TRANSACTION, $t->id());
+    }
+
     public function testSnapshot()
     {
         $this->connection->beginTransaction(Argument::allOf(