[Messenger] Create trigger function in specific schema

zimny9932 · zimny9932 · commit c26d122fd9df · 2022-07-27T21:37:40.000+02:00
diff --git a/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/PostgreSqlConnectionTest.php b/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/PostgreSqlConnectionTest.php
@@ -67,7 +67,8 @@ public function testTransformTableNameWithSchemaToValidProcedureName()
         $table->addOption('_symfony_messenger_table_name', 'schema.queue_table');
         $sql = implode("\n", $connection->getExtraSetupSqlForTable($table));
 
-        $this->assertStringContainsString('CREATE OR REPLACE FUNCTION notify_schema_queue_table', $sql);
+        $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()
diff --git a/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/PostgreSqlConnection.php b/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/PostgreSqlConnection.php
@@ -118,25 +118,36 @@ public function getExtraSetupSqlForTable(Table $createdTable): array
 
     private function getTriggerSql(): array
     {
-        $functionName = str_replace('.', '_', $this->configuration['table_name']);
+        $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
-                , $functionName),
+                , $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_%2$s();', $this->configuration['table_name'], $functionName),
+            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) {

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,8 @@ public function testTransformTableNameWithSchemaToValidProcedureName()`
`67`	`67`	`$table->addOption('_symfony_messenger_table_name', 'schema.queue_table');`
`68`	`68`	`$sql = implode("\n", $connection->getExtraSetupSqlForTable($table));`
`69`	`69`
`70`		`- $this->assertStringContainsString('CREATE OR REPLACE FUNCTION notify_schema_queue_table', $sql);`
	`70`	`+ $this->assertStringContainsString('CREATE OR REPLACE FUNCTION schema.notify_queue_table', $sql);`
	`71`	`+ $this->assertStringContainsString('FOR EACH ROW EXECUTE PROCEDURE schema.notify_queue_table()', $sql);`
`71`	`72`	`}`
`72`	`73`
`73`	`74`	`public function testGetExtraSetupSqlWrongTable()`