Added support for ResultVariable referencing in ArithmeticPrimary. Fixes DDC-1346.

guilhermeblanco · guilhermeblanco · commit 6bbf2d9da35a · 2011-09-05T03:16:01.000-03:00
diff --git a/lib/Doctrine/ORM/Query/Parser.php b/lib/Doctrine/ORM/Query/Parser.php
@@ -2381,7 +2381,7 @@ public function ArithmeticFactor()
     /**
      * ArithmeticPrimary ::= SingleValuedPathExpression | Literal | "(" SimpleArithmeticExpression ")"
      *          | FunctionsReturningNumerics | AggregateExpression | FunctionsReturningStrings
-     *          | FunctionsReturningDatetime | IdentificationVariable | CaseExpression
+     *          | FunctionsReturningDatetime | IdentificationVariable | ResultVariable | CaseExpression
      */
     public function ArithmeticPrimary()
     {
@@ -2410,7 +2410,11 @@ public function ArithmeticPrimary()
                 if ($peek['value'] == '.') {
                     return $this->SingleValuedPathExpression();
                 }
-
+                
+                if (isset($this->_queryComponents[$this->_lexer->lookahead['value']]['resultVariable'])) {
+                    return $this->ResultVariable();
+                }
+                
                 return $this->StateFieldPathExpression();
 
             case Lexer::T_INPUT_PARAMETER:
diff --git a/lib/Doctrine/ORM/Query/SqlWalker.php b/lib/Doctrine/ORM/Query/SqlWalker.php
@@ -1971,6 +1971,12 @@ public function walkSimpleArithmeticExpression($simpleArithmeticExpr)
     public function walkArithmeticTerm($term)
     {
         if (is_string($term)) {
+            if (isset($this->_queryComponents[$term])) {
+                $columnName = $this->_queryComponents[$term]['token']['value'];
+                
+                return $this->_scalarResultAliasMap[$columnName];
+            }
+            
             return $term;
         }
 
diff --git a/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php b/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php
@@ -38,7 +38,7 @@ public function assertSqlGeneration($dqlToBeTested, $sqlToBeConfirmed, array $qu
             foreach ($queryHints AS $name => $value) {
                 $query->setHint($name, $value);
             }
-
+            
             parent::assertEquals($sqlToBeConfirmed, $query->getSQL());
             $query->free();
         } catch (\Exception $e) {
@@ -991,6 +991,14 @@ public function testSubSelectAliasesFromOuterQueryWithSubquery()
         );
     }
 
+    public function testSubSelectAliasesFromOuterQueryReuseInWhereClause()
+    {
+        $this->assertSqlGeneration(
+            "SELECT uo, (SELECT ui.name FROM Doctrine\Tests\Models\CMS\CmsUser ui WHERE ui.id = uo.id) AS bar FROM Doctrine\Tests\Models\CMS\CmsUser uo WHERE bar = ?0",
+            "SELECT c0_.id AS id0, c0_.status AS status1, c0_.username AS username2, c0_.name AS name3, (SELECT c1_.name FROM cms_users c1_ WHERE c1_.id = c0_.id) AS sclr4 FROM cms_users c0_ WHERE sclr4 = ?"
+        );
+    }
+
     /**
      * @group DDC-1298
      */

Original file line number	Diff line number	Diff line change
`@@ -1971,6 +1971,12 @@ public function walkSimpleArithmeticExpression($simpleArithmeticExpr)`
`1971`	`1971`	`public function walkArithmeticTerm($term)`
`1972`	`1972`	`{`
`1973`	`1973`	`if (is_string($term)) {`
	`1974`	`+ if (isset($this->_queryComponents[$term])) {`
	`1975`	`+ $columnName = $this->_queryComponents[$term]['token']['value'];`
	`1976`	`+`
	`1977`	`+ return $this->_scalarResultAliasMap[$columnName];`
	`1978`	`+ }`
	`1979`	`+`
`1974`	`1980`	`return $term;`
`1975`	`1981`	`}`
`1976`	`1982`