Merge pull request #292 from RonasIT/289-fix-relation-query-search

[289]: add table prefix to SearchTrait filterByQuery

Author: DenTray

src/Traits/SearchTrait.php

@@ -274,7 +274,7 @@ public function withCount(array|string $relations): self
 
     protected function getQuerySearchCallback(string $field, string $mask): Closure
     {
-        return function ($query) use ($field, $mask) {
+        return function (Query $query) use ($field, $mask) {
             $databaseDriver = config('database.default');
             $value = ($databaseDriver === 'pgsql')
                 ? pg_escape_string($this->filter['query'])
@@ -284,6 +284,8 @@ protected function getQuerySearchCallback(string $field, string $mask): Closure
                 ? 'ilike'
                 : 'like';
 
+            $field = $query->qualifyColumn($field);
+
             $query->orWhere($field, $operator, DB::raw($value));
         };
     }

tests/support/Traits/SqlMockTrait.php

@@ -500,13 +500,13 @@ protected function mockGetSearchResultWithQuery(array $selectResult): void
     {
         $this->mockSelectWithAggregate(
             'select count(*) as aggregate from "test_models" '
-            . "where ((\"query_field\" like '%search_\'string%') or (\"another_query_field\" like '%search_\'string%')) "
+            . "where ((\"test_models\".\"query_field\" like '%search_\'string%') or (\"test_models\".\"another_query_field\" like '%search_\'string%')) "
             . 'and "test_models"."deleted_at" is null',
         );
 
         $this->mockSelect(
-            "select * from \"test_models\" where ((\"query_field\" like '%search_\'string%') "
-            . "or (\"another_query_field\" like '%search_\'string%')) and \"test_models\".\"deleted_at\" is null "
+            "select * from \"test_models\" where ((\"test_models\".\"query_field\" like '%search_\'string%') "
+            . "or (\"test_models\".\"another_query_field\" like '%search_\'string%')) and \"test_models\".\"deleted_at\" is null "
             . 'order by "id" asc limit 15 offset 0',
             $selectResult,
         );
@@ -516,15 +516,15 @@ protected function mockGetSearchResultWithCustomQuery(array $selectResult): void
     {
         $this->mockSelectWithAggregate(
             'select count(*) as aggregate from "test_models" '
-            . 'where (("query_field"::text ilike \'%\' || unaccent(\'search_\'\'string\') || \'%\') '
-            . 'or ("another_query_field"::text ilike \'%\' || unaccent(\'search_\'\'string\') || \'%\')) '
+            . 'where (("test_models"."query_field"::text ilike \'%\' || unaccent(\'search_\'\'string\') || \'%\') '
+            . 'or ("test_models"."another_query_field"::text ilike \'%\' || unaccent(\'search_\'\'string\') || \'%\')) '
             . 'and "test_models"."deleted_at" is null',
         );
 
         $this->mockSelect(
             'select * from "test_models" '
-            . 'where (("query_field"::text ilike \'%\' || unaccent(\'search_\'\'string\') || \'%\') '
-            . 'or ("another_query_field"::text ilike \'%\' || unaccent(\'search_\'\'string\') || \'%\')) '
+            . 'where (("test_models"."query_field"::text ilike \'%\' || unaccent(\'search_\'\'string\') || \'%\') '
+            . 'or ("test_models"."another_query_field"::text ilike \'%\' || unaccent(\'search_\'\'string\') || \'%\')) '
             . 'and "test_models"."deleted_at" is null order by "id" asc limit 15 offset 0',
             $selectResult,
         );
@@ -534,9 +534,9 @@ protected function mockGetSearchResultWithRelations(array $selectResult): void
     {
         $this->mockSelectWithAggregate(
             'select count(*) as aggregate from "test_models" '
-            . 'where (("query_field" like \'%search_string%\') or exists (select * from "relation_models" '
+            . 'where (("test_models"."query_field" like \'%search_string%\') or exists (select * from "relation_models" '
             . 'where "test_models"."id" = "relation_models"."test_model_id" '
-            . 'and ("another_query_field" like \'%search_string%\'))) and exists (select * from "relation_models" '
+            . 'and ("relation_models"."another_query_field" like \'%search_string%\'))) and exists (select * from "relation_models" '
             . 'where "test_models"."id" = "relation_models"."test_model_id" and "name" = ?) '
             . 'and "test_models"."deleted_at" is null',
             ['some_value'],
@@ -545,10 +545,10 @@ protected function mockGetSearchResultWithRelations(array $selectResult): void
         $this->mockSelect(
             'select "test_models".*, (select "id" from "relation_models" '
             . 'where "test_models"."id" = "relation_models"."test_model_id" order by "id" asc limit 1) '
-            . 'as "relation_id" from "test_models" where (("query_field" like \'%search_string%\') '
+            . 'as "relation_id" from "test_models" where (("test_models"."query_field" like \'%search_string%\') '
             . 'or exists (select * from "relation_models" '
             . 'where "test_models"."id" = "relation_models"."test_model_id" '
-            . 'and ("another_query_field" like \'%search_string%\'))) and '
+            . 'and ("relation_models"."another_query_field" like \'%search_string%\'))) and '
             . 'exists (select * from "relation_models" where "test_models"."id" = "relation_models"."test_model_id" '
             . 'and "name" = ?) and "test_models"."deleted_at" is null '
             . 'order by "relation_id" asc, "id" asc limit 15 offset 0',