Merge branch '4.1.x' into 5.0.x

* 4.1.x:
  Add deprecation layer for TableDiff methods (#6482)
  Ensure PostgreSQL field length change is executed again (#6490)

Author: derrabus

UPGRADE.md

@@ -20,6 +20,11 @@ all drivers and middleware.
 
 # Upgrade to 4.1
 
+## Deprecated `TableDiff` methods
+
+The `TableDiff` methods `getModifiedColumns()` and `getRenamedColumns()` have been merged into a single
+method `getChangedColumns()`. Use this method instead.
+
 ## Deprecated support for MariaDB 10.4 and MySQL 5.7
 
 * Upgrade to MariaDB 10.5 or later.

psalm.xml.dist

@@ -48,6 +48,8 @@
                     See https://github.com/doctrine/dbal/pull/6202
                     TODO: remove in 4.0.0
                 -->
+                <referencedMethod name="Doctrine\DBAL\Schema\TableDiff::getModifiedColumns" />
+                <referencedMethod name="Doctrine\DBAL\Schema\TableDiff::getRenamedColumns" />
                 <referencedMethod name="Doctrine\DBAL\Platforms\AbstractMySQLPlatform::getColumnTypeSQLSnippets" />
                 <referencedMethod name="Doctrine\DBAL\Platforms\AbstractMySQLPlatform::getDatabaseNameSQL" />
 

src/Platforms/PostgreSQLPlatform.php

@@ -252,6 +252,7 @@ public function getAlterTableSQL(TableDiff $diff): array
                 || $columnDiff->hasPrecisionChanged()
                 || $columnDiff->hasScaleChanged()
                 || $columnDiff->hasFixedChanged()
+                || $columnDiff->hasLengthChanged()
             ) {
                 $type = $newColumn->getType();
 

src/Schema/TableDiff.php

@@ -4,7 +4,10 @@
 
 namespace Doctrine\DBAL\Schema;
 
+use Doctrine\Deprecations\Deprecation;
+
 use function array_filter;
+use function array_values;
 use function count;
 
 /**
@@ -60,6 +63,52 @@ public function getChangedColumns(): array
         return $this->changedColumns;
     }
 
+    /**
+     * @deprecated Use {@see getChangedColumns()} instead.
+     *
+     * @return list<ColumnDiff>
+     */
+    public function getModifiedColumns(): array
+    {
+        Deprecation::triggerIfCalledFromOutside(
+            'doctrine/dbal',
+            'https://github.com/doctrine/dbal/pull/6280',
+            '%s is deprecated, use `getChangedColumns()` instead.',
+            __METHOD__,
+        );
+
+        return array_values(array_filter(
+            $this->getChangedColumns(),
+            static fn (ColumnDiff $diff): bool => $diff->countChangedProperties() > ($diff->hasNameChanged() ? 1 : 0),
+        ));
+    }
+
+    /**
+     * @deprecated Use {@see getChangedColumns()} instead.
+     *
+     * @return array<string,Column>
+     */
+    public function getRenamedColumns(): array
+    {
+        Deprecation::triggerIfCalledFromOutside(
+            'doctrine/dbal',
+            'https://github.com/doctrine/dbal/pull/6280',
+            '%s is deprecated, you should use `getChangedColumns()` instead.',
+            __METHOD__,
+        );
+        $renamed = [];
+        foreach ($this->getChangedColumns() as $diff) {
+            if (! $diff->hasNameChanged()) {
+                continue;
+            }
+
+            $oldColumnName           = $diff->getOldColumn()->getName();
+            $renamed[$oldColumnName] = $diff->getNewColumn();
+        }
+
+        return $renamed;
+    }
+
     /** @return array<Column> */
     public function getDroppedColumns(): array
     {

tests/Functional/Platform/AlterColumnLengthChangeTest.php

@@ -0,0 +1,39 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\DBAL\Tests\Functional\Platform;
+
+use Doctrine\DBAL\Schema\Table;
+use Doctrine\DBAL\Tests\FunctionalTestCase;
+use Doctrine\DBAL\Types\Types;
+
+class AlterColumnLengthChangeTest extends FunctionalTestCase
+{
+    public function testColumnLengthIsChanged(): void
+    {
+        $table = new Table('test_alter_length');
+        $table->addColumn('c1', Types::STRING)->setLength(50);
+
+        $this->dropAndCreateTable($table);
+
+        $sm      = $this->connection->createSchemaManager();
+        $table   = $sm->introspectTable('test_alter_length');
+        $columns = $table->getColumns();
+        self::assertCount(1, $columns);
+        self::assertSame(50, $columns[0]->getLength());
+
+        $table->getColumn('c1')->setLength(100);
+
+        $diff = $sm->createComparator()
+            ->compareTables($sm->introspectTable('test_alter_length'), $table);
+
+        $sm->alterTable($diff);
+
+        $table   = $sm->introspectTable('test_alter_length');
+        $columns = $table->getColumns();
+
+        self::assertCount(1, $columns);
+        self::assertSame(100, $columns[0]->getLength());
+    }
+}

tests/Functional/Platform/RenameColumnTest.php

@@ -39,6 +39,7 @@ public function testColumnPositionRetainedAfterImplicitRenaming(string $columnNa
         self::assertEqualsIgnoringCase($newColumnName, $columns[0]->getName());
         self::assertEqualsIgnoringCase('c2', $columns[1]->getName());
         self::assertCount(1, self::getRenamedColumns($diff));
+        self::assertCount(1, $diff->getRenamedColumns());
     }
 
     /** @return array<string,Column> */
@@ -79,6 +80,8 @@ public function testColumnPositionRetainedAfterExplicitRenaming(string $columnNa
         $columns = $table->getColumns();
 
         self::assertCount(1, $diff->getChangedColumns());
+        self::assertCount(1, $diff->getRenamedColumns());
+        self::assertCount(1, $diff->getModifiedColumns());
         self::assertCount(2, $columns);
         self::assertEqualsIgnoringCase($newColumnName, $columns[0]->getName());
         self::assertEqualsIgnoringCase('c2', $columns[1]->getName());

tests/Functional/Schema/ComparatorTest.php

@@ -74,7 +74,9 @@ public function testRenameColumnComparison(): void
 
         $compareResult  = $comparator->compareTables($onlineTable, $table);
         $renamedColumns = RenameColumnTest::getRenamedColumns($compareResult);
+        self::assertSame($renamedColumns, $compareResult->getRenamedColumns());
         self::assertCount(3, $compareResult->getChangedColumns());
+        self::assertCount(2, $compareResult->getModifiedColumns());
         self::assertCount(2, $renamedColumns);
         self::assertArrayHasKey('test2', $renamedColumns);