Populate indexed column lengths only with non-null values

Author: morozov

src/Schema/IndexEditor.php

@@ -136,13 +136,21 @@ public function create(): Index
             throw InvalidIndexDefinition::columnsNotSet($this->name);
         }
 
-        $columnNames = $lengths = $flags = [];
-        foreach ($this->columns as $column) {
+        $columnNames = $lengths = $options = $flags = [];
+        foreach ($this->columns as $i => $column) {
             $columnNames[] = $column->getColumnName()->toString();
-            $lengths[]     = $column->getLength();
+
+            $length = $column->getLength();
+            if ($length === null) {
+                continue;
+            }
+
+            $lengths[$i] = $column->getLength();
         }
 
-        $options = ['lengths' => $lengths];
+        if (count($lengths) !== 0) {
+            $options['lengths'] = $lengths;
+        }
 
         if ($this->type === IndexType::FULLTEXT) {
             $flags[] = 'fulltext';

tests/Schema/AbstractComparatorTestCase.php

@@ -473,21 +473,37 @@ public function testCompareColumnCompareCaseInsensitive(): void
 
     public function testCompareIndexBasedOnPropertiesNotName(): void
     {
-        $tableA = new Table('foo', [
-            Column::editor()
-                ->setUnquotedName('id')
-                ->setTypeName(Types::INTEGER)
-                ->create(),
-        ]);
-        $tableA->addIndex(['id'], 'foo_bar_idx');
+        $tableA = Table::editor()
+            ->setUnquotedName('foo')
+            ->setColumns(
+                Column::editor()
+                    ->setUnquotedName('id')
+                    ->setTypeName(Types::INTEGER)
+                    ->create(),
+            )
+            ->setIndexes(
+                Index::editor()
+                    ->setUnquotedName('foo_bar_idx')
+                    ->setUnquotedColumnNames('id')
+                    ->create(),
+            )
+            ->create();
 
-        $tableB = new Table('foo', [
-            Column::editor()
-                ->setUnquotedName('ID')
-                ->setTypeName(Types::INTEGER)
-                ->create(),
-        ]);
-        $tableB->addIndex(['id'], 'bar_foo_idx');
+        $tableB = Table::editor()
+            ->setUnquotedName('foo')
+            ->setColumns(
+                Column::editor()
+                    ->setUnquotedName('ID')
+                    ->setTypeName(Types::INTEGER)
+                    ->create(),
+            )
+            ->setIndexes(
+                Index::editor()
+                    ->setUnquotedName('bar_foo_idx')
+                    ->setUnquotedColumnNames('id')
+                    ->create(),
+            )
+            ->create();
 
         self::assertEquals(
             new TableDiff($tableA, renamedIndexes: [