Merge pull request #5407 from jongotlin/jongotlin-patch-1

Create sequences before tables
doctrine · May 23, 2022 · 4c1926e · 4c1926e
2 parents 007223c + 8ba42c0
commit 4c1926e
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 2 deletions.
diff --git a/src/Schema/Visitor/CreateSchemaSqlCollector.php b/src/Schema/Visitor/CreateSchemaSqlCollector.php
@@ -91,8 +91,8 @@ public function getQueries()
     {
         return array_merge(
             $this->createNamespaceQueries,
-            $this->createTableQueries,
             $this->createSequenceQueries,
+            $this->createTableQueries,
             $this->createFkConstraintQueries
         );
     }

diff --git a/tests/Functional/Schema/PostgreSQL/SchemaTest.php b/tests/Functional/Schema/PostgreSQL/SchemaTest.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace Doctrine\DBAL\Tests\Functional\Schema\PostgreSQL;
+
+use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
+use Doctrine\DBAL\Schema\Column;
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\DBAL\Schema\Sequence;
+use Doctrine\DBAL\Schema\Table;
+use Doctrine\DBAL\Tests\FunctionalTestCase;
+use Doctrine\DBAL\Types\IntegerType;
+
+final class SchemaTest extends FunctionalTestCase
+{
+    public function testCreateTableWithSequenceInColumnDefinition(): void
+    {
+        $platform = $this->connection->getDatabasePlatform();
+
+        if (! $platform instanceof PostgreSQLPlatform) {
+            self::markTestSkipped('Test is for PostgreSQL.');
+        }
+
+        $this->dropTableIfExists('my_table');
+
+        $options  = ['default' => 'nextval(\'my_table_id_seq\'::regclass)'];
+        $table    = new Table('my_table', [new Column('id', new IntegerType(), $options)]);
+        $sequence = new Sequence('my_table_id_seq');
+
+        $schema = new Schema([$table], [$sequence]);
+        foreach ($schema->toSql($platform) as $sql) {
+            $this->connection->executeStatement($sql);
+        }
+
+        $result = $this->connection->fetchAssociative(
+            'SELECT column_default FROM information_schema.columns WHERE table_name = ?',
+            ['my_table']
+        );
+
+        $this->assertNotFalse($result);
+        $this->assertEquals('nextval(\'my_table_id_seq\'::regclass)', $result['column_default']);
+    }
+}
diff --git a/tests/Functional/Schema/SchemaManagerFunctionalTestCase.php b/tests/Functional/Schema/SchemaManagerFunctionalTestCase.php
@@ -1257,6 +1257,8 @@ public function testCommentStringsAreQuoted(): void
             self::markTestSkipped('Database does not support column comments.');
         }
 
+        $this->dropTableIfExists('my_table');
+
         $table = new Table('my_table');
         $table->addColumn('id', 'integer', ['comment' => "It's a comment with a quote"]);
         $table->setPrimaryKey(['id']);
@@ -1273,6 +1275,8 @@ public function testCommentNotDuplicated(): void
             self::markTestSkipped('Database does not support column comments.');
         }
 
+        $this->dropTableIfExists('my_table');
+
         $options = [
             'type' => Type::getType('integer'),
             'default' => 0,

diff --git a/tests/Schema/Visitor/SchemaSqlCollectorTest.php b/tests/Schema/Visitor/SchemaSqlCollectorTest.php
@@ -27,7 +27,7 @@ public function testCreateSchema(): void
 
         $sql = $schema->toSql($platformMock);
 
-        self::assertEquals(['foo', 'foo', 'bar', 'baz'], $sql);
+        self::assertEquals(['bar', 'foo', 'foo', 'baz'], $sql);
     }
 
     public function testDropSchema(): void