RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-01-18 22:41:43 +03:00
Code Issues Projects Releases Wiki Activity

Browse Source
This commit is contained in:
zYne 2007-05-22 20:11:56 +00:00
parent f6bb8c9726
commit 124fbff038
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,10 +43,6 @@ class Doctrine_Relation_Parser
* @var array $_pending relations waiting for parsing * @var array $_pending relations waiting for parsing
*/ */
protected $_pending = array(); protected $_pending = array();
/**
* @var array $_relationAliases relation aliases
*/
protected $_aliases = array();
/** /**
* constructor * constructor
* *
@ -99,13 +95,8 @@ class Doctrine_Relation_Parser
$e = explode(' as ', $name); $e = explode(' as ', $name);
$name = $e[0]; $name = $e[0];
$alias = isset($e[1]) ? $e[1] : $name;
if (isset($e[1])) {
$alias = $e[1];
$this->_aliases[$name] = $alias;
} else {
$alias = $name;
}
if ( ! isset($options['type'])) { if ( ! isset($options['type'])) {
throw new Doctrine_Relation_Exception('Relation type not set.'); throw new Doctrine_Relation_Exception('Relation type not set.');
} }
@ -139,6 +130,7 @@ class Doctrine_Relation_Parser
array('type' => Doctrine_Relation::ONE, array('type' => Doctrine_Relation::ONE,
'local' => $def['local'], 'local' => $def['local'],
'foreign' => $this->_table->getIdentifier(), 'foreign' => $this->_table->getIdentifier(),
'localKey' => true,
)); ));
$this->bind($def['refClass'], array('type' => Doctrine_Relation::MANY, $this->bind($def['refClass'], array('type' => Doctrine_Relation::MANY,