Check spatial attribute type in validator

Author: abnegate

src/Database/Validator/Index.php

@@ -280,6 +280,11 @@ public function checkSpatialIndex(Document $index): bool
         $attributes = $index->getAttribute('attributes', []);
         $orders = $index->getAttribute('orders', []);
 
+        if (\count($attributes) !== 1) {
+            $this->message = 'Spatial index must have exactly one attribute';
+            return false;
+        }
+
         foreach ($attributes as $attributeName) {
             $attribute = $this->attributes[\strtolower($attributeName)] ?? new Document();
             $attributeType = $attribute->getAttribute('type', '');
@@ -304,6 +309,34 @@ public function checkSpatialIndex(Document $index): bool
         return true;
     }
 
+    /**
+     * @param Document $index
+     * @return bool
+     */
+    public function checkNonSpatialIndexOnSpatialAttribute(Document $index): bool
+    {
+        $type = $index->getAttribute('type');
+
+        // Skip check for spatial indexes
+        if ($type === Database::INDEX_SPATIAL) {
+            return true;
+        }
+
+        $attributes = $index->getAttribute('attributes', []);
+
+        foreach ($attributes as $attributeName) {
+            $attribute = $this->attributes[\strtolower($attributeName)] ?? new Document();
+            $attributeType = $attribute->getAttribute('type', '');
+
+            if (\in_array($attributeType, Database::SPATIAL_TYPES, true)) {
+                $this->message = 'Cannot create ' . $type . ' index on spatial attribute "' . $attributeName . '". Spatial attributes require spatial indexes.';
+                return false;
+            }
+        }
+
+        return true;
+    }
+
     /**
      * @param Document $index
      * @return bool
@@ -378,6 +411,9 @@ public function isValid($value): bool
         if (!$this->checkSpatialIndex($value)) {
             return false;
         }
+        if (!$this->checkNonSpatialIndexOnSpatialAttribute($value)) {
+            return false;
+        }
         if (!$this->checkVectorIndex($value)) {
             return false;
         }