Skip to content

Commit 7fb35d6

Browse files
committed
Fix extra SQL support in Doctrine migrations
1 parent 8a97fa9 commit 7fb35d6

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

SchemaListener/MessengerTransportDoctrineSchemaSubscriber.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,7 @@ public function onSchemaCreateTable(SchemaCreateTableEventArgs $event): void
6464
continue;
6565
}
6666

67-
$extraSql = $transport->getExtraSetupSqlForTable($table);
68-
if (null === $extraSql) {
67+
if (!$extraSql = $transport->getExtraSetupSqlForTable($table)) {
6968
continue;
7069
}
7170

@@ -79,7 +78,9 @@ public function onSchemaCreateTable(SchemaCreateTableEventArgs $event): void
7978
* the only way to inject some extra SQL.
8079
*/
8180
$event->addSql($createTableSql);
82-
$event->addSql($extraSql);
81+
foreach ($extraSql as $sql) {
82+
$event->addSql($sql);
83+
}
8384
$event->preventDefault();
8485

8586
return;

Tests/SchemaListener/MessengerTransportDoctrineSchemaSubscriberTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public function testOnSchemaCreateTable()
6161
$doctrineTransport->expects($this->once())
6262
->method('getExtraSetupSqlForTable')
6363
->with($table)
64-
->willReturn('ALTER TABLE pizza ADD COLUMN extra_cheese boolean');
64+
->willReturn(['ALTER TABLE pizza ADD COLUMN extra_cheese boolean']);
6565

6666
// we use the platform to generate the full create table sql
6767
$platform->expects($this->once())
@@ -87,7 +87,7 @@ public function testOnSchemaCreateTableNoExtraSql()
8787
$doctrineTransport = $this->createMock(DoctrineTransport::class);
8888
$doctrineTransport->expects($this->once())
8989
->method('getExtraSetupSqlForTable')
90-
->willReturn(null);
90+
->willReturn([]);
9191

9292
$platform->expects($this->never())
9393
->method('getCreateTableSQL');

0 commit comments

Comments
 (0)