Support MariaDB by removing 3rd parameter to ST_GeomFromText

MySQL allows 3 parameters, MariaDB only two: - https://dev.mysql.com/doc/refman/8.4/en/gis-wkt-functions.html#function_st-geomfromtext - https://mariadb.com/kb/en/st_geomfromtext/ Related: grimzy#152 Related: grimzy#138
mogic-le · Aug 14, 2024 · 59f4e3a · 59f4e3a
1 parent 8989d93
commit 59f4e3a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/src/Eloquent/SpatialExpression.php b/src/Eloquent/SpatialExpression.php
@@ -9,7 +9,7 @@ class SpatialExpression extends Expression
 {
     public function getValue(Grammar $grammar)
     {
-        return "ST_GeomFromText(?, ?, 'axis-order=long-lat')";
+        return "ST_GeomFromText(?, ?)";
     }
 
     public function getSpatialValue()

diff --git a/src/Eloquent/SpatialTrait.php b/src/Eloquent/SpatialTrait.php
@@ -134,7 +134,7 @@ public function scopeDistance($query, $geometryColumn, $geometry, $distance)
     {
         $this->isColumnAllowed($geometryColumn);
 
-        $query->whereRaw("st_distance(`$geometryColumn`, ST_GeomFromText(?, ?, 'axis-order=long-lat')) <= ?", [
+        $query->whereRaw("st_distance(`$geometryColumn`, ST_GeomFromText(?,?)) <= ?", [
             $geometry->toWkt(),
             $geometry->getSrid(),
             $distance,
@@ -149,7 +149,7 @@ public function scopeDistanceExcludingSelf($query, $geometryColumn, $geometry, $
 
         $query = $this->scopeDistance($query, $geometryColumn, $geometry, $distance);
 
-        $query->whereRaw("st_distance(`$geometryColumn`, ST_GeomFromText(?, ?, 'axis-order=long-lat')) != 0", [
+        $query->whereRaw("st_distance(`$geometryColumn`, ST_GeomFromText(?,?)) != 0", [
             $geometry->toWkt(),
             $geometry->getSrid(),
         ]);
@@ -167,7 +167,7 @@ public function scopeDistanceValue($query, $geometryColumn, $geometry)
             $query->select('*');
         }
 
-        $query->selectRaw("st_distance(`$geometryColumn`, ST_GeomFromText(?, ?, 'axis-order=long-lat')) as distance", [
+        $query->selectRaw("st_distance(`$geometryColumn`, ST_GeomFromText(?,?)) as distance", [
             $geometry->toWkt(),
             $geometry->getSrid(),
         ]);
@@ -177,7 +177,7 @@ public function scopeDistanceSphere($query, $geometryColumn, $geometry, $distanc
     {
         $this->isColumnAllowed($geometryColumn);
 
-        $query->whereRaw("st_distance_sphere(`$geometryColumn`, ST_GeomFromText(?, ?, 'axis-order=long-lat')) <= ?", [
+        $query->whereRaw("st_distance_sphere(`$geometryColumn`, ST_GeomFromText(?,?)) <= ?", [
             $geometry->toWkt(),
             $geometry->getSrid(),
             $distance,
@@ -192,7 +192,7 @@ public function scopeDistanceSphereExcludingSelf($query, $geometryColumn, $geome
 
         $query = $this->scopeDistanceSphere($query, $geometryColumn, $geometry, $distance);
 
-        $query->whereRaw("st_distance_sphere($geometryColumn, ST_GeomFromText(?, ?, 'axis-order=long-lat')) != 0", [
+        $query->whereRaw("st_distance_sphere($geometryColumn, ST_GeomFromText(?,?)) != 0", [
             $geometry->toWkt(),
             $geometry->getSrid(),
         ]);
@@ -209,7 +209,7 @@ public function scopeDistanceSphereValue($query, $geometryColumn, $geometry)
         if (!$columns) {
             $query->select('*');
         }
-        $query->selectRaw("st_distance_sphere(`$geometryColumn`, ST_GeomFromText(?, ?, 'axis-order=long-lat')) as distance", [
+        $query->selectRaw("st_distance_sphere(`$geometryColumn`, ST_GeomFromText(?,?)) as distance", [
             $geometry->toWkt(),
             $geometry->getSrid(),
         ]);
@@ -223,7 +223,7 @@ public function scopeComparison($query, $geometryColumn, $geometry, $relationshi
             throw new UnknownSpatialRelationFunction($relationship);
         }
 
-        $query->whereRaw("st_{$relationship}(`$geometryColumn`, ST_GeomFromText(?, ?, 'axis-order=long-lat'))", [
+        $query->whereRaw("st_{$relationship}(`$geometryColumn`, ST_GeomFromText(?,?))", [
             $geometry->toWkt(),
             $geometry->getSrid(),
         ]);
@@ -279,7 +279,7 @@ public function scopeOrderBySpatial($query, $geometryColumn, $geometry, $orderFu
             throw new UnknownSpatialFunctionException($orderFunction);
         }
 
-        $query->orderByRaw("st_{$orderFunction}(`$geometryColumn`, ST_GeomFromText(?, ?, 'axis-order=long-lat')) {$direction}", [
+        $query->orderByRaw("st_{$orderFunction}(`$geometryColumn`, ST_GeomFromText(?, ?)) {$direction}", [
             $geometry->toWkt(),
             $geometry->getSrid(),
         ]);