DDC-1802 fixed parsing: FunctionDeclaration "NOT" ("LIKE" | "IN" | "BETWEEN")

hason · hason · commit 3ab6ad23ad16 · 2012-05-02T19:08:27.000+02:00
diff --git a/lib/Doctrine/ORM/Query/Parser.php b/lib/Doctrine/ORM/Query/Parser.php
@@ -416,9 +416,10 @@ public function semanticalError($message = '', $token = null)
     /**
      * Peek beyond the matched closing parenthesis and return the first token after that one.
      *
+     * @param boolean $resetPeek Reset peek after finding the closing parenthesis
      * @return array
      */
-    private function _peekBeyondClosingParenthesis()
+    private function _peekBeyondClosingParenthesis($resetPeek = true)
     {
         $token = $this->_lexer->peek();
         $numUnmatched = 1;
@@ -440,7 +441,9 @@ private function _peekBeyondClosingParenthesis()
             $token = $this->_lexer->peek();
         }
 
-        $this->_lexer->resetPeek();
+        if ($resetPeek) {
+            $this->_lexer->resetPeek();
+        }
 
         return $token;
     }
@@ -541,7 +544,7 @@ private function _processDeferredPartialObjectExpressions()
 
             foreach ($expr->partialFieldSet as $field) {
                 if (isset($class->fieldMappings[$field])) {
-                	continue;
+                    continue;
                 }
 
                 $this->semanticalError(
@@ -1335,7 +1338,7 @@ public function OrderByItem()
                 break;
             case ($glimpse['type'] === Lexer::T_DOT):
                 $expr = $this->SingleValuedPathExpression();
-                
+
                 break;
             case ($this->_lexer->peek() && $this->_isMathOperator($this->_peekBeyondClosingParenthesis())):
                 $expr = $this->ScalarExpression();
@@ -2206,7 +2209,13 @@ public function SimpleConditionalExpression()
             if ($peek['value'] == '(') {
                 // Peek beyond the matching closing paranthesis ')'
                 $this->_lexer->peek();
-                $token = $this->_peekBeyondClosingParenthesis();
+                $token = $this->_peekBeyondClosingParenthesis(false);
+
+                if ($token['type'] === Lexer::T_NOT) {
+                    $token = $this->_lexer->peek();
+                }
+
+                $this->_lexer->resetPeek();
             } else {
                 // Peek beyond the PathExpression (or InputParameter)
                 $peek = $this->_lexer->peek();
@@ -2658,7 +2667,7 @@ public function AggregateExpression()
             ? $this->SingleValuedPathExpression()
             : $this->SimpleArithmeticExpression();
 
-	    $this->match(Lexer::T_CLOSE_PARENTHESIS);
+        $this->match(Lexer::T_CLOSE_PARENTHESIS);
 
         return new AST\AggregateExpression($functionName, $pathExp, $isDistinct);
     }
diff --git a/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php b/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php
@@ -854,6 +854,26 @@ public function testStringFunctionLikeExpression()
         );
     }
 
+    /**
+     * @group DDC-1802
+     */
+    public function testStringFunctionNotLikeExpression()
+    {
+        $this->assertSqlGeneration(
+                "SELECT u.name FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE LOWER(u.name) NOT LIKE '%foo OR bar%'",
+                "SELECT c0_.name AS name0 FROM cms_users c0_ WHERE LOWER(c0_.name) NOT LIKE '%foo OR bar%'"
+        );
+
+        $this->assertSqlGeneration(
+                "SELECT u.name FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE UPPER(LOWER(u.name)) NOT LIKE UPPER(LOWER(:str))",
+                "SELECT c0_.name AS name0 FROM cms_users c0_ WHERE UPPER(LOWER(c0_.name)) NOT LIKE UPPER(LOWER(?))"
+        );
+        $this->assertSqlGeneration(
+                "SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u LEFT JOIN u.articles a WITH a.topic NOT LIKE u.name",
+                "SELECT c0_.id AS id0, c0_.status AS status1, c0_.username AS username2, c0_.name AS name3 FROM cms_users c0_ LEFT JOIN cms_articles c1_ ON c0_.id = c1_.user_id AND (c1_.topic NOT LIKE c0_.name)"
+        );
+    }
+
     /**
      * @group DDC-338
      */
