Merge pull request #1274 from lunarphp/hotfix/fix-scout-db-empty-search

lunarphp · Sep 27, 2023 · a256047 · a256047 · vercel · Sep 27, 2023
2 parents a9b87f7 + fbe1639
commit a256047
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/utils/scout-database-engine/src/DatabaseEngine.php b/utils/scout-database-engine/src/DatabaseEngine.php
@@ -119,7 +119,10 @@ protected function getSearchQuery(Builder $builder)
         $index = $this->getIndexFromBuilder($builder);
 
         return SearchIndex::where('index', '=', $index)
-            ->whereFullText('content', $builder->query.'*', ['mode' => 'boolean']);
+            ->when(
+                $builder->query,
+                fn ($query) => $query ->whereFullText('content', $builder->query.'*', ['mode' => 'boolean'])
+            );
     }
 
     /**

diff --git a/utils/scout-database-engine/tests/Unit/SearchTest.php b/utils/scout-database-engine/tests/Unit/SearchTest.php
@@ -21,6 +21,16 @@ public function can_search_a_post()
         $this->assertEquals($posts->first()->body, 'Lamborghini');
     }
 
+    /** @test */
+    public function can_do_an_empty_search()
+    {
+        $this->seedPosts();
+
+        $posts = Post::search('')->get();
+
+        $this->assertCount(Post::count(), $posts);
+    }
+
     /** @test */
     public function can_raw_search_a_post()
     {