[10.x] Fix Postgres cache store failed to put in db transaction

laravel · Nov 10, 2023 · fa22473 · fa22473
1 parent 2703f3e
commit fa22473
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/src/Illuminate/Cache/DatabaseStore.php b/src/Illuminate/Cache/DatabaseStore.php
@@ -137,6 +137,10 @@ public function put($key, $value, $seconds)
         $value = $this->serialize($value);
         $expiration = $this->getTime() + $seconds;
 
+        if ($this->connection instanceof PostgresConnection && $this->connection->transactionLevel() > 0) {
+            return $this->table()->upsert(compact('key', 'value', 'expiration'), 'key') > 0;
+        }
+
         try {
             return $this->table()->insert(compact('key', 'value', 'expiration'));
         } catch (Exception) {

diff --git a/tests/Cache/CacheDatabaseStoreTest.php b/tests/Cache/CacheDatabaseStoreTest.php
@@ -91,10 +91,24 @@ public function testValueIsUpdatedWhenInsertThrowsException()
         $this->assertTrue($result);
     }
 
+    public function testValueIsUpsertDuringTransactionOnPostgres()
+    {
+        $store = $this->getMockBuilder(DatabaseStore::class)->onlyMethods(['getTime'])->setConstructorArgs($this->getPostgresMocks())->getMock();
+        $table = m::mock(stdClass::class);
+        $store->getConnection()->shouldReceive('transactionLevel')->once()->andReturn(1);
+        $store->getConnection()->shouldReceive('table')->once()->with('table')->andReturn($table);
+        $store->expects($this->once())->method('getTime')->willReturn(1);
+        $table->shouldReceive('upsert')->once()->with(['key' => 'prefixfoo', 'value' => base64_encode(serialize("\0")), 'expiration' => 61], 'key')->andReturnTrue();
+
+        $result = $store->put('foo', "\0", 60);
+        $this->assertTrue($result);
+    }
+
     public function testValueIsInsertedOnPostgres()
     {
         $store = $this->getMockBuilder(DatabaseStore::class)->onlyMethods(['getTime'])->setConstructorArgs($this->getPostgresMocks())->getMock();
         $table = m::mock(stdClass::class);
+        $store->getConnection()->shouldReceive('transactionLevel')->once()->andReturn(0);
         $store->getConnection()->shouldReceive('table')->once()->with('table')->andReturn($table);
         $store->expects($this->once())->method('getTime')->willReturn(1);
         $table->shouldReceive('insert')->once()->with(['key' => 'prefixfoo', 'value' => base64_encode(serialize("\0")), 'expiration' => 61])->andReturnTrue();