Refactor spatial query handling and improve error messages in database adapters

Author: ArnabChatterjee20k

src/Database/Adapter/MariaDB.php

@@ -1355,15 +1355,15 @@ public function deleteDocument(string $collection, string $id): bool
     /**
      * Handle distance spatial queries
      *
-     * @param string $spatialAttributeType
      * @param Query $query
      * @param array<string, mixed> $binds
      * @param string $attribute
+     * @param string $type
      * @param string $alias
      * @param string $placeholder
      * @return string
     */
-    protected function handleDistanceSpatialQueries(string $spatialAttributeType, Query $query, array &$binds, string $attribute, string $alias, string $placeholder): string
+    protected function handleDistanceSpatialQueries(Query $query, array &$binds, string $attribute, string $type, string $alias, string $placeholder): string
     {
         $distanceParams = $query->getValues()[0];
         $wkt = $this->convertArrayToWKT($distanceParams[0]);
@@ -1391,7 +1391,7 @@ protected function handleDistanceSpatialQueries(string $spatialAttributeType, Qu
 
         if ($useMeters) {
             $wktType = $this->getSpatialTypeFromWKT($wkt);
-            $attrType = strtolower($spatialAttributeType);
+            $attrType = strtolower($type);
             if ($wktType != Database::VAR_POINT || $attrType != Database::VAR_POINT) {
                 throw new DatabaseException('Distance in meters is not supported between '.$attrType . ' and '. $wktType);
             }
@@ -1426,7 +1426,7 @@ protected function handleSpatialQueries(string $type, Query $query, array &$bind
             case Query::TYPE_DISTANCE_NOT_EQUAL:
             case Query::TYPE_DISTANCE_GREATER_THAN:
             case Query::TYPE_DISTANCE_LESS_THAN:
-                return $this->handleDistanceSpatialQueries($type, $query, $binds, $attribute, $alias, $placeholder);
+                return $this->handleDistanceSpatialQueries($query, $binds, $attribute, $type, $alias, $placeholder);
 
             case Query::TYPE_INTERSECTS:
                 $binds[":{$placeholder}_0"] = $this->convertArrayToWKT($query->getValues()[0]);

src/Database/Adapter/MySQL.php

@@ -82,15 +82,15 @@ public function getSizeOfCollectionOnDisk(string $collection): int
     /**
      * Handle distance spatial queries
      *
-     * @param string $spatialAttributeType
      * @param Query $query
      * @param array<string, mixed> $binds
      * @param string $attribute
+     * @param string $type
      * @param string $alias
      * @param string $placeholder
      * @return string
     */
-    protected function handleDistanceSpatialQueries(string $spatialAttributeType, Query $query, array &$binds, string $attribute, string $alias, string $placeholder): string
+    protected function handleDistanceSpatialQueries(Query $query, array &$binds, string $attribute, string $type, string $alias, string $placeholder): string
     {
         $distanceParams = $query->getValues()[0];
         $binds[":{$placeholder}_0"] = $this->convertArrayToWKT($distanceParams[0]);

src/Database/Adapter/SQL.php

@@ -2663,7 +2663,7 @@ public function getSpatialTypeFromWKT(string $wkt): string
         $wkt = trim($wkt);
         $pos = strpos($wkt, '(');
         if ($pos === false) {
-            throw new Exception("Not a valid spatialtype");
+            throw new DatabaseException("Invalid spatial type");
         }
         return strtolower(trim(substr($wkt, 0, $pos)));
     }

src/Database/Validator/Spatial.php

@@ -144,7 +144,7 @@ public function getType(): string
         return self::TYPE_ARRAY;
     }
 
-    public function getSptialType(): string
+    public function getSpatialType(): string
     {
         return $this->spatialType;
     }