doctrine#2930 Added diff length for TextType

WhiteEagle88 · Nov 30, 2017 · 244844c · 244844c
1 parent a4d7acd
commit 244844c
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/lib/Doctrine/DBAL/Schema/Comparator.php b/lib/Doctrine/DBAL/Schema/Comparator.php
@@ -451,7 +451,8 @@ public function diffColumn(Column $column1, Column $column2)
             $changedProperties[] = 'default';
         }
 
-        if (($properties1['type'] instanceof Types\StringType && ! $properties1['type'] instanceof Types\GuidType) ||
+        if ((($properties1['type'] instanceof Types\TextType || $properties1['type'] instanceof Types\StringType) &&
+                ! $properties1['type'] instanceof Types\GuidType) ||
             $properties1['type'] instanceof Types\BinaryType
         ) {
             // check if value of length is set at all, default value assumed otherwise.

diff --git a/tests/Doctrine/Tests/DBAL/Functional/Schema/MySqlSchemaManagerTest.php b/tests/Doctrine/Tests/DBAL/Functional/Schema/MySqlSchemaManagerTest.php
@@ -477,4 +477,23 @@ public function testEnsureDefaultsAreUnescapedFromSchemaIntrospection() : void
         $onlineTable = $this->_sm->listTableDetails("test_column_defaults_with_create");
         self::assertSame($default, $onlineTable->getColumn('col1')->getDefault());
     }
+
+    /**
+     * @group DBAL-2930
+     */
+    public function testComparatorForTextType()
+    {
+        $first = new Table('test_text_length');
+        $first->addColumn('col_medium', 'text', ['length' => 1000]);
+        $this->_sm->createTable($first);
+        $table = $this->_sm->createSchema()->getTable('test_text_length');
+        $table->changeColumn('col_medium', ['length' => 16777215]);
+
+        $comparator = new Comparator();
+
+        self::assertNotFalse(
+            $comparator->diffTable($first, $table),
+            'Differences should be detected in the changing length of the text field.'
+        );
+    }
 }