Skip to content

D
doctrine-dbal
Commit 72466b36 authored by zYne's avatar zYne
Browse files
Options

--no commit message 

--no commit message
parent b21faef5
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 4 deletions
lib/Doctrine/Relation/Parser.php
View file @ 72466b36
......@@ -102,6 +102,8 @@ class Doctrine_Relation_Parser
}
$this->_pending[$alias] = array_merge($options, array('class' => $name, 'alias' => $alias));
return $this->_pending[$alias];
}
/**
* getRelation
......@@ -124,8 +126,8 @@ class Doctrine_Relation_Parser
$localClasses = array_merge($this->_table->getOption('parents'), array($this->_table->getComponentName()));
if ( ! isset($this->_pending[$def['refClass']]) &&
! isset($this->_relations[$def['refClass']])) {
! isset($this->_relations[$def['refClass']])) {
$def['refTable']->getRelationParser()->bind($this->_table->getComponentName(),
array('type' => Doctrine_Relation::ONE,
'local' => $def['local'],
......@@ -133,8 +135,10 @@ class Doctrine_Relation_Parser
'localKey' => true,
));
$this->bind($def['refClass'], array('type' => Doctrine_Relation::MANY,
'foreign' => $def['local']));
$this->bind($def['refClass'], array('type' => Doctrine_Relation::MANY,
'foreign' => $def['local'],
'local' => $this->_table->getIdentifier()));
}
if (in_array($def['class'], $localClasses)) {
$rel = new Doctrine_Relation_Nest($def);
......
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