bug #39026 [Messenger] Fix DBAL deprecations in PostgreSqlConnection (chalasr)

chalasr · chalasr · commit 01316d601476 · 2020-11-07T17:22:16.000+01:00
This PR was merged into the 5.1 branch. Discussion ---------- [Messenger] Fix DBAL deprecations in PostgreSqlConnection | Q | A | ------------- | --- | Branch? | 5.1 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - Commits ------- bc42cf6 [Messenger] Fix DBAL deprecations in PostgreSQLConnection
diff --git a/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/Connection.php b/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/Connection.php
@@ -372,7 +372,7 @@ private function executeQuery(string $sql, array $parameters = [], array $types
         return $stmt;
     }
 
-    private function executeStatement(string $sql, array $parameters = [], array $types = [])
+    protected function executeStatement(string $sql, array $parameters = [], array $types = [])
     {
         try {
             if (method_exists($this->driverConnection, 'executeStatement')) {
diff --git a/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/PostgreSqlConnection.php b/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/PostgreSqlConnection.php
@@ -64,7 +64,7 @@ public function get(): ?array
         if (!$this->listening) {
             // This is secure because the table name must be a valid identifier:
             // https://www.postgresql.org/docs/current/sql-syntax-lexical.html#SQL-SYNTAX-IDENTIFIERS
-            $this->driverConnection->exec(sprintf('LISTEN "%s"', $this->configuration['table_name']));
+            $this->executeStatement(sprintf('LISTEN "%s"', $this->configuration['table_name']));
             $this->listening = true;
         }
 
@@ -87,7 +87,7 @@ public function setup(): void
     {
         parent::setup();
 
-        $this->driverConnection->exec(implode("\n", $this->getTriggerSql()));
+        $this->executeStatement(implode("\n", $this->getTriggerSql()));
     }
 
     /**
@@ -134,7 +134,7 @@ private function unlisten()
             return;
         }
 
-        $this->driverConnection->exec(sprintf('UNLISTEN "%s"', $this->configuration['table_name']));
+        $this->executeStatement(sprintf('UNLISTEN "%s"', $this->configuration['table_name']));
         $this->listening = false;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -372,7 +372,7 @@ private function executeQuery(string $sql, array $parameters = [], array $types`
`372`	`372`	`return $stmt;`
`373`	`373`	`}`
`374`	`374`
`375`		`- private function executeStatement(string $sql, array $parameters = [], array $types = [])`
	`375`	`+ protected function executeStatement(string $sql, array $parameters = [], array $types = [])`
`376`	`376`	`{`
`377`	`377`	`try {`
`378`	`378`	`if (method_exists($this->driverConnection, 'executeStatement')) {`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ public function get(): ?array`
`64`	`64`	`if (!$this->listening) {`
`65`	`65`	`// This is secure because the table name must be a valid identifier:`
`66`	`66`	`// https://www.postgresql.org/docs/current/sql-syntax-lexical.html#SQL-SYNTAX-IDENTIFIERS`
`67`		`- $this->driverConnection->exec(sprintf('LISTEN "%s"', $this->configuration['table_name']));`
	`67`	`+ $this->executeStatement(sprintf('LISTEN "%s"', $this->configuration['table_name']));`
`68`	`68`	`$this->listening = true;`
`69`	`69`	`}`
`70`	`70`
`@@ -87,7 +87,7 @@ public function setup(): void`
`87`	`87`	`{`
`88`	`88`	`parent::setup();`
`89`	`89`
`90`		`- $this->driverConnection->exec(implode("\n", $this->getTriggerSql()));`
	`90`	`+ $this->executeStatement(implode("\n", $this->getTriggerSql()));`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`/**`
`@@ -134,7 +134,7 @@ private function unlisten()`
`134`	`134`	`return;`
`135`	`135`	`}`
`136`	`136`
`137`		`- $this->driverConnection->exec(sprintf('UNLISTEN "%s"', $this->configuration['table_name']));`
	`137`	`+ $this->executeStatement(sprintf('UNLISTEN "%s"', $this->configuration['table_name']));`
`138`	`138`	`$this->listening = false;`
`139`	`139`	`}`
`140`	`140`	`}`