Add full "IN BOOLEAN MODE" and "WITH QUERY EXPANSION" (beberlei#332)

Author: villermen

src/Query/Mysql/MatchAgainst.php

@@ -49,11 +49,39 @@ public function parse(\Doctrine\ORM\Query\Parser $parser)
 
         if (strtolower($lexer->lookahead['value']) === 'boolean') {
             $parser->match(Lexer::T_IDENTIFIER);
+            $this->booleanMode = true;
+        } elseif (strtolower($lexer->lookahead['value']) === 'in') {
+            $parser->match(Lexer::T_IDENTIFIER);
+
+            if (strtolower($lexer->lookahead['value']) !== 'boolean') {
+                $parser->syntaxError('boolean');
+            }
+            $parser->match(Lexer::T_IDENTIFIER);
+
+            if (strtolower($lexer->lookahead['value']) !== 'mode') {
+                $parser->syntaxError('mode');
+            }
+            $parser->match(Lexer::T_IDENTIFIER);
+
             $this->booleanMode = true;
         }
 
         if (strtolower($lexer->lookahead['value']) === 'expand') {
             $parser->match(Lexer::T_IDENTIFIER);
+            $this->queryExpansion = true;
+        } elseif (strtolower($lexer->lookahead['value']) === 'with') {
+            $parser->match(Lexer::T_IDENTIFIER);
+
+            if (strtolower($lexer->lookahead['value']) !== 'query') {
+                $parser->syntaxError('query');
+            }
+            $parser->match(Lexer::T_IDENTIFIER);
+
+            if (strtolower($lexer->lookahead['value']) !== 'expansion') {
+                $parser->syntaxError('expansion');
+            }
+            $parser->match(Lexer::T_IDENTIFIER);
+
             $this->queryExpansion = true;
         }
 

tests/Query/Mysql/MatchAgainstTest.php

@@ -13,4 +13,36 @@ public function testMatchAgainst()
             "SELECT MATCH (b0_.id) AGAINST ('3') AS sclr_0 FROM Blank b0_"
         );
     }
+
+    public function testMatchAgainstMultipleFields()
+    {
+        $this->assertDqlProducesSql(
+            "SELECT MATCH(post.longitude, post.latitude) AGAINST ('3') from DoctrineExtensions\Tests\Entities\BlogPost AS post",
+            "SELECT MATCH (b0_.longitude, b0_.latitude) AGAINST ('3') AS sclr_0 FROM BlogPost b0_"
+        );
+    }
+
+    public function testMatchAgainstInBooleanMode()
+    {
+        $this->assertDqlProducesSql(
+            "SELECT MATCH(blank.id) AGAINST ('+3 -4' BOOLEAN) from DoctrineExtensions\Tests\Entities\Blank AS blank",
+            "SELECT MATCH (b0_.id) AGAINST ('+3 -4' IN BOOLEAN MODE) AS sclr_0 FROM Blank b0_"
+        );
+        $this->assertDqlProducesSql(
+            "SELECT MATCH(blank.id) AGAINST ('+3 -4' IN BOOLEAN MODE) from DoctrineExtensions\Tests\Entities\Blank AS blank",
+            "SELECT MATCH (b0_.id) AGAINST ('+3 -4' IN BOOLEAN MODE) AS sclr_0 FROM Blank b0_"
+        );
+    }
+
+    public function testMatchAgainstWithQueryExpansion()
+    {
+        $this->assertDqlProducesSql(
+            "SELECT MATCH(blank.id) AGAINST ('3' EXPAND) from DoctrineExtensions\Tests\Entities\Blank AS blank",
+            "SELECT MATCH (b0_.id) AGAINST ('3' WITH QUERY EXPANSION) AS sclr_0 FROM Blank b0_"
+        );
+        $this->assertDqlProducesSql(
+            "SELECT MATCH(blank.id) AGAINST ('3' WITH QUERY EXPANSION) from DoctrineExtensions\Tests\Entities\Blank AS blank",
+            "SELECT MATCH (b0_.id) AGAINST ('3' WITH QUERY EXPANSION) AS sclr_0 FROM Blank b0_"
+        );
+    }
 }