RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-01-19 06:51:40 +03:00
Code Issues Projects Releases Wiki Activity

[DDC-551] Fixed a bug in the sql generation for filters

Browse Source
This commit is contained in:
Alexander 2011-11-01 12:36:06 +01:00
parent 9ccce8ed74
commit 53055f1fb2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Doctrine/ORM/Persisters/BasicEntityPersister.php
View File

@ -1529,7 +1529,7 @@ class BasicEntityPersister
$first = true; $first = true;
foreach($this->_em->getFilters()->getEnabledFilters() as $filter) { foreach($this->_em->getFilters()->getEnabledFilters() as $filter) {
if("" !== $filterExpr = $filter->addFilterConstraint($targetEntity, $targetTableAlias)) { if("" !== $filterExpr = $filter->addFilterConstraint($targetEntity, $targetTableAlias)) {
if ( ! $first) $sql .= ' AND '; else $first = false; if ( ! $first) $filterSql .= ' AND '; else $first = false;
$filterSql .= '(' . $filterExpr . ')'; $filterSql .= '(' . $filterExpr . ')';
} }
} }

2
lib/Doctrine/ORM/Query/SqlWalker.php
View File

@ -358,7 +358,7 @@ class SqlWalker implements TreeWalker
$first = true; $first = true;
foreach($this->_em->getFilters()->getEnabledFilters() as $filter) { foreach($this->_em->getFilters()->getEnabledFilters() as $filter) {
if("" !== $filterExpr = $filter->addFilterConstraint($targetEntity, $targetTableAlias)) { if("" !== $filterExpr = $filter->addFilterConstraint($targetEntity, $targetTableAlias)) {
if ( ! $first) $sql .= ' AND '; else $first = false; if ( ! $first) $filterSql .= ' AND '; else $first = false;
$filterSql .= '(' . $filterExpr . ')'; $filterSql .= '(' . $filterExpr . ')';
} }
} }