Query Builder - Support column to have table name (#61)

* Add test

* Fix

Co-authored-by: Matan Yadaev <[email protected]>

Author: MatanYadaev

src/SpatialBuilder.php

@@ -31,7 +31,7 @@ public function withDistance(
     $this->selectRaw(
       sprintf(
         'ST_DISTANCE(%s, %s) AS %s',
-        "`{$column}`",
+        $this->getQuery()->getGrammar()->wrap($column),
         $this->toExpression($geometryOrColumn),
         $alias,
       )
@@ -50,7 +50,7 @@ public function whereDistance(
     $this->whereRaw(
       sprintf(
         'ST_DISTANCE(%s, %s) %s %s',
-        "`{$column}`",
+        $this->getQuery()->getGrammar()->wrap($column),
         $this->toExpression($geometryOrColumn),
         $operator,
         $value,
@@ -69,7 +69,7 @@ public function orderByDistance(
     $this->orderByRaw(
       sprintf(
         'ST_DISTANCE(%s, %s) %s',
-        "`{$column}`",
+        $this->getQuery()->getGrammar()->wrap($column),
         $this->toExpression($geometryOrColumn),
         $direction,
       )
@@ -91,7 +91,7 @@ public function withDistanceSphere(
     $this->selectRaw(
       sprintf(
         'ST_DISTANCE_SPHERE(%s, %s) AS %s',
-        "`{$column}`",
+        $this->getQuery()->getGrammar()->wrap($column),
         $this->toExpression($geometryOrColumn),
         $alias,
       )
@@ -110,7 +110,7 @@ public function whereDistanceSphere(
     $this->whereRaw(
       sprintf(
         'ST_DISTANCE_SPHERE(%s, %s) %s %s',
-        "`{$column}`",
+        $this->getQuery()->getGrammar()->wrap($column),
         $this->toExpression($geometryOrColumn),
         $operator,
         $value
@@ -129,7 +129,7 @@ public function orderByDistanceSphere(
     $this->orderByRaw(
       sprintf(
         'ST_DISTANCE_SPHERE(%s, %s) %s',
-        "`{$column}`",
+        $this->getQuery()->getGrammar()->wrap($column),
         $this->toExpression($geometryOrColumn),
         $direction
       )
@@ -143,7 +143,7 @@ public function whereWithin(string $column, Geometry|string $geometryOrColumn):
     $this->whereRaw(
       sprintf(
         'ST_WITHIN(%s, %s)',
-        "`{$column}`",
+        $this->getQuery()->getGrammar()->wrap($column),
         $this->toExpression($geometryOrColumn),
       )
     );
@@ -156,7 +156,7 @@ public function whereNotWithin(string $column, Geometry|string $geometryOrColumn
     $this->whereRaw(
       sprintf(
         'ST_WITHIN(%s, %s) = 0',
-        "`{$column}`",
+        $this->getQuery()->getGrammar()->wrap($column),
         $this->toExpression($geometryOrColumn),
       )
     );
@@ -169,7 +169,7 @@ public function whereContains(string $column, Geometry|string $geometryOrColumn)
     $this->whereRaw(
       sprintf(
         'ST_CONTAINS(%s, %s)',
-        "`{$column}`",
+        $this->getQuery()->getGrammar()->wrap($column),
         $this->toExpression($geometryOrColumn),
       )
     );
@@ -182,7 +182,7 @@ public function whereNotContains(string $column, Geometry|string $geometryOrColu
     $this->whereRaw(
       sprintf(
         'ST_CONTAINS(%s, %s) = 0',
-        "`{$column}`",
+        $this->getQuery()->getGrammar()->wrap($column),
         $this->toExpression($geometryOrColumn),
       )
     );
@@ -195,7 +195,7 @@ public function whereTouches(string $column, Geometry|string $geometryOrColumn):
     $this->whereRaw(
       sprintf(
         'ST_TOUCHES(%s, %s)',
-        "`{$column}`",
+        $this->getQuery()->getGrammar()->wrap($column),
         $this->toExpression($geometryOrColumn),
       )
     );
@@ -208,7 +208,7 @@ public function whereIntersects(string $column, Geometry|string $geometryOrColum
     $this->whereRaw(
       sprintf(
         'ST_INTERSECTS(%s, %s)',
-        "`{$column}`",
+        $this->getQuery()->getGrammar()->wrap($column),
         $this->toExpression($geometryOrColumn),
       )
     );
@@ -221,7 +221,7 @@ public function whereCrosses(string $column, Geometry|string $geometryOrColumn):
     $this->whereRaw(
       sprintf(
         'ST_CROSSES(%s, %s)',
-        "`{$column}`",
+        $this->getQuery()->getGrammar()->wrap($column),
         $this->toExpression($geometryOrColumn),
       )
     );
@@ -234,7 +234,7 @@ public function whereDisjoint(string $column, Geometry|string $geometryOrColumn)
     $this->whereRaw(
       sprintf(
         'ST_DISJOINT(%s, %s)',
-        "`{$column}`",
+        $this->getQuery()->getGrammar()->wrap($column),
         $this->toExpression($geometryOrColumn),
       )
     );
@@ -247,7 +247,7 @@ public function whereOverlaps(string $column, Geometry|string $geometryOrColumn)
     $this->whereRaw(
       sprintf(
         'ST_OVERLAPS(%s, %s)',
-        "`{$column}`",
+        $this->getQuery()->getGrammar()->wrap($column),
         $this->toExpression($geometryOrColumn),
       )
     );
@@ -260,7 +260,7 @@ public function whereEquals(string $column, Geometry|string $geometryOrColumn):
     $this->whereRaw(
       sprintf(
         'ST_EQUALS(%s, %s)',
-        "`{$column}`",
+        $this->getQuery()->getGrammar()->wrap($column),
         $this->toExpression($geometryOrColumn),
       )
     );
@@ -277,7 +277,7 @@ public function whereSrid(
     $this->whereRaw(
       sprintf(
         'ST_SRID(%s) %s %s',
-        "`{$column}`",
+        $this->getQuery()->getGrammar()->wrap($column),
         $operator,
         $value,
       )

tests/SpatialBuilderTest.php

@@ -392,3 +392,14 @@
   expect($testPlaces)->toHaveCount(1);
   expect($testPlaces[0]->point)->toEqual($point1);
 });
+
+it('uses spatial function on column that contains its table name', function (): void {
+  TestPlace::factory()->create(['point' => new Point(0, 0, 4326)]);
+
+  /** @var TestPlace $testPlaceWithDistance */
+  $testPlaceWithDistance = TestPlace::query()
+    ->withDistance('test_places.point', new Point(0, 0, 4326))
+    ->firstOrFail();
+
+  expect($testPlaceWithDistance->distance)->toBe(0.0);
+});