Refactor SchemaListener isSameDatabaseChecker to use always the same table name

GromNaN · GromNaN · commit ec4ed731677a · 2025-09-03T09:34:04.000+02:00
diff --git a/src/Symfony/Bridge/Doctrine/CHANGELOG.md b/src/Symfony/Bridge/Doctrine/CHANGELOG.md
@@ -5,6 +5,7 @@ CHANGELOG
 ---
 
  * Deprecate `UniqueEntity::getRequiredOptions()` and `UniqueEntity::getDefaultOption()`
+ * Use a single table named `_schema_subscriber_check` in schema listeners to detect same database connections
 
 7.3
 ---
diff --git a/src/Symfony/Bridge/Doctrine/SchemaListener/AbstractSchemaListener.php b/src/Symfony/Bridge/Doctrine/SchemaListener/AbstractSchemaListener.php
@@ -12,7 +12,9 @@
 namespace Symfony\Bridge\Doctrine\SchemaListener;
 
 use Doctrine\DBAL\Connection;
-use Doctrine\DBAL\Exception\TableNotFoundException;
+use Doctrine\DBAL\Exception\ConnectionException;
+use Doctrine\DBAL\Exception\DatabaseObjectExistsException;
+use Doctrine\DBAL\Exception\DatabaseObjectNotFoundException;
 use Doctrine\DBAL\Schema\Name\Identifier;
 use Doctrine\DBAL\Schema\Name\UnqualifiedName;
 use Doctrine\DBAL\Schema\PrimaryKeyConstraint;
@@ -28,32 +30,47 @@ protected function getIsSameDatabaseChecker(Connection $connection): \Closure
     {
         return static function (\Closure $exec) use ($connection): bool {
             $schemaManager = method_exists($connection, 'createSchemaManager') ? $connection->createSchemaManager() : $connection->getSchemaManager();
-            $checkTable = 'schema_subscriber_check_'.bin2hex(random_bytes(7));
-            $table = new Table($checkTable);
+            $key = bin2hex(random_bytes(7));
+            $table = new Table('_schema_subscriber_check');
             $table->addColumn('id', Types::INTEGER)
                 ->setAutoincrement(true)
                 ->setNotnull(true);
+            $table->addColumn('key', Types::STRING)
+                ->setLength(14)
+                ->setNotNull(true)
+            ;
 
             if (class_exists(PrimaryKeyConstraint::class)) {
                 $table->addPrimaryKeyConstraint(new PrimaryKeyConstraint(null, [new UnqualifiedName(Identifier::unquoted('id'))], true));
             } else {
                 $table->setPrimaryKey(['id']);
             }
 
-            $schemaManager->createTable($table);
+            try {
+                $schemaManager->createTable($table);
+            } catch (DatabaseObjectExistsException) {
+            }
+
+            $connection->executeStatement('INSERT INTO _schema_subscriber_check (key) VALUES (:key)', ['key' => $key], ['key' => Types::STRING]);
 
             try {
-                $exec(\sprintf('DROP TABLE %s', $checkTable));
-            } catch (\Exception) {
-                // ignore
+                $exec('DELETE FROM _schema_subscriber_check WHERE key == :key', ['key' => $key], ['key' => Types::STRING]);
+            } catch (DatabaseObjectNotFoundException|ConnectionException) {
             }
 
             try {
-                $schemaManager->dropTable($checkTable);
+                $rowCount = $connection->executeStatement('DELETE FROM _schema_subscriber_check WHERE key == :key', ['key' => $key], ['key' => Types::STRING]);
+
+                return 0 === $rowCount;
+            } finally {
+                [$count] = $connection->executeQuery('SELECT count(id) FROM _schema_subscriber_check')->fetchOne();
 
-                return false;
-            } catch (TableNotFoundException) {
-                return true;
+                if (! $count) {
+                    try {
+                        $schemaManager->dropTable('_schema_subscriber_check');
+                    } catch (DatabaseObjectNotFoundException) {
+                    }
+                }
             }
         };
     }
