wip

Author: pascalbaljet

src/QueryCompiler.php

@@ -24,7 +24,7 @@ public function __construct(
     public function compile(array $modelQueries): QueryBuilder
     {
         $queries = collect($modelQueries);
-        
+
         /** @var QueryBuilder $firstQuery */
         $firstQuery = $queries->shift()->toBase();
 
@@ -41,7 +41,7 @@ public function compile(array $modelQueries): QueryBuilder
      */
     private function needsUnionWrapper(QueryBuilder $query): bool
     {
-        return $this->hasMultipleModels() 
+        return $this->hasMultipleModels()
             && !$this->grammar->supportsUnionOrdering();
     }
 
@@ -101,7 +101,7 @@ private function applyModelOrdering(QueryBuilder $query): void
         $modelOrderKeys = $this->models->map(function ($modelToSearchThrough) {
             return $this->grammar->wrap($modelToSearchThrough->getModelKey('model_order'));
         })->toArray();
-        
+
         $modelCoalesceExpr = $this->grammar->coalesce($modelOrderKeys);
 
         $query->orderByRaw($modelCoalesceExpr . ' ' . $this->getOrderDirection());
@@ -129,7 +129,7 @@ private function applyStandardOrdering(QueryBuilder $query): void
         $orderKeys = $this->models->map(function ($modelToSearchThrough) {
             return $this->grammar->wrap($modelToSearchThrough->getModelKey('order'));
         })->toArray();
-        
+
         $coalesceExpr = $this->grammar->coalesce($orderKeys);
 
         $query->orderByRaw($coalesceExpr . ' ' . $this->getOrderDirection());

tests/SearchTest.php

@@ -7,6 +7,7 @@
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
 use ProtoneMedia\LaravelCrossEloquentSearch\Exceptions\OrderByRelevanceException;
 use ProtoneMedia\LaravelCrossEloquentSearch\Search;
 use ProtoneMedia\LaravelCrossEloquentSearch\Searcher;
@@ -77,30 +78,48 @@ public function it_can_count_the_results()
     /** @test */
     public function it_respects_table_prefixes()
     {
-        // Create a new in-memory database with prefix for testing
         $connection = DB::connection();
         $originalPrefix = $connection->getTablePrefix();
 
-        // 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();
-
-        $postA  = Post::create(['title' => 'foo']);
-        $postB  = Post::create(['title' => 'bar']);
-        $videoA = Video::create(['title' => 'foo']);
-        $videoB = Video::create(['title' => 'bar', 'subtitle' => 'foo']);
-
-        $count = Search::add(Post::class, 'title')
-            ->add(Video::class, ['title', 'subtitle'])
-            ->count('foo');
-
-        $this->assertEquals(3, $count);
-
-        // Reset prefix and clean up
-        $connection->setTablePrefix($originalPrefix);
+        try {
+            // Drop existing tables first
+            Schema::dropIfExists('posts');
+            Schema::dropIfExists('videos');
+            Schema::dropIfExists('comments');
+            Schema::dropIfExists('blogs');
+            Schema::dropIfExists('pages');
+
+            // Set prefix and create prefixed tables
+            $connection->setTablePrefix('prefix_');
+            
+            include_once __DIR__ . '/create_tables.php';
+            (new \CreateTables)->up();
+
+            $postA  = Post::create(['title' => 'foo']);
+            $postB  = Post::create(['title' => 'bar']);
+            $videoA = Video::create(['title' => 'foo']);
+            $videoB = Video::create(['title' => 'bar', 'subtitle' => 'foo']);
+
+            $count = Search::add(Post::class, 'title')
+                ->add(Video::class, ['title', 'subtitle'])
+                ->count('foo');
+
+            $this->assertEquals(3, $count);
+        } finally {
+            // Always reset prefix and recreate original tables
+            $connection->setTablePrefix($originalPrefix);
+            
+            // Drop prefixed tables
+            Schema::dropIfExists('prefix_posts');
+            Schema::dropIfExists('prefix_videos');
+            Schema::dropIfExists('prefix_comments');
+            Schema::dropIfExists('prefix_blogs');
+            Schema::dropIfExists('prefix_pages');
+            
+            // Recreate original tables for other tests
+            include_once __DIR__ . '/create_tables.php';
+            (new \CreateTables)->up();
+        }
     }
 
     /** @test */