Merge pull request #11900 from xabbuh/dbal-6886

greg0ire · web-flow · commit 0b373f6c2794 · 2025-04-14T23:17:07.000+02:00
replace Index::overrules() with custom checks
diff --git a/src/Tools/SchemaTool.php b/src/Tools/SchemaTool.php
@@ -319,7 +319,7 @@ public function getSchemaFromMetadata(array $classes): Schema
             $primaryKey = $table->getIndex('primary');
 
             foreach ($table->getIndexes() as $idxKey => $existingIndex) {
-                if ($primaryKey->overrules($existingIndex)) {
+                if (! $existingIndex->isPrimary() && $primaryKey->spansColumns($existingIndex->getColumns())) {
                     $table->dropIndex($idxKey);
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -319,7 +319,7 @@ public function getSchemaFromMetadata(array $classes): Schema`
`319`	`319`	`$primaryKey = $table->getIndex('primary');`
`320`	`320`
`321`	`321`	`foreach ($table->getIndexes() as $idxKey => $existingIndex) {`
`322`		`- if ($primaryKey->overrules($existingIndex)) {`
	`322`	`+ if (! $existingIndex->isPrimary() && $primaryKey->spansColumns($existingIndex->getColumns())) {`
`323`	`323`	`$table->dropIndex($idxKey);`
`324`	`324`	`}`
`325`	`325`	`}`