[Lock] Fix PDO store not creating table

HypeMC · HypeMC · commit 4c13babb5d65 · 2023-11-05T20:02:05.000+01:00
diff --git a/src/Symfony/Component/Lock/Store/PdoStore.php b/src/Symfony/Component/Lock/Store/PdoStore.php
@@ -24,7 +24,7 @@
  *
  * Lock metadata are stored in a table. You can use createTable() to initialize
  * a correctly defined table.
-
+ *
  * CAUTION: This store relies on all client and server nodes to have
  * synchronized clocks for lock expiry to occur at the correct time.
  * To ensure locks don't expire prematurely; the TTLs should be set with enough
@@ -40,8 +40,8 @@ class PdoStore implements PersistingStoreInterface
     private $conn;
     private $dsn;
     private $driver;
-    private $username = '';
-    private $password = '';
+    private $username = null;
+    private $password = null;
     private $connectionOptions = [];
 
     private $dbalStore;
@@ -115,7 +115,7 @@ public function save(Key $key)
         try {
             $stmt = $conn->prepare($sql);
         } catch (\PDOException $e) {
-            if (!$conn->inTransaction() || \in_array($this->driver, ['pgsql', 'sqlite', 'sqlsrv'], true)) {
+            if ($this->isTableMissing($e) && (!$conn->inTransaction() || \in_array($this->driver, ['pgsql', 'sqlite', 'sqlsrv'], true))) {
                 $this->createTable();
             }
             $stmt = $conn->prepare($sql);
@@ -127,8 +127,19 @@ public function save(Key $key)
         try {
             $stmt->execute();
         } catch (\PDOException $e) {
-            // the lock is already acquired. It could be us. Let's try to put off.
-            $this->putOffExpiration($key, $this->initialTtl);
+            if ($this->isTableMissing($e) && (!$conn->inTransaction() || \in_array($this->driver, ['pgsql', 'sqlite', 'sqlsrv'], true))) {
+                $this->createTable();
+
+                try {
+                    $stmt->execute();
+                } catch (\PDOException $e) {
+                    // the lock is already acquired. It could be us. Let's try to put off.
+                    $this->putOffExpiration($key, $this->initialTtl);
+                }
+            } else {
+                // the lock is already acquired. It could be us. Let's try to put off.
+                $this->putOffExpiration($key, $this->initialTtl);
+            }
         }
 
         $this->randomlyPrune();
@@ -316,4 +327,21 @@ private function getCurrentTimestampStatement(): string
                 return (string) time();
         }
     }
+
+    private function isTableMissing(\PDOException $exception): bool
+    {
+        $driver = $this->getDriver();
+        $code = $exception->getCode();
+
+        switch (true) {
+            case 'pgsql' === $driver && '42P01' === $code:
+            case 'sqlite' === $driver && str_contains($exception->getMessage(), 'no such table:'):
+            case 'oci' === $driver && 942 === $code:
+            case 'sqlsrv' === $driver && 208 === $code:
+            case 'mysql' === $driver && 1146 === $code:
+                return true;
+            default:
+                return false;
+        }
+    }
 }
diff --git a/src/Symfony/Component/Lock/Tests/Store/PdoStoreTest.php b/src/Symfony/Component/Lock/Tests/Store/PdoStoreTest.php
@@ -99,7 +99,11 @@ public function testDsn(string $dsn, string $file = null)
     public static function provideDsn()
     {
         $dbFile = tempnam(sys_get_temp_dir(), 'sf_sqlite_cache');
-        yield ['sqlite:'.$dbFile.'2', $dbFile.'2'];
-        yield ['sqlite::memory:'];
+        yield 'SQLite file' => ['sqlite:'.$dbFile.'2', $dbFile.'2'];
+        yield 'SQLite in memory' => ['sqlite::memory:'];
+
+        if ($host = getenv('POSTGRES_HOST')) {
+            yield 'PostgreSQL' => ['pgsql:host='.$host.';user=postgres;password=password'];
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,11 @@ public function testDsn(string $dsn, string $file = null)`
`99`	`99`	`public static function provideDsn()`
`100`	`100`	`{`
`101`	`101`	`$dbFile = tempnam(sys_get_temp_dir(), 'sf_sqlite_cache');`
`102`		`- yield ['sqlite:'.$dbFile.'2', $dbFile.'2'];`
`103`		`- yield ['sqlite::memory:'];`
	`102`	`+ yield 'SQLite file' => ['sqlite:'.$dbFile.'2', $dbFile.'2'];`
	`103`	`+ yield 'SQLite in memory' => ['sqlite::memory:'];`
	`104`	`+`
	`105`	`+ if ($host = getenv('POSTGRES_HOST')) {`
	`106`	`+ yield 'PostgreSQL' => ['pgsql:host='.$host.';user=postgres;password=password'];`
	`107`	`+ }`
`104`	`108`	`}`
`105`	`109`	`}`