Merge pull request #6976 from morozov/rework-more-tests

morozov · web-flow · commit 4e0b51e40c16 · 2025-05-28T00:37:03.000-07:00
Rework more table/column tests
diff --git a/tests/Functional/SQL/Builder/CreateAndDropSchemaObjectsSQLBuilderTest.php b/tests/Functional/SQL/Builder/CreateAndDropSchemaObjectsSQLBuilderTest.php
@@ -5,15 +5,17 @@
 namespace Doctrine\DBAL\Tests\Functional\SQL\Builder;
 
 use Doctrine\DBAL\Exception;
-use Doctrine\DBAL\Schema\AbstractSchemaManager;
 use Doctrine\DBAL\Schema\Column;
+use Doctrine\DBAL\Schema\ForeignKeyConstraint;
 use Doctrine\DBAL\Schema\Name\OptionallyQualifiedName;
 use Doctrine\DBAL\Schema\PrimaryKeyConstraint;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\DBAL\Schema\Table;
 use Doctrine\DBAL\Tests\FunctionalTestCase;
 use Doctrine\DBAL\Types\Types;
 
+use function array_values;
+
 class CreateAndDropSchemaObjectsSQLBuilderTest extends FunctionalTestCase
 {
     /** @throws Exception */
@@ -33,8 +35,13 @@ public function testCreateAndDropTablesWithCircularForeignKeys(): void
         self::assertTrue($schemaManager->tablesExist([$name1->toString()]));
         self::assertTrue($schemaManager->tablesExist([$name2->toString()]));
 
-        $this->introspectForeignKey($schemaManager, $name1, $name2);
-        $this->introspectForeignKey($schemaManager, $name2, $name1);
+        $table1 = $schemaManager->introspectTable('t1');
+        $table2 = $schemaManager->introspectTable('t2');
+
+        $this->assertForeignKey($table1, $name2);
+        $this->assertForeignKey($table2, $name1);
+
+        $schema = new Schema([$table1, $table2]);
 
         $schemaManager->dropSchemaObjects($schema);
 
@@ -46,7 +53,7 @@ private function createTable(
         OptionallyQualifiedName $name,
         OptionallyQualifiedName $otherName,
     ): Table {
-        $table = Table::editor()
+        return Table::editor()
             ->setName($name)
             ->setColumns(
                 Column::editor()
@@ -58,25 +65,25 @@ private function createTable(
                     ->setTypeName(Types::INTEGER)
                     ->create(),
             )
+            ->setForeignKeyConstraints(
+                ForeignKeyConstraint::editor()
+                    ->setUnquotedReferencingColumnNames('other_id')
+                    ->setReferencedTableName($otherName)
+                    ->setUnquotedReferencedColumnNames('id')
+                    ->create(),
+            )
             ->setPrimaryKeyConstraint(
                 PrimaryKeyConstraint::editor()
                     ->setUnquotedColumnNames('id')
                     ->create(),
             )
             ->create();
-
-        $table->addForeignKeyConstraint($otherName->toString(), ['other_id'], ['id']);
-
-        return $table;
     }
 
     /** @throws Exception */
-    private function introspectForeignKey(
-        AbstractSchemaManager $schemaManager,
-        OptionallyQualifiedName $tableName,
-        OptionallyQualifiedName $expectedReferencedTableName,
-    ): void {
-        $foreignKeys = $schemaManager->listTableForeignKeys($tableName->toString());
+    private function assertForeignKey(Table $table, OptionallyQualifiedName $expectedReferencedTableName): void
+    {
+        $foreignKeys = array_values($table->getForeignKeys());
         self::assertCount(1, $foreignKeys);
         $this->assertOptionallyQualifiedNameEquals(
             $expectedReferencedTableName,
diff --git a/tests/Functional/Schema/PostgreSQL/ComparatorTest.php b/tests/Functional/Schema/PostgreSQL/ComparatorTest.php
@@ -12,7 +12,6 @@
 use Doctrine\DBAL\Schema\Table;
 use Doctrine\DBAL\Tests\Functional\Schema\ComparatorTestUtils;
 use Doctrine\DBAL\Tests\FunctionalTestCase;
-use Doctrine\DBAL\Types\Type;
 use Doctrine\DBAL\Types\Types;
 
 final class ComparatorTest extends FunctionalTestCase
@@ -87,9 +86,11 @@ public function testPlatformOptionsChangedColumnComparison(): void
             )
             ->create();
 
-        $onlineTable = clone $table;
-        $table->getColumn('test')
-            ->setType(Type::getType(Types::JSONB));
+        $onlineTable = $table->edit()
+            ->modifyColumnByUnquotedName('test', static function (ColumnEditor $editor): void {
+                $editor->setTypeName(Types::JSONB);
+            })
+            ->create();
 
         $compareResult = $this->comparator->compareTables($onlineTable, $table);
         self::assertCount(1, $compareResult->getChangedColumns());
diff --git a/tests/Functional/Schema/PrimaryKeyConstraintTest.php b/tests/Functional/Schema/PrimaryKeyConstraintTest.php
@@ -7,6 +7,7 @@
 use Doctrine\DBAL\Platforms\AbstractMySQLPlatform;
 use Doctrine\DBAL\Platforms\SQLitePlatform;
 use Doctrine\DBAL\Platforms\SQLServerPlatform;
+use Doctrine\DBAL\Schema\Column;
 use Doctrine\DBAL\Schema\PrimaryKeyConstraint;
 use Doctrine\DBAL\Schema\Table;
 use Doctrine\DBAL\Tests\FunctionalTestCase;
@@ -34,9 +35,16 @@ public function testNameIntrospection(): void
             ->setUnquotedColumnNames('id')
             ->create();
 
-        $table = new Table('users');
-        $table->addColumn('id', Types::INTEGER);
-        $table->addPrimaryKeyConstraint($primaryKeyConstraint);
+        $table = Table::editor()
+            ->setUnquotedName('users')
+            ->setColumns(
+                Column::editor()
+                    ->setUnquotedName('id')
+                    ->setTypeName(Types::INTEGER)
+                    ->create(),
+            )
+            ->setPrimaryKeyConstraint($primaryKeyConstraint)
+            ->create();
 
         $this->dropAndCreateTable($table);
 
@@ -66,9 +74,16 @@ public function testIsClusteredIntrospection(bool $isClustered): void
             ->setIsClustered($isClustered)
             ->create();
 
-        $table = new Table('users');
-        $table->addColumn('id', Types::INTEGER);
-        $table->addPrimaryKeyConstraint($primaryKeyConstraint);
+        $table = Table::editor()
+            ->setUnquotedName('users')
+            ->setColumns(
+                Column::editor()
+                    ->setUnquotedName('id')
+                    ->setTypeName(Types::INTEGER)
+                    ->create(),
+            )
+            ->setPrimaryKeyConstraint($primaryKeyConstraint)
+            ->create();
 
         $this->dropAndCreateTable($table);
 
diff --git a/tests/Functional/Schema/SQLiteSchemaManagerTest.php b/tests/Functional/Schema/SQLiteSchemaManagerTest.php
@@ -43,14 +43,6 @@ public function testListDatabases(): void
         $this->schemaManager->listDatabases();
     }
 
-    public function createListTableColumns(): Table
-    {
-        $table = parent::createListTableColumns();
-        $table->getColumn('id')->setAutoincrement(true);
-
-        return $table;
-    }
-
     /** @throws Exception */
     public function testListForeignKeysFromExistingDatabase(): void
     {
diff --git a/tests/Functional/Schema/SchemaManagerTest.php b/tests/Functional/Schema/SchemaManagerTest.php
@@ -251,8 +251,15 @@ public function testAutoIncrementColumnInCompositePrimaryKeyIntrospection(bool $
     /** @throws Exception */
     public function testIntrospectTableWithDotInName(): void
     {
-        $table = new Table('"example.com"');
-        $table->addColumn('id', Types::INTEGER);
+        $table = Table::editor()
+            ->setQuotedName('example.com')
+            ->setColumns(
+                Column::editor()
+                    ->setUnquotedName('id')
+                    ->setTypeName(Types::INTEGER)
+                    ->create(),
+            )
+            ->create();
 
         $this->dropAndCreateTable($table);
 
diff --git a/tests/Platforms/AbstractPlatformTestCase.php b/tests/Platforms/AbstractPlatformTestCase.php
@@ -1075,14 +1075,21 @@ public function testNamedPrimaryKeyConstraintIsReportedAsUnsupported(): void
             self::markTestSkipped('This current database platform supports named primary key constraints.');
         }
 
-        $table = new Table('users');
-        $table->addColumn('id', Types::INTEGER);
-        $table->addPrimaryKeyConstraint(
-            PrimaryKeyConstraint::editor()
-                ->setUnquotedName('users_pk')
-                ->setUnquotedColumnNames('id')
-                ->create(),
-        );
+        $table = Table::editor()
+            ->setUnquotedName('users')
+            ->setColumns(
+                Column::editor()
+                    ->setUnquotedName('id')
+                    ->setTypeName(Types::INTEGER)
+                    ->create(),
+            )
+            ->setPrimaryKeyConstraint(
+                PrimaryKeyConstraint::editor()
+                    ->setUnquotedName('users_pk')
+                    ->setUnquotedColumnNames('id')
+                    ->create(),
+            )
+            ->create();
 
         $this->expectException(UnsupportedPrimaryKeyConstraintDefinition::class);
         $this->platform->getCreateTableSQL($table);
@@ -1098,14 +1105,21 @@ public function testNonClusteredPrimaryKeyConstraintIsReportedAsUnsupported(): v
             self::markTestSkipped('This current database platform supports non-clustered primary key constraints.');
         }
 
-        $table = new Table('users');
-        $table->addColumn('id', Types::INTEGER);
-        $table->addPrimaryKeyConstraint(
-            PrimaryKeyConstraint::editor()
-                ->setIsClustered(false)
-                ->setUnquotedColumnNames('id')
-                ->create(),
-        );
+        $table = Table::editor()
+            ->setUnquotedName('users')
+            ->setColumns(
+                Column::editor()
+                    ->setUnquotedName('id')
+                    ->setTypeName(Types::INTEGER)
+                    ->create(),
+            )
+            ->setPrimaryKeyConstraint(
+                PrimaryKeyConstraint::editor()
+                    ->setIsClustered(false)
+                    ->setUnquotedColumnNames('id')
+                    ->create(),
+            )
+            ->create();
 
         $this->expectException(UnsupportedPrimaryKeyConstraintDefinition::class);
         $this->platform->getCreateTableSQL($table);
diff --git a/tests/Schema/SchemaTest.php b/tests/Schema/SchemaTest.php
@@ -422,7 +422,10 @@ public function testAddObjectWithQualifiedNameAfterUnqualifiedNameWithDefaultNam
         $schemaConfig = new SchemaConfig();
         $schemaConfig->setName('public');
 
-        $schema = new Schema([new Table('t'), new Table('public.s')], [], $schemaConfig);
+        $schema = new Schema([
+            $this->createTable('t'),
+            $this->createTable('s', 'public'),
+        ], [], $schemaConfig);
 
         self::assertTrue($schema->hasTable('t'));
         self::assertTrue($schema->hasTable('public.s'));
@@ -433,7 +436,10 @@ public function testAddObjectWithUnqualifiedNameAfterQualifiedNameWithDefaultNam
         $schemaConfig = new SchemaConfig();
         $schemaConfig->setName('public');
 
-        $schema = new Schema([new Table('public.t'), new Table('s')], [], $schemaConfig);
+        $schema = new Schema([
+            $this->createTable('t', 'public'),
+            $this->createTable('s'),
+        ], [], $schemaConfig);
 
         self::assertTrue($schema->hasTable('public.t'));
         self::assertTrue($schema->hasTable('s'));
diff --git a/tests/Schema/TableTest.php b/tests/Schema/TableTest.php

Original file line number	Diff line number	Diff line change
`@@ -43,14 +43,6 @@ public function testListDatabases(): void`
`43`	`43`	`$this->schemaManager->listDatabases();`
`44`	`44`	`}`
`45`	`45`
`46`		`- public function createListTableColumns(): Table`
`47`		`- {`
`48`		`- $table = parent::createListTableColumns();`
`49`		`- $table->getColumn('id')->setAutoincrement(true);`
`50`		`-`
`51`		`- return $table;`
`52`		`- }`
`53`		`-`
`54`	`46`	`/** @throws Exception */`
`55`	`47`	`public function testListForeignKeysFromExistingDatabase(): void`
`56`	`48`	`{`