|
@@ -187,7 +187,7 @@ |
|
|
block discarded – undo |
|
187
|
187
|
$associationMapping['fieldName'] = $this->getFieldNameForColumn($manyTable->getName(), current($otherFk->getColumns()), true); |
|
188
|
188
|
$associationMapping['targetEntity'] = $this->getClassNameForTable($otherFk->getForeignTableName()); |
|
189
|
189
|
|
|
190
|
|
- if (isset($metadata->fieldMappings[$associationMapping['fieldName']]) |
|
|
190
|
+ if (isset($metadata->fieldMappings[$associationMapping['fieldName']]) |
|
191
|
191
|
|| isset($metadata->associationMappings[$associationMapping['fieldName']])) { |
|
192
|
192
|
$ii=2; |
|
193
|
193
|
while ( isset($metadata->fieldMappings[$associationMapping['fieldName'].(string)$ii]) || |
Please login to merge, or discard this patch.