Merge pull request #5640 from morozov/sql-server-alter-table-cleanup

Do not use ColumnDiff::$changedProperties in SQLServerPlatform::getAlterTableSQL()
doctrine · Sep 1, 2022 · 2ed2ac1 · 2ed2ac1
2 parents f84b9d9 + f2e8c59
commit 2ed2ac1
Showing 1 changed file with 14 additions and 9 deletions.
diff --git a/src/Platforms/SQLServerPlatform.php b/src/Platforms/SQLServerPlatform.php
@@ -22,7 +22,6 @@
 use function array_merge;
 use function array_unique;
 use function array_values;
-use function count;
 use function crc32;
 use function dechex;
 use function explode;
@@ -415,8 +414,15 @@ public function getAlterTableSQL(TableDiff $diff): array
                 $commentsSql[] = $this->getCreateColumnCommentSQL($diff->name, $column->getQuotedName($this), $comment);
             }
 
-            // Do not add query part if only comment has changed.
-            if ($columnDiff->hasChanged('comment') && count($columnDiff->changedProperties) === 1) {
+            $columnNameSQL = $column->getQuotedName($this);
+
+            $oldDeclarationSQL = $this->getColumnDeclarationSQL($columnNameSQL, $columnDiff->fromColumn->toArray());
+            $newDeclarationSQL = $this->getColumnDeclarationSQL($columnNameSQL, $column->toArray());
+
+            $declarationSQLChanged = $newDeclarationSQL !== $oldDeclarationSQL;
+            $defaultChanged        = $columnDiff->hasChanged('default');
+
+            if (! $declarationSQLChanged && ! $defaultChanged) {
                 continue;
             }
 
@@ -429,14 +435,13 @@ public function getAlterTableSQL(TableDiff $diff): array
                 );
             }
 
-            $columnDef = $column->toArray();
-
-            $queryParts[] = 'ALTER COLUMN ' .
-                    $this->getColumnDeclarationSQL($column->getQuotedName($this), $columnDef);
+            if ($declarationSQLChanged) {
+                $queryParts[] = 'ALTER COLUMN ' . $newDeclarationSQL;
+            }
 
             if (
-                ! isset($columnDef['default'])
-                || (! $requireDropDefaultConstraint && ! $columnDiff->hasChanged('default'))
+                $column->getDefault() === null
+                || (! $requireDropDefaultConstraint && ! $defaultChanged)
             ) {
                 continue;
             }