RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-01-20 07:21:40 +03:00
Code Issues Projects Releases Wiki Activity

Browse Source
This commit is contained in:
zYne 2007-06-14 16:01:15 +00:00
parent b21faef5b9
commit 72466b364e
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/Doctrine/Relation/Parser.php
View File

@ -102,6 +102,8 @@ class Doctrine_Relation_Parser
} }
$this->_pending[$alias] = array_merge($options, array('class' => $name, 'alias' => $alias)); $this->_pending[$alias] = array_merge($options, array('class' => $name, 'alias' => $alias));
return $this->_pending[$alias];
} }
/** /**
* getRelation * getRelation
@ -124,8 +126,8 @@ class Doctrine_Relation_Parser
$localClasses = array_merge($this->_table->getOption('parents'), array($this->_table->getComponentName())); $localClasses = array_merge($this->_table->getOption('parents'), array($this->_table->getComponentName()));
if ( ! isset($this->_pending[$def['refClass']]) && if ( ! isset($this->_pending[$def['refClass']]) &&
! isset($this->_relations[$def['refClass']])) { ! isset($this->_relations[$def['refClass']])) {
$def['refTable']->getRelationParser()->bind($this->_table->getComponentName(), $def['refTable']->getRelationParser()->bind($this->_table->getComponentName(),
array('type' => Doctrine_Relation::ONE, array('type' => Doctrine_Relation::ONE,
'local' => $def['local'], 'local' => $def['local'],
@ -133,8 +135,10 @@ class Doctrine_Relation_Parser
'localKey' => true, 'localKey' => true,
)); ));
$this->bind($def['refClass'], array('type' => Doctrine_Relation::MANY, $this->bind($def['refClass'], array('type' => Doctrine_Relation::MANY,
'foreign' => $def['local'])); 'foreign' => $def['local'],
'local' => $this->_table->getIdentifier()));
} }
if (in_array($def['class'], $localClasses)) { if (in_array($def['class'], $localClasses)) {
$rel = new Doctrine_Relation_Nest($def); $rel = new Doctrine_Relation_Nest($def);