Support for Table prefixes (#26)

Author: pascalbaljet

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 All notable changes to `laravel-cross-eloquent-search` will be documented in this file
 
+## 2.1.0 - 2021-08-09
+
+- Support for Table prefixes
+
 ## 2.0.4 - 2021-05-03
 
 - Fix phpdoc comment format (credit to @gazben)

src/ModelToSearchThrough.php

@@ -82,7 +82,7 @@ public function getQualifiedColumns(): Collection
      *
      * @return \Illuminate\Database\Eloquent\Model
      */
-    protected function getModel(): Model
+    public function getModel(): Model
     {
         return $this->builder->getModel();
     }

src/Searcher.php

@@ -337,8 +337,10 @@ protected function makeSelects(ModelToSearchThrough $currentModel): array
             $qualifiedKeyName = $qualifiedOrderByColumnName = 'null';
 
             if ($modelToSearchThrough === $currentModel) {
-                $qualifiedKeyName = $modelToSearchThrough->getQualifiedKeyName();
-                $qualifiedOrderByColumnName = $modelToSearchThrough->getQualifiedOrderByColumnName();
+                $prefix = $modelToSearchThrough->getModel()->getConnection()->getTablePrefix();
+
+                $qualifiedKeyName = $prefix . $modelToSearchThrough->getQualifiedKeyName();
+                $qualifiedOrderByColumnName = $prefix . $modelToSearchThrough->getQualifiedOrderByColumnName();
             }
 
             return [

tests/SearchTest.php

@@ -71,6 +71,23 @@ public function it_can_count_the_results()
         $this->assertEquals(3, $count);
     }
 
+    /** @test */
+    public function it_respects_table_prefixes()
+    {
+        $this->initDatabase('prefix');
+
+        $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 */
     public function it_can_search_for_a_phrase()
     {

tests/TestCase.php

@@ -3,6 +3,7 @@
 namespace ProtoneMedia\LaravelCrossEloquentSearch\Tests;
 
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Facades\DB;
 use Orchestra\Testbench\TestCase as OrchestraTestCase;
 use PDO;
 use ProtoneMedia\LaravelCrossEloquentSearch\ServiceProvider;
@@ -22,6 +23,13 @@ public function setUp(): void
 
         $this->app['config']->set('app.key', 'base64:yWa/ByhLC/GUvfToOuaPD7zDwB64qkc/QkaQOrT5IpE=');
 
+        $this->initDatabase();
+    }
+
+    protected function initDatabase($prefix = '')
+    {
+        DB::purge('mysql');
+
         $this->app['config']->set('database.connections.mysql', [
             'driver'         => 'mysql',
             'url'            => env('DATABASE_URL'),
@@ -33,7 +41,7 @@ public function setUp(): void
             'unix_socket'    => env('DB_SOCKET', ''),
             'charset'        => 'utf8mb4',
             'collation'      => 'utf8mb4_unicode_ci',
-            'prefix'         => '',
+            'prefix'         => $prefix,
             'prefix_indexes' => true,
             'strict'         => true,
             'engine'         => null,