ensure query extension

Author: thekonz

src/Engines/Modes/Mode.php

@@ -9,6 +9,9 @@ abstract class Mode
 {
     protected $whereParams = [];
 
+    /**
+     * @var ModelService
+     */
     protected $modelService;
 
     public function __construct()

src/Engines/Modes/NaturalLanguage.php

@@ -8,13 +8,21 @@ class NaturalLanguage extends Mode
 {
     public function buildWhereRawString(Builder $builder)
     {
-        $queryString = '';
+        return $this->buildWheres($builder) . $this->buildMatchQuery($builder);
+    }
+
+    public function buildSelectColumns(Builder $builder)
+    {
+        $matchQuery = $this->buildMatchQuery($builder);
 
-        $queryString .= $this->buildWheres($builder);
+        return "*, $matchQuery as relevance";
+    }
 
+    private function buildMatchQuery(Builder $builder)
+    {
         $indexFields = implode(',',  $this->modelService->setModel($builder->model)->getFullTextIndexFields());
 
-        $queryString .= "MATCH($indexFields) AGAINST(? IN NATURAL LANGUAGE MODE";
+        $queryString = "MATCH($indexFields) AGAINST(? IN NATURAL LANGUAGE MODE";
 
         if (config('scout.mysql.query_expansion')) {
             $queryString .= ' WITH QUERY EXPANSION';
@@ -25,13 +33,6 @@ public function buildWhereRawString(Builder $builder)
         return $queryString;
     }
 
-    public function buildSelectColumns(Builder $builder)
-    {
-        $indexFields = implode(',',  $this->modelService->setModel($builder->model)->getFullTextIndexFields());
-
-        return "*, MATCH($indexFields) AGAINST(? IN NATURAL LANGUAGE MODE) AS relevance";
-    }
-
     public function buildParams(Builder $builder)
     {
         $this->whereParams[] = $builder->query;

tests/Engines/Modes/NaturalLanguageTest.php

@@ -0,0 +1,64 @@
+<?php
+
+
+namespace Tests\Engines\Modes;
+
+use Illuminate\Support\Facades\DB;
+use Laravel\Scout\Builder;
+use Tests\TestCase;
+use Tests\TestModel;
+use Yab\MySQLScout\Engines\Modes\NaturalLanguage;
+
+class NaturalLanguageTest extends TestCase
+{
+    public function testNaturalLanguage()
+    {
+        $this->mockDb();
+
+        $mode = new NaturalLanguage();
+        $builder = new Builder(new TestModel(), __METHOD__);
+
+        $this->assertEquals(
+            '*, MATCH(first_name,last_name) AGAINST(? IN NATURAL LANGUAGE MODE) as relevance',
+            $mode->buildSelectColumns($builder)
+        );
+        $this->assertEquals(
+            'MATCH(first_name,last_name) AGAINST(? IN NATURAL LANGUAGE MODE)',
+            $mode->buildWhereRawString($builder)
+        );
+        $this->assertEquals([__METHOD__], $mode->buildParams($builder));
+    }
+
+    public function testWithQueryExpansion()
+    {
+        $this->mockDb();
+        config()->set('scout.mysql.query_expansion', true);
+
+        $mode = new NaturalLanguage();
+        $builder = new Builder(new TestModel(), __METHOD__);
+
+        $this->assertEquals(
+            '*, MATCH(first_name,last_name) AGAINST(? IN NATURAL LANGUAGE MODE WITH QUERY EXPANSION) as relevance',
+            $mode->buildSelectColumns($builder)
+        );
+        $this->assertEquals(
+            'MATCH(first_name,last_name) AGAINST(? IN NATURAL LANGUAGE MODE WITH QUERY EXPANSION)',
+            $mode->buildWhereRawString($builder)
+        );
+        $this->assertEquals([__METHOD__], $mode->buildParams($builder));
+    }
+
+    private function mockDb(): void
+    {
+        DB::shouldReceive('connection')->andReturnSelf();
+        DB::shouldReceive('getSchemaBuilder')->andReturnSelf();
+        DB::shouldReceive('getColumnListing')->andReturn([
+            'first_name',
+            'last_name',
+            'age',
+        ]);
+        DB::shouldReceive('select')->andReturn([
+            (object)['Type' => 'VARCHAR'],
+        ]);
+    }
+}