RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-02-07 15:59:27 +03:00
Code Issues Projects Releases Wiki Activity

#1178 - mapping between criteria parameters and types when fetching on one-to-many with additional criterions

Browse Source
This commit is contained in:
Marco Pivetta 2015-01-17 06:07:36 +01:00
parent ce446a6f03
commit a39b6869ca
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php
View File

@ -1892,10 +1892,11 @@ class BasicEntityPersister implements EntityPersister
list($params, $types) = $this->expandParameters($criteria); list($params, $types) = $this->expandParameters($criteria);
if (null !== $extraConditions) { if (null !== $extraConditions) {
$sql .= ' AND ' . $this->getSelectConditionCriteriaSQL($extraConditions); $sql .= ' AND ' . $this->getSelectConditionCriteriaSQL($extraConditions);
list($criteriaParams, $types) = $this->expandCriteriaParameters($extraConditions); list($criteriaParams, $criteriaTypes) = $this->expandCriteriaParameters($extraConditions);
$params = array_merge($params, $criteriaParams); $params = array_merge($params, $criteriaParams);
$types = array_merge($types, $criteriaTypes);
} }
if ($filterSql = $this->generateFilterConditionSQL($this->class, $alias)) { if ($filterSql = $this->generateFilterConditionSQL($this->class, $alias)) {