RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2024-12-13 22:56:04 +03:00
Code Issues Projects Releases Wiki Activity

Convention fix

Browse Source
This commit is contained in:
rivaros 2012-03-05 10:29:06 +02:00 committed by Benjamin Eberlei
parent b346f1901a
commit 9c4e52c136
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/Doctrine/ORM/Mapping/Driver/DatabaseDriver.php
View File

@ -298,7 +298,7 @@ class DatabaseDriver implements Driver
$associationMapping = array(); $associationMapping = array();
$associationMapping['fieldName'] = $this->getFieldNameForColumn($tableName, $localColumn, true); $associationMapping['fieldName'] = $this->getFieldNameForColumn($tableName, $localColumn, true);
$associationMapping['targetEntity'] = $this->getClassNameForTable($foreignTable); $associationMapping['targetEntity'] = $this->getClassNameForTable($foreignTable);
if ($primaryKeyColumns && in_array($localColumn, $primaryKeyColumns)) { if ($primaryKeyColumns && in_array($localColumn, $primaryKeyColumns)) {
$associationMapping['id'] = true; $associationMapping['id'] = true;
} }
@ -313,8 +313,7 @@ class DatabaseDriver implements Driver
//Here we need to check if $cols are the same as $primaryKeyColums //Here we need to check if $cols are the same as $primaryKeyColums
if (!array_diff($cols,$primaryKeyColumns)) { if (!array_diff($cols,$primaryKeyColumns)) {
$metadata->mapOneToOne($associationMapping); $metadata->mapOneToOne($associationMapping);
} } else {
else {
$metadata->mapManyToOne($associationMapping); $metadata->mapManyToOne($associationMapping);
} }
} }