RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-01-30 12:01:44 +03:00
Code Issues Projects Releases Wiki Activity

Browse Source
This commit is contained in:
zYne 2007-10-30 19:19:53 +00:00
parent 1d6020c454
commit 39b8a3e3e2
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/Doctrine/Query.php
View File

@ -51,7 +51,7 @@ class Doctrine_Query extends Doctrine_Query_Abstract implements Countable
'BY', 'BY',
'CHARACTER_LENGTH', 'CHARACTER_LENGTH',
'CHAR_LENGTH', 'CHAR_LENGTH',
'CURRENT_DATE', 'CURRENT_DATE',
'CURRENT_TIME', 'CURRENT_TIME',
'CURRENT_TIMESTAMP', 'CURRENT_TIMESTAMP',
'DELETE', 'DELETE',
@ -688,6 +688,8 @@ class Doctrine_Query extends Doctrine_Query_Abstract implements Countable
$componentAlias = $this->getRootAlias(); $componentAlias = $this->getRootAlias();
} }
$this->load($componentAlias);
// check the existence of the component alias // check the existence of the component alias
if ( ! isset($this->_aliasMap[$componentAlias])) { if ( ! isset($this->_aliasMap[$componentAlias])) {
throw new Doctrine_Query_Exception('Unknown component alias ' . $componentAlias); throw new Doctrine_Query_Exception('Unknown component alias ' . $componentAlias);
@ -1463,8 +1465,11 @@ class Doctrine_Query extends Doctrine_Query_Abstract implements Countable
return $this; return $this;
} }
public function load($path, $loadFields = true) public function load($path, $loadFields = true)
{ {
if (isset($this->_aliasMap[$path])) {
return $this->_aliasMap[$path];
}
$e = Doctrine_Tokenizer::quoteExplode($path, ' INDEXBY '); $e = Doctrine_Tokenizer::quoteExplode($path, ' INDEXBY ');
$mapWith = null; $mapWith = null;