Skip to content

Commit

Permalink
convention fixes doctrine#2
Browse files Browse the repository at this point in the history
  • Loading branch information
rivaros authored and beberlei committed Mar 14, 2012
1 parent 8c8deb9 commit f51409b
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions lib/Doctrine/ORM/Mapping/Driver/DatabaseDriver.php
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,6 @@ public function loadMetadataForClass($className, ClassMetadataInfo $metadata)
foreach ($columns as $column) {
$fieldMapping = array();


if (in_array($column->getName(), $allForeignKeyColumns)) {
continue;
} else if ($primaryKeyColumns && in_array($column->getName(), $primaryKeyColumns)) {
Expand Down Expand Up @@ -312,7 +311,7 @@ public function loadMetadataForClass($className, ClassMetadataInfo $metadata)
}

//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);
}
else {
Expand Down

0 comments on commit f51409b

Please sign in to comment.