wip

Author: pascalbaljet

tests/SearchTest.php

@@ -78,51 +78,18 @@ public function it_can_count_the_results()
     /** @test */
     public function it_respects_table_prefixes()
     {
-        $connection = DB::connection();
-        $originalPrefix = $connection->getTablePrefix();
+        $this->initDatabase('prefix_');
 
-        try {
-            // Set prefix FIRST before creating tables
-            $connection->setTablePrefix('prefix_');
-            
-            // Drop existing unprefixed tables
-            $connection->setTablePrefix($originalPrefix);
-            Schema::dropIfExists('posts');
-            Schema::dropIfExists('videos');
-            Schema::dropIfExists('comments');
-            Schema::dropIfExists('blogs');
-            Schema::dropIfExists('pages');
-            
-            // Set prefix back 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();
-        }
+        $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);
     }
 
     /** @test */

tests/TestCase.php

@@ -23,22 +23,18 @@ public function setUp(): void
 
         $this->app['config']->set('app.key', 'base64:yWa/ByhLC/GUvfToOuaPD7zDwB64qkc/QkaQOrT5IpE=');
 
-        $this->setupDatabaseConnections();
-
-        $this->artisan('migrate:fresh');
-
-        include_once __DIR__ . '/create_tables.php';
-
-        (new \CreateTables)->up();
+        $this->initDatabase();
     }
 
-    protected function setupDatabaseConnections(): void
+    protected function initDatabase($prefix = '')
     {
+        $connection = env('DB_CONNECTION', 'sqlite');
+        
         // Configure SQLite
         $this->app['config']->set('database.connections.sqlite', [
             'driver'   => 'sqlite',
             'database' => ':memory:',
-            'prefix'   => '',
+            'prefix'   => $prefix,
         ]);
 
         // Configure MySQL
@@ -53,7 +49,7 @@ protected function setupDatabaseConnections(): void
             'unix_socket'    => env('DB_SOCKET', ''),
             'charset'        => 'utf8mb4',
             'collation'      => 'utf8mb4_unicode_ci',
-            'prefix'         => '',
+            'prefix'         => $prefix,
             'prefix_indexes' => true,
             'strict'         => true,
             'engine'         => null,
@@ -63,10 +59,15 @@ protected function setupDatabaseConnections(): void
         ]);
 
         // Set default connection based on DB_CONNECTION env var
-        $connection = env('DB_CONNECTION', 'sqlite');
         $this->app['config']->set('database.default', $connection);
 
         DB::purge($connection);
         DB::setDefaultConnection($connection);
+
+        $this->artisan('migrate:fresh');
+
+        include_once __DIR__ . '/create_tables.php';
+
+        (new \CreateTables)->up();
     }
 }