Merge pull request #922 from utopia-php/fix-spatial-isnull-query

fix: support isNull/isNotNull queries on spatial attributes

Author: HarshMN2345

src/Database/Adapter/MariaDB.php

@@ -1443,6 +1443,10 @@ protected function handleSpatialQueries(Query $query, array &$binds, string $att
                 $binds[":{$placeholder}_0"] = $this->convertArrayToWKT($query->getValues()[0]);
                 return "NOT ST_Contains({$alias}.{$attribute}, " . $this->getSpatialGeomFromText(":{$placeholder}_0", null) . ")";
 
+            case Query::TYPE_IS_NULL:
+            case Query::TYPE_IS_NOT_NULL:
+                return "{$alias}.{$attribute} {$this->getSQLOperator($query->getMethod())}";
+
             default:
                 throw new DatabaseException('Unknown spatial query method: ' . $query->getMethod());
         }

src/Database/Adapter/Postgres.php

@@ -1564,6 +1564,10 @@ protected function handleSpatialQueries(Query $query, array &$binds, string $att
                     ? "NOT ST_Covers({$alias}.{$attribute}, " . $this->getSpatialGeomFromText(":{$placeholder}_0") . ")"
                     : "ST_Covers({$alias}.{$attribute}, " . $this->getSpatialGeomFromText(":{$placeholder}_0") . ")";
 
+            case Query::TYPE_IS_NULL:
+            case Query::TYPE_IS_NOT_NULL:
+                return "{$alias}.{$attribute} {$this->getSQLOperator($query->getMethod())}";
+
             default:
                 throw new DatabaseException('Unknown spatial query method: ' . $query->getMethod());
         }

tests/e2e/Adapter/Scopes/SpatialTests.php

@@ -1477,6 +1477,53 @@ public function testSpatialQueryCombinations(): void
         }
     }
 
+    public function testSpatialIsNullIsNotNull(): void
+    {
+        /** @var Database $database */
+        $database = $this->getDatabase();
+        if (!$database->getAdapter()->getSupportForSpatialAttributes()) {
+            $this->expectNotToPerformAssertions();
+            return;
+        }
+
+        $collectionName = 'spatial_null_checks';
+        try {
+            $database->createCollection($collectionName);
+
+            $this->assertEquals(true, $database->createAttribute($collectionName, 'name', Database::VAR_STRING, 255, true));
+            // Optional spatial attribute: some documents legitimately have no location set.
+            $this->assertEquals(true, $database->createAttribute($collectionName, 'location', Database::VAR_POINT, 0, false));
+
+            $database->createDocument($collectionName, new Document([
+                '$id' => 'withLocation',
+                'name' => 'Has a location',
+                'location' => [40.7829, -73.9654],
+                '$permissions' => [Permission::read(Role::any())],
+            ]));
+
+            $database->createDocument($collectionName, new Document([
+                '$id' => 'withoutLocation',
+                'name' => 'No location set',
+                'location' => null,
+                '$permissions' => [Permission::read(Role::any())],
+            ]));
+
+            $withLocation = $database->find($collectionName, [
+                Query::isNotNull('location'),
+            ], Database::PERMISSION_READ);
+            $this->assertCount(1, $withLocation);
+            $this->assertEquals('withLocation', $withLocation[0]->getId());
+
+            $withoutLocation = $database->find($collectionName, [
+                Query::isNull('location'),
+            ], Database::PERMISSION_READ);
+            $this->assertCount(1, $withoutLocation);
+            $this->assertEquals('withoutLocation', $withoutLocation[0]->getId());
+        } finally {
+            $database->deleteCollection($collectionName);
+        }
+    }
+
     public function testSpatialBulkOperation(): void
     {
         /** @var Database $database */