Fix MySQL schema reflection when columns have expressions

markstory · markstory · commit 77760a9e6185 · 2022-09-10T16:43:45.000-04:00
Skip over empty columns when reflecting schema. Currently schema
reflection doesn't support expressions for indexes. This isn't ideal but
we are also missing schema generation and migration support for index
expressions.

Fixes #16727
diff --git a/Schema/MysqlSchemaDialect.php b/Schema/MysqlSchemaDialect.php
@@ -238,7 +238,9 @@ public function convertIndexDescription(TableSchema $schema, array $row): void
             $name = $type = TableSchema::CONSTRAINT_PRIMARY;
         }
 
-        $columns[] = $row['Column_name'];
+        if (strlen($row['Column_name'] ?? '')) {
+            $columns[] = $row['Column_name'];
+        }
 
         if ($row['Index_type'] === 'FULLTEXT') {
             $type = TableSchema::INDEX_FULLTEXT;

Original file line number	Diff line number	Diff line change
`@@ -238,7 +238,9 @@ public function convertIndexDescription(TableSchema $schema, array $row): void`
`238`	`238`	`$name = $type = TableSchema::CONSTRAINT_PRIMARY;`
`239`	`239`	`}`
`240`	`240`
`241`		`- $columns[] = $row['Column_name'];`
	`241`	`+ if (strlen($row['Column_name'] ?? '')) {`
	`242`	`+ $columns[] = $row['Column_name'];`
	`243`	`+ }`
`242`	`244`
`243`	`245`	`if ($row['Index_type'] === 'FULLTEXT') {`
`244`	`246`	`$type = TableSchema::INDEX_FULLTEXT;`