|
7 | 7 | use Illuminate\Support\Facades\DB;
|
8 | 8 | use Laravel\Scout\Builder;
|
9 | 9 | use Laravel\Scout\Engines\Engine;
|
| 10 | +use TeamTNT\Scout\Events\SearchPerformed; |
10 | 11 | use TeamTNT\TNTSearch\Exceptions\IndexNotFoundException;
|
11 | 12 | use TeamTNT\TNTSearch\TNTSearch;
|
12 | 13 |
|
@@ -161,9 +162,14 @@ protected function performSearch(Builder $builder, array $options = [])
|
161 | 162 | );
|
162 | 163 | }
|
163 | 164 | if (isset($this->tnt->config['searchBoolean']) ? $this->tnt->config['searchBoolean'] : false) {
|
164 |
| - return $this->tnt->searchBoolean($builder->query, $limit); |
| 165 | + $res = $this->tnt->searchBoolean($builder->query, $limit); |
| 166 | + event(new SearchPerformed($builder, $res, true)); |
| 167 | + return $res; |
| 168 | + |
165 | 169 | } else {
|
166 |
| - return $this->tnt->search($builder->query, $limit); |
| 170 | + $res = $this->tnt->search($builder->query, $limit); |
| 171 | + event(new SearchPerformed($builder, $res)); |
| 172 | + return $res; |
167 | 173 | }
|
168 | 174 | }
|
169 | 175 |
|
@@ -288,7 +294,7 @@ private function discardIdsFromResultSetByConstraints($builder, $searchResults)
|
288 | 294 |
|
289 | 295 | $discardIds = $builder->model->newQuery()
|
290 | 296 | ->select($qualifiedKeyName)
|
291 |
| - ->leftJoin(DB::raw('('.$sub->getQuery()->toSql().') as '. $builder->model->getConnection()->getTablePrefix() .'sub'), $subQualifiedKeyName, '=', $qualifiedKeyName) |
| 297 | + ->leftJoin(DB::raw('('.$sub->getQuery()->toSql().') as '.$builder->model->getConnection()->getTablePrefix().'sub'), $subQualifiedKeyName, '=', $qualifiedKeyName) |
292 | 298 | ->addBinding($sub->getQuery()->getBindings(), 'join')
|
293 | 299 | ->whereIn($qualifiedKeyName, $searchResults)
|
294 | 300 | ->whereNull($subQualifiedKeyName)
|
|
0 commit comments