wip

Author: pascalbaljet

src/ModelToSearchThrough.php

@@ -138,18 +138,11 @@ public function getModel(): Model
      */
     public function getModelKey($suffix = 'key'): string
     {
-        $parts = [
+        return implode('_', [
             $this->key,
             Str::snake(class_basename($this->getModel())),
             $suffix,
-        ];
-
-        // SQLite doesn't allow column aliases starting with numbers
-        if ($this->getModel()->getConnection()->getDriverName() === 'sqlite') {
-            array_unshift($parts, 'model');
-        }
-
-        return implode('_', $parts);
+        ]);
     }
 
     /**

src/Searcher.php

@@ -556,7 +556,9 @@ private function addRelevanceQueryToBuilder($builder, $modelToSearchThrough)
      */
     protected function makeSelects(ModelToSearchThrough $currentModel): array
     {
-        $selects = $this->modelsToSearchThrough->flatMap(function (ModelToSearchThrough $modelToSearchThrough) use ($currentModel) {
+        $grammar = $this->getSearchGrammar();
+        
+        $selects = $this->modelsToSearchThrough->flatMap(function (ModelToSearchThrough $modelToSearchThrough) use ($currentModel, $grammar) {
             $qualifiedKeyName = $qualifiedOrderByColumnName = $modelOrderKey = 'null';
 
             if ($modelToSearchThrough === $currentModel) {
@@ -578,9 +580,9 @@ protected function makeSelects(ModelToSearchThrough $currentModel): array
             }
 
             return array_filter([
-                DB::raw("{$qualifiedKeyName} as {$modelToSearchThrough->getModelKey()}"),
-                DB::raw("{$qualifiedOrderByColumnName} as {$modelToSearchThrough->getModelKey('order')}"),
-                $this->orderByModel ? DB::raw("{$modelOrderKey} as {$modelToSearchThrough->getModelKey('model_order')}") : null,
+                DB::raw("{$qualifiedKeyName} as {$grammar->wrap($modelToSearchThrough->getModelKey())}"),
+                DB::raw("{$qualifiedOrderByColumnName} as {$grammar->wrap($modelToSearchThrough->getModelKey('order'))}"),
+                $this->orderByModel ? DB::raw("{$modelOrderKey} as {$grammar->wrap($modelToSearchThrough->getModelKey('model_order'))}") : null,
             ]);
         })->all();
 
@@ -596,7 +598,9 @@ protected function makeSelects(ModelToSearchThrough $currentModel): array
     protected function makeOrderBy(): string
     {
         $grammar = $this->getSearchGrammar();
-        $modelOrderKeys = $this->modelsToSearchThrough->map->getModelKey('order')->toArray();
+        $modelOrderKeys = $this->modelsToSearchThrough->map(function($modelToSearchThrough) use ($grammar) {
+            return $grammar->wrap($modelToSearchThrough->getModelKey('order'));
+        })->toArray();
 
         return $grammar->coalesce($modelOrderKeys);
     }
@@ -610,7 +614,9 @@ protected function makeOrderBy(): string
     protected function makeOrderByModel(): string
     {
         $grammar = $this->getSearchGrammar();
-        $modelOrderKeys = $this->modelsToSearchThrough->map->getModelKey('model_order')->toArray();
+        $modelOrderKeys = $this->modelsToSearchThrough->map(function($modelToSearchThrough) use ($grammar) {
+            return $grammar->wrap($modelToSearchThrough->getModelKey('model_order'));
+        })->toArray();
 
         return $grammar->coalesce($modelOrderKeys);
     }
@@ -742,7 +748,9 @@ protected function applyModelOrdering($query): void
         }
 
         $grammar = $this->getSearchGrammar();
-        $modelOrderKeys = $this->modelsToSearchThrough->map->getModelKey('model_order')->toArray();
+        $modelOrderKeys = $this->modelsToSearchThrough->map(function($modelToSearchThrough) use ($grammar) {
+            return $grammar->wrap($modelToSearchThrough->getModelKey('model_order'));
+        })->toArray();
         $modelCoalesceExpr = $grammar->coalesce($modelOrderKeys);
 
         $query->orderByRaw($modelCoalesceExpr . ' ' . $this->getOrderDirection());
@@ -774,7 +782,9 @@ protected function applyStandardOrdering($query): void
         }
 
         $grammar = $this->getSearchGrammar();
-        $orderKeys = $this->modelsToSearchThrough->map->getModelKey('order')->toArray();
+        $orderKeys = $this->modelsToSearchThrough->map(function($modelToSearchThrough) use ($grammar) {
+            return $grammar->wrap($modelToSearchThrough->getModelKey('order'));
+        })->toArray();
         $coalesceExpr = $grammar->coalesce($orderKeys);
 
         $query->orderByRaw($coalesceExpr . ' ' . $this->getOrderDirection());

tests/SearchTest.php

@@ -77,13 +77,14 @@ public function it_can_count_the_results()
     /** @test */
     public function it_respects_table_prefixes()
     {
-        // Temporarily set table prefix
+        // Create a new in-memory database with prefix for testing
         $connection = DB::connection();
         $originalPrefix = $connection->getTablePrefix();
-        $connection->setTablePrefix('prefix_');
 
-        // Recreate tables with prefix
-        $this->artisan('migrate:fresh');
+        // Create tables first, then set prefix and recreate
+        $connection->setTablePrefix('prefix_');
+        
+        // Create the prefixed tables manually
         include_once __DIR__ . '/create_tables.php';
         (new \CreateTables)->up();
 
@@ -98,7 +99,7 @@ public function it_respects_table_prefixes()
 
         $this->assertEquals(3, $count);
 
-        // Reset prefix
+        // Reset prefix and clean up
         $connection->setTablePrefix($originalPrefix);
     }
 
@@ -235,6 +236,11 @@ public function it_can_search_on_the_left_side_of_the_term()
     /** @test */
     public function it_can_use_the_sounds_like_operator()
     {
+        // Skip on SQLite since it doesn't support SOUNDS LIKE
+        if (env('DB_CONNECTION') === 'sqlite') {
+            $this->markTestSkipped('SOUNDS LIKE operator not supported on SQLite');
+        }
+
         Video::create(['title' => 'laravel']);
 
         $this->assertCount(0, Search::add(Video::class, 'title')->search('larafel'));
@@ -632,6 +638,10 @@ public function it_includes_a_custom_model_identifier_to_search_results()
     /** @test */
     public function it_supports_full_text_search()
     {
+        // Skip on SQLite since Laravel doesn't support full-text search on SQLite
+        if (env('DB_CONNECTION') === 'sqlite') {
+            $this->markTestSkipped('Full-text search not supported on SQLite');
+        }
         $postA = Post::create(['title' => 'Laravel Framework']);
         $postB = Post::create(['title' => 'Tailwind Framework']);
 
@@ -659,6 +669,10 @@ public function it_supports_full_text_search()
     /** @test */
     public function it_supports_full_text_search_on_relations()
     {
+        // Skip on SQLite since Laravel doesn't support full-text search on SQLite
+        if (env('DB_CONNECTION') === 'sqlite') {
+            $this->markTestSkipped('Full-text search not supported on SQLite');
+        }
         $videoA = Video::create(['title' => 'Page A']);
         $videoB = Video::create(['title' => 'Page B']);
         $videoC = Video::create(['title' => 'Page C']);