Merge pull request #6958 from morozov/preserve-pk-non-clustered

Preserve the non-clustered property of the PK constraint

Author: morozov

src/Schema/Table.php

@@ -26,6 +26,7 @@
 use function array_map;
 use function array_merge;
 use function array_values;
+use function assert;
 use function count;
 use function implode;
 use function in_array;
@@ -200,6 +201,13 @@ public function addPrimaryKeyConstraint(PrimaryKeyConstraint $primaryKeyConstrai
             $primaryKeyConstraint->getObjectName()?->toString(),
         );
 
+        // there is no way to set a primary index with flags. we have to set it and then add the flag
+        if (! $primaryKeyConstraint->isClustered()) {
+            $index = $this->getPrimaryKey();
+            assert($index !== null);
+            $index->addFlag('nonclustered');
+        }
+
         $this->primaryKeyConstraint = $primaryKeyConstraint;
 
         return $this;

tests/Platforms/SQLServerPlatformTest.php

@@ -15,6 +15,7 @@
 use Doctrine\DBAL\Schema\Comparator;
 use Doctrine\DBAL\Schema\ComparatorConfig;
 use Doctrine\DBAL\Schema\Index;
+use Doctrine\DBAL\Schema\PrimaryKeyConstraint;
 use Doctrine\DBAL\Schema\Sequence;
 use Doctrine\DBAL\Schema\Table;
 use Doctrine\DBAL\Schema\TableDiff;
@@ -567,14 +568,21 @@ public function testCreateClusteredIndex(): void
 
     public function testCreateNonClusteredPrimaryKeyInTable(): void
     {
-        $table = new Table('tbl', [
-            Column::editor()
-                ->setUnquotedName('id')
-                ->setTypeName(Types::INTEGER)
-                ->create(),
-        ]);
-        $table->setPrimaryKey(['id']);
-        $table->getIndex('primary')->addFlag('nonclustered');
+        $table = Table::editor()
+            ->setUnquotedName('tbl')
+            ->setColumns(
+                Column::editor()
+                    ->setUnquotedName('id')
+                    ->setTypeName(Types::INTEGER)
+                    ->create(),
+            )
+            ->setPrimaryKeyConstraint(
+                PrimaryKeyConstraint::editor()
+                    ->setUnquotedColumnNames('id')
+                    ->setIsClustered(false)
+                    ->create(),
+            )
+            ->create();
 
         self::assertEquals(
             ['CREATE TABLE tbl (id INT NOT NULL, PRIMARY KEY NONCLUSTERED (id))'],