Merge branch '3.4' into 4.4

* 3.4: Fix DBAL deprecation [Form] Fix ChoiceType translation domain Add Tagalog translations for new form messages [Form] Add missing vietnamese translations sync translations from master add vietnamese translation for html5 color validation
symfony · Jul 12, 2020 · 7ddc6df · 7ddc6df
2 parents 4d44187 + c537472
commit 7ddc6df
Showing 1 changed file with 16 additions and 3 deletions.
diff --git a/Store/PdoStore.php b/Store/PdoStore.php
@@ -267,7 +267,11 @@ public function createTable(): void
             $table->setPrimaryKey([$this->idCol]);
 
             foreach ($schema->toSql($conn->getDatabasePlatform()) as $sql) {
-                $conn->exec($sql);
+                if (method_exists($conn, 'executeStatement')) {
+                    $conn->executeStatement($sql);
+                } else {
+                    $conn->exec($sql);
+                }
             }
 
             return;
@@ -293,7 +297,11 @@ public function createTable(): void
                 throw new \DomainException(sprintf('Creating the lock table is currently not implemented for PDO driver "%s".', $driver));
         }
 
-        $conn->exec($sql);
+        if (method_exists($conn, 'executeStatement')) {
+            $conn->executeStatement($sql);
+        } else {
+            $conn->exec($sql);
+        }
     }
 
     /**
@@ -303,7 +311,12 @@ private function prune(): void
     {
         $sql = "DELETE FROM $this->table WHERE $this->expirationCol <= {$this->getCurrentTimestampStatement()}";
 
-        $this->getConnection()->exec($sql);
+        $conn = $this->getConnection();
+        if (method_exists($conn, 'executeStatement')) {
+            $conn->executeStatement($sql);
+        } else {
+            $conn->exec($sql);
+        }
     }
 
     private function getDriver(): string