Merge branch '4.4' into 5.1

* 4.4: stop using the deprecated schema synchronizer API
symfony · Aug 21, 2020 · 8eff8d2 · 8eff8d2
1 parent f794d67
commit 8eff8d2
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 17 deletions.
diff --git a/Tests/Transport/ConnectionTest.php b/Tests/Transport/ConnectionTest.php
@@ -18,7 +18,6 @@
 use Doctrine\DBAL\Schema\AbstractSchemaManager;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\DBAL\Schema\SchemaConfig;
-use Doctrine\DBAL\Schema\Synchronizer\SchemaSynchronizer;
 use Doctrine\DBAL\Statement;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Messenger\Bridge\Doctrine\Tests\Fixtures\DummyMessage;
@@ -30,7 +29,6 @@ public function testGetAMessageWillChangeItsStatus()
     {
         $queryBuilder = $this->getQueryBuilderMock();
         $driverConnection = $this->getDBALConnectionMock();
-        $schemaSynchronizer = $this->getSchemaSynchronizerMock();
         $stmt = $this->getResultMock([
             'id' => 1,
             'body' => '{"message":"Hi"}',
@@ -53,7 +51,7 @@ public function testGetAMessageWillChangeItsStatus()
             ->method('executeQuery')
             ->willReturn($stmt);
 
-        $connection = new Connection([], $driverConnection, $schemaSynchronizer);
+        $connection = new Connection([], $driverConnection);
         $doctrineEnvelope = $connection->get();
         $this->assertEquals(1, $doctrineEnvelope['id']);
         $this->assertEquals('{"message":"Hi"}', $doctrineEnvelope['body']);
@@ -64,7 +62,6 @@ public function testGetWithNoPendingMessageWillReturnNull()
     {
         $queryBuilder = $this->getQueryBuilderMock();
         $driverConnection = $this->getDBALConnectionMock();
-        $schemaSynchronizer = $this->getSchemaSynchronizerMock();
         $stmt = $this->getResultMock(false);
 
         $queryBuilder
@@ -82,7 +79,7 @@ public function testGetWithNoPendingMessageWillReturnNull()
             ->method('executeQuery')
             ->willReturn($stmt);
 
-        $connection = new Connection([], $driverConnection, $schemaSynchronizer);
+        $connection = new Connection([], $driverConnection);
         $doctrineEnvelope = $connection->get();
         $this->assertNull($doctrineEnvelope);
     }
@@ -155,11 +152,6 @@ private function getResultMock($expectedResult)
         return $stmt;
     }
 
-    private function getSchemaSynchronizerMock(): SchemaSynchronizer
-    {
-        return $this->createMock(SchemaSynchronizer::class);
-    }
-
     /**
      * @dataProvider buildConfigurationProvider
      */
@@ -264,7 +256,6 @@ public function testFind()
     {
         $queryBuilder = $this->getQueryBuilderMock();
         $driverConnection = $this->getDBALConnectionMock();
-        $schemaSynchronizer = $this->getSchemaSynchronizerMock();
         $id = 1;
         $stmt = $this->getResultMock([
             'id' => $id,
@@ -288,7 +279,7 @@ public function testFind()
             ->method('executeQuery')
             ->willReturn($stmt);
 
-        $connection = new Connection([], $driverConnection, $schemaSynchronizer);
+        $connection = new Connection([], $driverConnection);
         $doctrineEnvelope = $connection->find($id);
         $this->assertEquals(1, $doctrineEnvelope['id']);
         $this->assertEquals('{"message":"Hi"}', $doctrineEnvelope['body']);
@@ -299,7 +290,6 @@ public function testFindAll()
     {
         $queryBuilder = $this->getQueryBuilderMock();
         $driverConnection = $this->getDBALConnectionMock();
-        $schemaSynchronizer = $this->getSchemaSynchronizerMock();
         $message1 = [
             'id' => 1,
             'body' => '{"message":"Hi"}',
@@ -335,7 +325,7 @@ public function testFindAll()
             ->method('executeQuery')
             ->willReturn($stmt);
 
-        $connection = new Connection([], $driverConnection, $schemaSynchronizer);
+        $connection = new Connection([], $driverConnection);
         $doctrineEnvelopes = $connection->findAll();
 
         $this->assertEquals(1, $doctrineEnvelopes[0]['id']);

diff --git a/Transport/Connection.php b/Transport/Connection.php
@@ -16,9 +16,9 @@
 use Doctrine\DBAL\Driver\Result;
 use Doctrine\DBAL\Exception\TableNotFoundException;
 use Doctrine\DBAL\Query\QueryBuilder;
+use Doctrine\DBAL\Schema\Comparator;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\DBAL\Schema\Synchronizer\SchemaSynchronizer;
-use Doctrine\DBAL\Schema\Synchronizer\SingleDatabaseSynchronizer;
 use Doctrine\DBAL\Schema\Table;
 use Doctrine\DBAL\Types\Type;
 use Doctrine\DBAL\Types\Types;
@@ -66,7 +66,7 @@ public function __construct(array $configuration, DBALConnection $driverConnecti
     {
         $this->configuration = array_replace_recursive(static::DEFAULT_OPTIONS, $configuration);
         $this->driverConnection = $driverConnection;
-        $this->schemaSynchronizer = $schemaSynchronizer ?? new SingleDatabaseSynchronizer($this->driverConnection);
+        $this->schemaSynchronizer = $schemaSynchronizer;
         $this->autoSetup = $this->configuration['auto_setup'];
 
         if (null === self::$useDeprecatedConstants) {
@@ -248,7 +248,7 @@ public function setup(): void
             $this->driverConnection->getConfiguration()->setFilterSchemaAssetsExpression(null);
         }
 
-        $this->schemaSynchronizer->updateSchema($this->getSchema(), true);
+        $this->updateSchema();
 
         if ($hasFilterCallback) {
             $this->driverConnection->getConfiguration()->setSchemaAssetsFilter($assetFilter);
@@ -437,5 +437,25 @@ private function decodeEnvelopeHeaders(array $doctrineEnvelope): array
 
         return $doctrineEnvelope;
     }
+
+    private function updateSchema(): void
+    {
+        if (null !== $this->schemaSynchronizer) {
+            $this->schemaSynchronizer->updateSchema($this->getSchema(), true);
+
+            return;
+        }
+
+        $comparator = new Comparator();
+        $schemaDiff = $comparator->compare($this->driverConnection->getSchemaManager()->createSchema(), $this->getSchema());
+
+        foreach ($schemaDiff->toSaveSql($this->driverConnection->getDatabasePlatform()) as $sql) {
+            if (method_exists($this->driverConnection, 'executeStatement')) {
+                $this->driverConnection->executeStatement($sql);
+            } else {
+                $this->driverConnection->exec($sql);
+            }
+        }
+    }
 }
 class_alias(Connection::class, \Symfony\Component\Messenger\Transport\Doctrine\Connection::class);