Skip to content

D
doctrine-dbal
Commit 15db4bd5 authored by zYne's avatar zYne
Browse files
Options

--no commit message 

--no commit message
parent fae059c8
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 1 deletion
lib/Doctrine/Relation/Parser.php
View file @ 15db4bd5
...@@ -174,7 +174,7 @@ class Doctrine_Relation_Parser ...@@ -174,7 +174,7 @@ class Doctrine_Relation_Parser
} }
if ($recursive) { if ($recursive) {
$this->getRelations(); $this->getRelations();
return $this->getRelation($alias, false); return $this->getRelation($alias, false);
} else { } else {
throw new Doctrine_Table_Exception('Unknown relation alias ' . $alias); throw new Doctrine_Table_Exception('Unknown relation alias ' . $alias);
...@@ -328,6 +328,10 @@ class Doctrine_Relation_Parser ...@@ -328,6 +328,10 @@ class Doctrine_Relation_Parser
$def['foreign'] = $def['table']->getIdentifier(); $def['foreign'] = $def['table']->getIdentifier();
$def['localKey'] = true; $def['localKey'] = true;
} }
} else {
if ($def['local'] !== $this->_table->getIdentifier()) {
$def['localKey'] = true;
}
} }
} else { } else {
if (isset($def['foreign'])) { if (isset($def['foreign'])) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment