Fix to prevent ambiguity sql errors (#567)

* Fix to prevent ambiguity sql errors when combining partial filters with custom sorts. * Fix styling Co-authored-by: jonneroelofs <jonneroelofs@users.noreply.github.com>
spatie · Nov 26, 2020 · 343e1d0 · 343e1d0
1 parent 4f05691
commit 343e1d0
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 4 deletions.
diff --git a/src/Filters/FiltersExact.php b/src/Filters/FiltersExact.php
@@ -67,7 +67,7 @@ protected function withRelationConstraint(Builder $query, $value, string $proper
                 ];
             });
 
-        $query->whereHas($relation, function (Builder $query) use ($value , $property) {
+        $query->whereHas($relation, function (Builder $query) use ($value, $property) {
             $this->relationConstraints[] = $property = $query->qualifyColumn($property);
 
             $this->__invoke($query, $value, $property);

diff --git a/src/Filters/FiltersPartial.php b/src/Filters/FiltersPartial.php
@@ -16,7 +16,7 @@ public function __invoke(Builder $query, $value, string $property)
             }
         }
 
-        $wrappedProperty = $query->getQuery()->getGrammar()->wrap($property);
+        $wrappedProperty = $query->getQuery()->getGrammar()->wrap($query->qualifyColumn($property));
 
         $sql = "LOWER({$wrappedProperty}) LIKE ?";
 

diff --git a/tests/FilterTest.php b/tests/FilterTest.php
@@ -107,7 +107,7 @@ public function it_can_filter_a_custom_base_query_with_select()
             ->toSql();
 
         $expectedSql = TestModel::select('id', 'name')
-            ->where(DB::raw('LOWER(`name`)'), 'LIKE', 'john')
+            ->where(DB::raw('LOWER(`test_models`.`name`)'), 'LIKE', 'john')
             ->toSql();
 
         $this->assertEquals($expectedSql, $queryBuilderSql);
@@ -166,7 +166,7 @@ public function falsy_values_are_not_ignored_when_applying_a_partial_filter()
             ->allowedFilters(AllowedFilter::partial('id'))
             ->get();
 
-        $this->assertQueryLogContains("select * from `test_models` where (LOWER(`id`) LIKE ?)");
+        $this->assertQueryLogContains("select * from `test_models` where (LOWER(`test_models`.`id`) LIKE ?)");
     }
 
     /** @test */

diff --git a/tests/QueryBuilderTest.php b/tests/QueryBuilderTest.php
@@ -10,6 +10,7 @@
 use Spatie\QueryBuilder\QueryBuilder;
 use Spatie\QueryBuilder\QueryBuilderRequest;
 use Spatie\QueryBuilder\Sorts\Sort;
+use Spatie\QueryBuilder\Tests\TestClasses\Models\NestedRelatedModel;
 use Spatie\QueryBuilder\Tests\TestClasses\Models\RelatedThroughPivotModel;
 use Spatie\QueryBuilder\Tests\TestClasses\Models\ScopeModel;
 use Spatie\QueryBuilder\Tests\TestClasses\Models\SoftDeleteModel;
@@ -233,6 +234,34 @@ public function __invoke(Builder $query, $descending, string $property): Builder
         $this->assertEquals($usingSortFirst, $usingFilterFirst);
     }
 
+    /** @test */
+    public function it_can_filter_when_sorting_by_joining_a_related_model_which_contains_the_same_field_name()
+    {
+        $customSort = new class implements Sort {
+            public function __invoke(Builder $query, $descending, string $property): Builder
+            {
+                return $query->join(
+                    'related_models',
+                    'nested_related_models.related_model_id',
+                    '=',
+                    'related_models.id'
+                )->orderBy('related_models.name', $descending ? 'desc' : 'asc');
+            }
+        };
+
+        $req = new Request([
+            'filter' => ['name' => 'test'],
+            'sort' => 'name',
+        ]);
+
+        QueryBuilder::for(NestedRelatedModel::class, $req)
+            ->allowedSorts(\Spatie\QueryBuilder\AllowedSort::custom('name', $customSort))
+            ->allowedFilters('name')
+            ->get();
+
+        $this->assertTrue(true);
+    }
+
     /** @test */
     public function it_queries_the_correct_data_for_a_relationship_query()
     {