Merge pull request #6423 from berkut1/3.8.x

Fix: Skip type comparison if disableTypeComments is true
doctrine · Jun 7, 2024 · 537e6b3 · 537e6b3
2 parents 080aab5 + 630c44c
commit 537e6b3
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/src/Platforms/AbstractPlatform.php b/src/Platforms/AbstractPlatform.php
@@ -4693,6 +4693,11 @@ public function columnsEqual(Column $column1, Column $column2): bool
             return false;
         }
 
+        // If disableTypeComments is true, we do not need to check types, all comparison is already done above
+        if ($this->disableTypeComments) {
+            return true;
+        }
+
         return $column1->getType() === $column2->getType();
     }
 

diff --git a/tests/Platforms/AbstractPlatformTestCase.php b/tests/Platforms/AbstractPlatformTestCase.php
@@ -1445,6 +1445,18 @@ public function testEmptySchemaDiff(): void
         self::assertSame([], $this->platform->getAlterSchemaSQL($diff));
     }
 
+    public function testColumnComparison(): void
+    {
+        //Since DATETIME_MUTABLE is a "parent" of DATETIME_IMMUTABLE, they will have the same SQL type declaration.
+        $column1 = new Column('foo', Type::getType(Types::DATETIME_MUTABLE));
+        $column2 = new Column('foo', Type::getType(Types::DATETIME_IMMUTABLE));
+
+        self::assertFalse($this->platform->columnsEqual($column1, $column2));
+
+        $this->platform->setDisableTypeComments(true);
+        self::assertTrue($this->platform->columnsEqual($column1, $column2));
+    }
+
     public function tearDown(): void
     {
         if (! isset($this->backedUpType)) {