Skip to content
This repository was archived by the owner on Jan 9, 2024. It is now read-only.

Commit 3686b2d

Browse files
Aurélien MENDESmsonowal
authored andcommitted
Add relevance attribute to Models if Mode is FullText compatible (NATURAL or BOOLEAN)
1 parent b64f3bc commit 3686b2d

File tree

3 files changed

+18
-0
lines changed

3 files changed

+18
-0
lines changed

src/Engines/Modes/Boolean.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,13 @@ public function buildWhereRawString(Builder $builder)
2020
return $queryString;
2121
}
2222

23+
public function buildSelectColumns(Builder $builder)
24+
{
25+
$indexFields = implode(',', $this->modelService->setModel($builder->model)->getFullTextIndexFields());
26+
27+
return "*, MATCH($indexFields) AGAINST(? IN NATURAL LANGUAGE MODE) AS relevance";
28+
}
29+
2330
public function buildParams(Builder $builder)
2431
{
2532
$this->whereParams[] = $builder->query;

src/Engines/Modes/NaturalLanguage.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,13 @@ public function buildWhereRawString(Builder $builder)
2525
return $queryString;
2626
}
2727

28+
public function buildSelectColumns(Builder $builder)
29+
{
30+
$indexFields = implode(',', $this->modelService->setModel($builder->model)->getFullTextIndexFields());
31+
32+
return "*, MATCH($indexFields) AGAINST(? IN NATURAL LANGUAGE MODE) AS relevance";
33+
}
34+
2835
public function buildParams(Builder $builder)
2936
{
3037
$this->whereParams[] = $builder->query;

src/Engines/MySQLEngine.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
use Yab\MySQLScout\Engines\Modes\ModeContainer;
66
use Illuminate\Database\Eloquent\Collection;
7+
use Illuminate\Support\Facades\DB;
78
use Laravel\Scout\Builder;
89
use Laravel\Scout\Engines\Engine;
910

@@ -65,6 +66,9 @@ public function search(Builder $builder)
6566

6667
$model = $builder->model;
6768
$query = $model::whereRaw($whereRawString, $params);
69+
if ($mode->isFullText()) {
70+
$query = $query->selectRaw(DB::raw($mode->buildSelectColumns($builder)), $params);
71+
}
6872

6973
if($builder->callback){
7074
$query = call_user_func($builder->callback, $query, $this);

0 commit comments

Comments
 (0)