updated index validator for spatial types

Author: ArnabChatterjee20k

src/Database/Validator/Index.php

@@ -340,26 +340,27 @@ public function checkSpatialIndex(Document $index): bool
     {
         $type = $index->getAttribute('type');
 
-        if (!$this->spatialIndexSupport) {
-            $this->message = 'Spatial indexes are not supported';
-            return false;
-        }
-
         $attributes = $index->getAttribute('attributes', []);
         $orders     = $index->getAttribute('orders', []);
 
-        if (count($attributes) !== 1) {
-            $this->message = 'Spatial index can be created on a single spatial attribute';
-            return false;
-        }
-
         foreach ($attributes as $attributeName) {
             $attribute     = $this->attributes[\strtolower($attributeName)] ?? new Document();
             $attributeType = $attribute->getAttribute('type', '');
+
             if (!\in_array($attributeType, Database::SPATIAL_TYPES, true)) {
                 continue;
             }
 
+            if (!$this->spatialIndexSupport) {
+                $this->message = 'Spatial indexes are not supported';
+                return false;
+            }
+
+            if (count($attributes) !== 1) {
+                $this->message = 'Spatial index can be created on a single spatial attribute';
+                return false;
+            }
+
             if ($type !== Database::INDEX_SPATIAL) {
                 $this->message = 'Spatial index can only be created on spatial attributes (point, linestring, polygon). Attribute "' . $attributeName . '" is of type "' . $attributeType . '"';
                 return false;
@@ -369,13 +370,14 @@ public function checkSpatialIndex(Document $index): bool
                 $this->message = 'Spatial indexes do not allow null values. Mark the attribute "' . $attributeName . '" as required or create the index on a column with no null values.';
                 return false;
             }
-        }
 
-        if (!empty($orders) && !$this->spatialIndexOrderSupport) {
-            $this->message = 'Spatial indexes with explicit orders are not supported. Remove the orders to create this index.';
-            return false;
+            if (!empty($orders) && !$this->spatialIndexOrderSupport) {
+                $this->message = 'Spatial indexes with explicit orders are not supported. Remove the orders to create this index.';
+                return false;
+            }
         }
 
+
         return true;
     }
 }