RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-02-02 21:41:45 +03:00
Code Issues Projects Releases Wiki Activity

[DDC-3711] Correct Error on manyToMany with composite primary key

Browse Source
This commit is contained in:
Pantel 2015-10-31 16:02:14 +01:00 committed by Guilherme Blanco
parent 3a058f8522
commit 17ae8d1b2d
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php
View File

@ -514,20 +514,18 @@ class YamlDriver extends FileDriver
if ( ! isset($joinColumnElement['name'])) { if ( ! isset($joinColumnElement['name'])) {
$joinColumnElement['name'] = $joinColumnName; $joinColumnElement['name'] = $joinColumnName;
} }
}
$joinTable['joinColumns'][] = $this->joinColumnToArray($joinColumnElement); $joinTable['joinColumns'][] = $this->joinColumnToArray($joinColumnElement);
} }
}
if (isset($joinTableElement['inverseJoinColumns'])) { if (isset($joinTableElement['inverseJoinColumns'])) {
foreach ($joinTableElement['inverseJoinColumns'] as $joinColumnName => $joinColumnElement) { foreach ($joinTableElement['inverseJoinColumns'] as $joinColumnName => $joinColumnElement) {
if ( ! isset($joinColumnElement['name'])) { if ( ! isset($joinColumnElement['name'])) {
$joinColumnElement['name'] = $joinColumnName; $joinColumnElement['name'] = $joinColumnName;
} }
}
$joinTable['inverseJoinColumns'][] = $this->joinColumnToArray($joinColumnElement); $joinTable['inverseJoinColumns'][] = $this->joinColumnToArray($joinColumnElement);
} }
}
$mapping['joinTable'] = $joinTable; $mapping['joinTable'] = $joinTable;
} }