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

Centralize InputParameter SQL generation.

Browse source
This commit is contained in:
Guilherme Blanco 2013-08-19 00:33:45 -04:00
parent 43fc8bafa7
commit cc83ac6ce8
1 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/Doctrine/ORM/Query/SqlWalker.php
View file

@ -1954,9 +1954,7 @@ class SqlWalker implements TreeWalker
// Handle InputParameter mapping inclusion to ParserResult // Handle InputParameter mapping inclusion to ParserResult
if ($expression instanceof AST\InputParameter) { if ($expression instanceof AST\InputParameter) {
$this->parserResult->addParameterMapping($expression->name, $this->sqlParamIndex++); return $this->walkInputParameter($expression) . $comparison;
return '?' . $comparison;
} }
return $expression->dispatch($this) . $comparison; return $expression->dispatch($this) . $comparison;
@ -2094,10 +2092,7 @@ class SqlWalker implements TreeWalker
$sql = $leftExpr . ($likeExpr->not ? ' NOT' : '') . ' LIKE '; $sql = $leftExpr . ($likeExpr->not ? ' NOT' : '') . ' LIKE ';
if ($likeExpr->stringPattern instanceof AST\InputParameter) { if ($likeExpr->stringPattern instanceof AST\InputParameter) {
$inputParam = $likeExpr->stringPattern; $sql .= $this->walkInputParameter($likeExpr->stringPattern);
$dqlParamKey = $inputParam->name;
$this->parserResult->addParameterMapping($dqlParamKey, $this->sqlParamIndex++);
$sql .= '?';
} elseif ($likeExpr->stringPattern instanceof AST\Functions\FunctionNode) { } elseif ($likeExpr->stringPattern instanceof AST\Functions\FunctionNode) {
$sql .= $this->walkFunction($likeExpr->stringPattern); $sql .= $this->walkFunction($likeExpr->stringPattern);
} elseif ($likeExpr->stringPattern instanceof AST\PathExpression) { } elseif ($likeExpr->stringPattern instanceof AST\PathExpression) {