bug #40336 [Messenger] Doctrine setup with migrations (Nyholm)

fabpot · fabpot · commit 0940043bfc2d · 2021-03-04T18:38:30.000+01:00
This PR was squashed before being merged into the 5.2 branch. Discussion ---------- [Messenger] Doctrine setup with migrations | Q | A | ------------- | --- | Branch? | 5.2 | Bug fix? | yes | New feature? | | Deprecations? | no | Tickets | Fix #40130 | License | MIT | Doc PR | This PR reverts parts of #40055. When running these commands, You do need to be in a transaction: - `doctrine:schema:create` - `messenger:setup-transports` - `doctrine:migrations:diff` and `doctrine:migrations:migrate` Commits ------- 3371e1c [Messenger] Doctrine setup with migrations
diff --git a/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/PostgreSqlConnectionTest.php b/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/PostgreSqlConnectionTest.php
@@ -49,7 +49,19 @@ public function testGetExtraSetupSql()
 
         $table = new Table('queue_table');
         $table->addOption('_symfony_messenger_table_name', 'queue_table');
-        $this->assertStringContainsString('CREATE TRIGGER', implode("\n", $connection->getExtraSetupSqlForTable($table)));
+        $sql = implode("\n", $connection->getExtraSetupSqlForTable($table));
+
+        /*
+         * We need to start a transaction for the following commands to work properly:
+         * doctrine:schema:create
+         * messenger:setup-transports
+         * doctrine:migrations:diff and doctrine:migrations:migrate
+         */
+        $this->assertStringContainsString('BEGIN;', $sql);
+        $this->assertStringContainsString('CREATE TRIGGER', $sql);
+
+        // We MUST NOT commit, that will mess with the PDO in PHP 8
+        $this->assertStringNotContainsString('COMMIT;', $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
@@ -87,7 +87,7 @@ public function setup(): void
     {
         parent::setup();
 
-        $this->executeStatement('BEGIN;'.implode("\n", $this->getTriggerSql()).'COMMIT;');
+        $this->executeStatement(implode("\n", $this->getTriggerSql()));
     }
 
     /**
@@ -109,6 +109,7 @@ 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'

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('BEGIN;'.implode("\n", $this->getTriggerSql()).'COMMIT;');`
	`90`	`+ $this->executeStatement(implode("\n", $this->getTriggerSql()));`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`/**`
`@@ -109,6 +109,7 @@ public function getExtraSetupSqlForTable(Table $createdTable): array`
`109`	`109`	`private function getTriggerSql(): array`
`110`	`110`	`{`
`111`	`111`	`return [`
	`112`	`+ 'BEGIN;',`
`112`	`113`	`sprintf('LOCK TABLE %s;', $this->configuration['table_name']),`
`113`	`114`	`// create trigger function`
`114`	`115`	`sprintf(<<<'SQL'`