bug #47070 [Messenger] Fix function name in TriggerSql on postgresql bridge to support table name with schema (zimny9932)

fabpot · fabpot · commit 00037d840762 · 2022-07-28T10:27:54.000+02:00
This PR was squashed before being merged into the 5.4 branch. Discussion ---------- [Messenger] Fix function name in TriggerSql on postgresql bridge to support table name with schema …support table name with schema | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #46984 | License | MIT Allow use schema in table_name option when configure postgresql transport. There was a problem with procedure name in getTriggerSql function in Symfony\Component\Messenger\Bridge\Doctrine\Transport\PostgreSqlConnection. Commits ------- 64e7c9b [Messenger] Fix function name in TriggerSql on postgresql bridge to support table name with schema
diff --git a/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/PostgreSqlConnectionTest.php b/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/PostgreSqlConnectionTest.php
@@ -58,6 +58,19 @@ public function testGetExtraSetupSql()
         $this->assertStringNotContainsString('COMMIT;', $sql);
     }
 
+    public function testTransformTableNameWithSchemaToValidProcedureName()
+    {
+        $driverConnection = $this->createMock(\Doctrine\DBAL\Connection::class);
+        $connection = new PostgreSqlConnection(['table_name' => 'schema.queue_table'], $driverConnection);
+
+        $table = new Table('schema.queue_table');
+        $table->addOption('_symfony_messenger_table_name', 'schema.queue_table');
+        $sql = implode("\n", $connection->getExtraSetupSqlForTable($table));
+
+        $this->assertStringContainsString('CREATE OR REPLACE FUNCTION schema.notify_queue_table', $sql);
+        $this->assertStringContainsString('FOR EACH ROW EXECUTE PROCEDURE schema.notify_queue_table()', $sql);
+    }
+
     public function testGetExtraSetupSqlWrongTable()
     {
         $driverConnection = $this->createMock(\Doctrine\DBAL\Connection::class);
diff --git a/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/PostgreSqlConnection.php b/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/PostgreSqlConnection.php
@@ -118,23 +118,36 @@ public function getExtraSetupSqlForTable(Table $createdTable): array
 
     private function getTriggerSql(): array
     {
+        $functionName = $this->createTriggerFunctionName();
+
         return [
             // create trigger function
             sprintf(<<<'SQL'
-CREATE OR REPLACE FUNCTION notify_%1$s() RETURNS TRIGGER AS $$
+CREATE OR REPLACE FUNCTION %1$s() RETURNS TRIGGER AS $$
     BEGIN
-        PERFORM pg_notify('%1$s', NEW.queue_name::text);
+        PERFORM pg_notify('%2$s', NEW.queue_name::text);
         RETURN NEW;
     END;
 $$ LANGUAGE plpgsql;
 SQL
-                , $this->configuration['table_name']),
+                , $functionName, $this->configuration['table_name']),
             // register trigger
             sprintf('DROP TRIGGER IF EXISTS notify_trigger ON %s;', $this->configuration['table_name']),
-            sprintf('CREATE TRIGGER notify_trigger AFTER INSERT OR UPDATE ON %1$s FOR EACH ROW EXECUTE PROCEDURE notify_%1$s();', $this->configuration['table_name']),
+            sprintf('CREATE TRIGGER notify_trigger AFTER INSERT OR UPDATE ON %1$s FOR EACH ROW EXECUTE PROCEDURE %2$s();', $this->configuration['table_name'], $functionName),
         ];
     }
 
+    private function createTriggerFunctionName(): string
+    {
+        $tableConfig = explode('.', $this->configuration['table_name']);
+
+        if (1 === \count($tableConfig)) {
+            return sprintf('notify_%1$s', $tableConfig[0]);
+        }
+
+        return sprintf('%1$s.notify_%2$s', $tableConfig[0], $tableConfig[1]);
+    }
+
     private function unlisten()
     {
         if (!$this->listening) {
