bug #54392 [Messenger] Make Doctrine connection ignore unrelated tables on setup (MatTheCat)

fabpot · fabpot · commit 950ca75566f7 · 2024-04-08T13:02:53.000+02:00
This PR was merged into the 5.4 branch. Discussion ---------- [Messenger] Make Doctrine connection ignore unrelated tables on setup | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | Fix #49108 | License | MIT Introspecting the whole database can cause issues like Doctrine crashing on unknown column types. This PR updates the schema assets filter (added by #31625) to only consider the messages table, as it is the only one a connection setup needs to care about. Commits ------- 22dab67 [Messenger] Make Doctrine connection ignore unrelated tables on setup
diff --git a/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/DoctrineIntegrationTest.php b/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/DoctrineIntegrationTest.php
@@ -205,6 +205,7 @@ public function testItRetrieveTheMessageThatIsOlderThanRedeliverTimeout()
 
     public function testTheTransportIsSetupOnGet()
     {
+        $this->driverConnection->executeStatement('CREATE TABLE unrelated (unknown_type_column)');
         $this->assertFalse($this->createSchemaManager()->tablesExist(['messenger_messages']));
         $this->assertNull($this->connection->get());
 
diff --git a/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/Connection.php b/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/Connection.php
@@ -289,7 +289,7 @@ public function setup(): void
     {
         $configuration = $this->driverConnection->getConfiguration();
         $assetFilter = $configuration->getSchemaAssetsFilter();
-        $configuration->setSchemaAssetsFilter(static function () { return true; });
+        $configuration->setSchemaAssetsFilter(function (string $tableName) { return $tableName === $this->configuration['table_name']; });
         $this->updateSchema();
         $configuration->setSchemaAssetsFilter($assetFilter);
         $this->autoSetup = false;

Original file line number	Diff line number	Diff line change
`@@ -205,6 +205,7 @@ public function testItRetrieveTheMessageThatIsOlderThanRedeliverTimeout()`
`205`	`205`
`206`	`206`	`public function testTheTransportIsSetupOnGet()`
`207`	`207`	`{`
	`208`	`+ $this->driverConnection->executeStatement('CREATE TABLE unrelated (unknown_type_column)');`
`208`	`209`	`$this->assertFalse($this->createSchemaManager()->tablesExist(['messenger_messages']));`
`209`	`210`	`$this->assertNull($this->connection->get());`
`210`	`211`
Original file line number	Diff line number	Diff line change
`@@ -289,7 +289,7 @@ public function setup(): void`
`289`	`289`	`{`
`290`	`290`	`$configuration = $this->driverConnection->getConfiguration();`
`291`	`291`	`$assetFilter = $configuration->getSchemaAssetsFilter();`
`292`		`- $configuration->setSchemaAssetsFilter(static function () { return true; });`
	`292`	`+ $configuration->setSchemaAssetsFilter(function (string $tableName) { return $tableName === $this->configuration['table_name']; });`
`293`	`293`	`$this->updateSchema();`
`294`	`294`	`$configuration->setSchemaAssetsFilter($assetFilter);`
`295`	`295`	`$this->autoSetup = false;`