RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2024-12-05 03:06:05 +03:00
Code Issues Projects Releases Wiki Activity

[DDC-3436] Fix changes requested 2/2

Browse Source
This commit is contained in:
Kiel Goodman 2015-01-12 14:44:46 +00:00 committed by Marco Pivetta
parent dc98da585d
commit 0c5ea34fd4
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/Doctrine/ORM/Query/QueryExpressionVisitor.php
View File

@ -135,21 +135,17 @@ class QueryExpressionVisitor extends ExpressionVisitor
if ( ! isset($this->queryAliases[0])) {
throw new QueryException('No aliases are set before invoking walkComparison().');
}
$field = $comparison->getField();
$hasValidAlias = false;
$field = $this->queryAliases[0] . '.' . $comparison->getField();
foreach($this->queryAliases as $alias) {
if(strpos($field . '.', $alias . '.') === 0) {
$hasValidAlias = true;
if(strpos($comparison->getField() . '.', $alias . '.') === 0) {
$field = $comparison->getField();
break;
}
}
$parameterName = str_replace('.', '_', $field);
if(!$hasValidAlias) {
$field = $this->queryAliases[0] . '.' . $field;
}
$parameterName = str_replace('.', '_', $comparison->getField());
foreach($this->parameters as $parameter) {
if($parameter->getName() === $parameterName) {