From c4209b46549d928449330a1ff143c3ecfa7437b6 Mon Sep 17 00:00:00 2001 From: Bill Schaller Date: Fri, 8 Jan 2016 12:53:05 -0500 Subject: [PATCH] Fix issue were identifier operands in /,* arithmetic terms were not checked to see if they're query components --- lib/Doctrine/ORM/Query/SqlWalker.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/Doctrine/ORM/Query/SqlWalker.php b/lib/Doctrine/ORM/Query/SqlWalker.php index 3dea8de4b..9c4ac2a88 100644 --- a/lib/Doctrine/ORM/Query/SqlWalker.php +++ b/lib/Doctrine/ORM/Query/SqlWalker.php @@ -2264,7 +2264,9 @@ class SqlWalker implements TreeWalker public function walkArithmeticFactor($factor) { if (is_string($factor)) { - return $factor; + return (isset($this->queryComponents[$factor])) + ? $this->walkResultVariable($this->queryComponents[$factor]['token']['value']) + : $factor; } // Phase 2 AST optimization: Skip processing of ArithmeticFactor