bug #40055 [Messenger] Fix Doctrine setup when using a migration (fabpot)

fabpot · fabpot · commit 8f325f577d0c · 2021-02-01T16:14:50.000+01:00
This PR was merged into the 5.2 branch. Discussion ---------- [Messenger] Fix Doctrine setup when using a migration | Q | A | ------------- | --- | Branch? | 5.2  | Bug fix? | yes | New feature? | no  | Deprecations? | no  | Tickets | Fix #39928  | License | MIT | Doc PR | n/a #38136 fixed running `messenger:setup-transports` (issue reported in #37179), but it breaks usage with `make:migration` (reported in #39928) as code is already executed in a transaction. This PR fixes both use cases. Commits ------- 42eeb44 [Messenger] Fix Doctrine setup when using a migration
diff --git a/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/PostgreSqlConnection.php b/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/PostgreSqlConnection.php
@@ -87,7 +87,7 @@ public function setup(): void
     {
         parent::setup();
 
-        $this->executeStatement(implode("\n", $this->getTriggerSql()));
+        $this->executeStatement('BEGIN;'.implode("\n", $this->getTriggerSql()).'COMMIT;');
     }
 
     /**
@@ -109,7 +109,6 @@ public function getExtraSetupSqlForTable(Table $createdTable): array
     private function getTriggerSql(): array
     {
         return [
-            'BEGIN;',
             sprintf('LOCK TABLE %s;', $this->configuration['table_name']),
             // create trigger function
             sprintf(<<<'SQL'
@@ -124,7 +123,6 @@ private function getTriggerSql(): array
             // 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']),
-            'COMMIT;',
         ];
     }
 

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ public function setup(): void`
`87`	`87`	`{`
`88`	`88`	`parent::setup();`
`89`	`89`
`90`		`- $this->executeStatement(implode("\n", $this->getTriggerSql()));`
	`90`	`+ $this->executeStatement('BEGIN;'.implode("\n", $this->getTriggerSql()).'COMMIT;');`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`/**`
`@@ -109,7 +109,6 @@ public function getExtraSetupSqlForTable(Table $createdTable): array`
`109`	`109`	`private function getTriggerSql(): array`
`110`	`110`	`{`
`111`	`111`	`return [`
`112`		`- 'BEGIN;',`
`113`	`112`	`sprintf('LOCK TABLE %s;', $this->configuration['table_name']),`
`114`	`113`	`// create trigger function`
`115`	`114`	`sprintf(<<<'SQL'`
`@@ -124,7 +123,6 @@ private function getTriggerSql(): array`
`124`	`123`	`// register trigger`
`125`	`124`	`sprintf('DROP TRIGGER IF EXISTS notify_trigger ON %s;', $this->configuration['table_name']),`
`126`	`125`	`sprintf('CREATE TRIGGER notify_trigger AFTER INSERT OR UPDATE ON %1$s FOR EACH ROW EXECUTE PROCEDURE notify_%1$s();', $this->configuration['table_name']),`
`127`		`- 'COMMIT;',`
`128`	`126`	`];`
`129`	`127`	`}`
`130`	`128`