Fixing indexes on multi column with foreign key and quoted column

moufmouf · moufmouf · commit dd3501b7358f · 2020-08-04T16:11:41.000+02:00
diff --git a/src/Utils/BeanDescriptor.php b/src/Utils/BeanDescriptor.php
@@ -1349,7 +1349,7 @@ private function generateFindByDaoCodeForIndex(Index $index, string $beanNamespa
                 }
             } elseif ($element instanceof ObjectBeanPropertyDescriptor) {
                 $foreignKey = $element->getForeignKey();
-                $columns = SafeFunctions::arrayCombine($foreignKey->getLocalColumns(), $foreignKey->getForeignColumns());
+                $columns = SafeFunctions::arrayCombine($foreignKey->getUnquotedLocalColumns(), $foreignKey->getUnquotedForeignColumns());
                 ++$count;
                 $foreignTable = $this->schema->getTable($foreignKey->getForeignTableName());
                 foreach ($columns as $localColumn => $foreignColumn) {

Original file line number	Diff line number	Diff line change
`@@ -1349,7 +1349,7 @@ private function generateFindByDaoCodeForIndex(Index $index, string $beanNamespa`
`1349`	`1349`	`}`
`1350`	`1350`	`} elseif ($element instanceof ObjectBeanPropertyDescriptor) {`
`1351`	`1351`	`$foreignKey = $element->getForeignKey();`
`1352`		`- $columns = SafeFunctions::arrayCombine($foreignKey->getLocalColumns(), $foreignKey->getForeignColumns());`
	`1352`	`+ $columns = SafeFunctions::arrayCombine($foreignKey->getUnquotedLocalColumns(), $foreignKey->getUnquotedForeignColumns());`
`1353`	`1353`	`++$count;`
`1354`	`1354`	`$foreignTable = $this->schema->getTable($foreignKey->getForeignTableName());`
`1355`	`1355`	`foreach ($columns as $localColumn => $foreignColumn) {`