This commit is contained in:
parent
fae059c8e0
commit
15db4bd535
@ -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
|
|||||||
$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'])) {
|
||||||
|
Loading…
Reference in New Issue
Block a user