appwrite · abnegate · Sep 18, 2025 · Sep 17, 2025 · Sep 17, 2025 · Sep 17, 2025
diff --git a/composer.lock b/composer.lock
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Action.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Action.php
@@ -122,7 +122,7 @@ protected function getDuplicateException(): string
     /**
      * Get the correct invalid structure message.
      */
-    protected function getInvalidStructureException(): string
+    protected function getStructureException(): string
     {
         return $this->isCollectionsAPI()
             ? Exception::DOCUMENT_INVALID_STRUCTURE
@@ -366,13 +366,27 @@ protected function createAttribute(string $databaseId, string $collectionId, Doc
                 'filters' => $filters,
                 'options' => $options,
             ]);
-
+            if (
+                !$dbForProject->getAdapter()->getSupportForSpatialIndexNull() &&
+                \in_array($attribute->getAttribute('type'), Database::SPATIAL_TYPES) &&
+                $attribute->getAttribute('required')
+            ) {
+                $hasData = !Authorization::skip(fn () => $dbForProject
+                    ->findOne('database_' . $db->getSequence() . '_collection_' . $collection->getSequence()))
+                    ->isEmpty();
+
+                if ($hasData) {
+                    throw new StructureException('Failed to add required spatial column: existing rows present. Make the column optional.');
+                }
+            }
             $dbForProject->checkAttribute($collection, $attribute);
             $attribute = $dbForProject->createDocument('attributes', $attribute);
         } catch (DuplicateException) {
             throw new Exception($this->getDuplicateException());
         } catch (LimitException) {
             throw new Exception($this->getLimitException());
+        } catch (StructureException $e) {
+            throw new Exception($this->getStructureException(), $e->getMessage());
         } catch (Throwable $e) {
             $dbForProject->purgeCachedDocument('database_' . $db->getSequence(), $collectionId);
             $dbForProject->purgeCachedCollection('database_' . $db->getSequence() . '_collection_' . $collection->getSequence());
@@ -416,7 +430,7 @@ protected function createAttribute(string $databaseId, string $collectionId, Doc
             } catch (LimitException) {
                 throw new Exception($this->getLimitException());
             } catch (StructureException) {
-                throw new Exception($this->getInvalidStructureException());
+                throw new Exception($this->getStructureException());
             } catch (Throwable $e) {
                 $dbForProject->deleteDocument('attributes', $attribute->getId());
                 throw $e;
@@ -580,7 +594,7 @@ protected function updateAttribute(string $databaseId, string $collectionId, str
             } catch (RelationshipException $e) {
                 throw new Exception(Exception::RELATIONSHIP_VALUE_INVALID, $e->getMessage());
             } catch (StructureException $e) {
-                throw new Exception($this->getInvalidStructureException(), $e->getMessage());
+                throw new Exception($this->getStructureException(), $e->getMessage());
             }
 
             if ($primaryDocumentOptions['twoWay']) {

diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Action.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Action.php
@@ -160,7 +160,7 @@ protected function getRestrictedException(): string
     /**
      * Get the correct invalid structure message.
      */
-    protected function getInvalidStructureException(): string
+    protected function getStructureException(): string
     {
         return $this->isCollectionsAPI()
             ? Exception::DOCUMENT_INVALID_STRUCTURE

diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Bulk/Update.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Bulk/Update.php
@@ -149,7 +149,7 @@ public function action(string $databaseId, string $collectionId, string|array $d
         } catch (RelationshipException $e) {
             throw new Exception(Exception::RELATIONSHIP_VALUE_INVALID, $e->getMessage());
         } catch (StructureException $e) {
-            throw new Exception($this->getInvalidStructureException(), $e->getMessage());
+            throw new Exception($this->getStructureException(), $e->getMessage());
         }
 
         foreach ($documents as $document) {

diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Bulk/Upsert.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Bulk/Upsert.php
@@ -130,7 +130,7 @@ public function action(string $databaseId, string $collectionId, array $document
         } catch (RelationshipException $e) {
             throw new Exception(Exception::RELATIONSHIP_VALUE_INVALID, $e->getMessage());
         } catch (StructureException $e) {
-            throw new Exception($this->getInvalidStructureException(), $e->getMessage());
+            throw new Exception($this->getStructureException(), $e->getMessage());
         }
 
         foreach ($upserted as $document) {

diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Create.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Create.php
@@ -375,7 +375,7 @@ public function action(string $databaseId, string $documentId, string $collectio
         } catch (RelationshipException $e) {
             throw new Exception(Exception::RELATIONSHIP_VALUE_INVALID, $e->getMessage());
         } catch (StructureException $e) {
-            throw new Exception($this->getInvalidStructureException(), $e->getMessage());
+            throw new Exception($this->getStructureException(), $e->getMessage());
         }
 
         $queueForEvents

diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Update.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Update.php
@@ -247,7 +247,7 @@ public function action(string $databaseId, string $collectionId, string $documen
         } catch (RelationshipException $e) {
             throw new Exception(Exception::RELATIONSHIP_VALUE_INVALID, $e->getMessage());
         } catch (StructureException $e) {
-            throw new Exception($this->getInvalidStructureException(), $e->getMessage());
+            throw new Exception($this->getStructureException(), $e->getMessage());
         }
 
         $collectionsCache = [];

diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Upsert.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Upsert.php
@@ -258,7 +258,7 @@ public function action(string $databaseId, string $collectionId, string $documen
         } catch (RelationshipException $e) {
             throw new Exception(Exception::RELATIONSHIP_VALUE_INVALID, $e->getMessage());
         } catch (StructureException $e) {
-            throw new Exception($this->getInvalidStructureException(), $e->getMessage());
+            throw new Exception($this->getStructureException(), $e->getMessage());
         }
 
         $collectionsCache = [];