RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-04-03 13:23:37 +03:00
Code Issues Projects Releases Wiki Activity

[DDC-551] Add filters to eagerly joined entities in the persisters

Browse source
This commit is contained in:
Alexander 2011-10-26 16:11:27 +02:00
parent 07ce4092cd
commit 9ccce8ed74
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/Doctrine/ORM/Persisters/BasicEntityPersister.php
View file

@ -1020,10 +1020,17 @@ class BasicEntityPersister
$this->_selectJoinSql .= ' AND '; $this->_selectJoinSql .= ' AND ';
} }
$tableAlias = $this->_getSQLTableAlias($assoc['targetEntity'], $assocAlias);
$this->_selectJoinSql .= $this->_getSQLTableAlias($assoc['sourceEntity']) . '.' . $sourceCol . ' = ' $this->_selectJoinSql .= $this->_getSQLTableAlias($assoc['sourceEntity']) . '.' . $sourceCol . ' = '
. $this->_getSQLTableAlias($assoc['targetEntity'], $assocAlias) . '.' . $targetCol . ' '; . $tableAlias . '.' . $targetCol . ' ';
$first = false; $first = false;
} }
// Add filter SQL
if('' !== $filterSql = $this->generateFilterConditionSQL($eagerEntity, $tableAlias)) {
$this->_selectJoinSql .= ' AND ' . $filterSql;
}
} else { } else {
$eagerEntity = $this->_em->getClassMetadata($assoc['targetEntity']); $eagerEntity = $this->_em->getClassMetadata($assoc['targetEntity']);
$owningAssoc = $eagerEntity->getAssociationMapping($assoc['mappedBy']); $owningAssoc = $eagerEntity->getAssociationMapping($assoc['mappedBy']);