RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2024-12-14 23:26:04 +03:00
Code Issues Projects Releases Wiki Activity

fixes #424

Browse Source
This commit is contained in:
zYne 2007-08-09 17:31:31 +00:00
parent 5f7afb93f9
commit 78f683d855
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Doctrine/Query.php
View File

@ -1280,6 +1280,8 @@ class Doctrine_Query extends Doctrine_Query_Abstract implements Countable
$join = ($delimeter == ':') ? 'INNER JOIN ' : 'LEFT JOIN '; $join = ($delimeter == ':') ? 'INNER JOIN ' : 'LEFT JOIN ';
$relation = $table->getRelation($name); $relation = $table->getRelation($name);
$localTable = $table;
$table = $relation->getTable(); $table = $relation->getTable();
$this->_aliasMap[$componentAlias] = array('table' => $table, $this->_aliasMap[$componentAlias] = array('table' => $table,
'parent' => $parent, 'parent' => $parent,
@ -1321,7 +1323,7 @@ class Doctrine_Query extends Doctrine_Query_Abstract implements Countable
$queryPart .= ' ON ' . $localAlias $queryPart .= ' ON ' . $localAlias
. '.' . '.'
. $table->getColumnName($table->getIdentifier()) . $localTable->getIdentifier()
. ' = ' . ' = '
. $assocAlias . '.' . $relation->getLocal(); . $assocAlias . '.' . $relation->getLocal();