fixed count, upsert methods for vector

Author: ArnabChatterjee20k

src/Database/Adapter/SQL.php

@@ -3188,7 +3188,18 @@ public function count(Document $collection, array $queries = [], ?int $max = nul
 
         $queries = array_map(fn ($query) => clone $query, $queries);
 
-        $conditions = $this->getSQLConditions($queries, $binds);
+        // Extract vector queries (used for ORDER BY) and keep non-vector for WHERE
+        $vectorQueries = [];
+        $otherQueries = [];
+        foreach ($queries as $query) {
+            if (in_array($query->getMethod(), Query::VECTOR_TYPES)) {
+                $vectorQueries[] = $query;
+            } else {
+                $otherQueries[] = $query;
+            }
+        }
+
+        $conditions = $this->getSQLConditions($otherQueries, $binds);
         if (!empty($conditions)) {
             $where[] = $conditions;
         }
@@ -3206,12 +3217,23 @@ public function count(Document $collection, array $queries = [], ?int $max = nul
             ? 'WHERE ' . \implode(' AND ', $where)
             : '';
 
+        // Add vector distance calculations to ORDER BY (similarity-aware LIMIT)
+        $vectorOrders = [];
+        foreach ($vectorQueries as $query) {
+            $vectorOrder = $this->getVectorDistanceOrder($query, $binds, $alias);
+            if ($vectorOrder) {
+                $vectorOrders[] = $vectorOrder;
+            }
+        }
+        $sqlOrder = !empty($vectorOrders) ? 'ORDER BY ' . implode(', ', $vectorOrders) : '';
+
         $sql = "
 			SELECT COUNT(1) as sum FROM (
 				SELECT 1
 				FROM {$this->getSQLTable($name)} AS {$this->quote($alias)}
-				{$sqlWhere}
-				{$limit}
+                {$sqlWhere}
+                {$sqlOrder}
+                {$limit}
 			) table_count
         ";
 

src/Database/Database.php

@@ -603,12 +603,12 @@ function (mixed $value) {
                 return \json_encode(\array_map(\floatval(...), $value));
             },
             /**
-             * @param string|null $value
+             * @param mixed $value
              * @return array|null
              */
-            function (?string $value) {
+            function (mixed $value) {
                 if (is_null($value)) {
-                    return null;
+                    return;
                 }
                 if (!is_string($value)) {
                     return $value;

tests/e2e/Adapter/Scopes/VectorTests.php

@@ -2624,4 +2624,77 @@ public function testVectorQueryInNestedQuery(): void
         // Cleanup
         $database->deleteCollection('vectorNested');
     }
+
+    public function testVectorQueryCount(): void
+    {
+        /** @var Database $database */
+        $database = static::getDatabase();
+
+        if (!$database->getAdapter()->getSupportForVectors()) {
+            $this->expectNotToPerformAssertions();
+            return;
+        }
+
+        $database->createCollection('vectorCount');
+        $database->createAttribute('vectorCount', 'embedding', Database::VAR_VECTOR, 3, true);
+
+        $database->createDocument('vectorCount', new Document([
+            '$permissions' => [
+                Permission::read(Role::any())
+            ],
+            'embedding' => [1.0, 0.0, 0.0],
+        ]));
+
+        $count = $database->count('vectorCount', [
+            Query::vectorCosine('embedding', [1.0, 0.0, 0.0]),
+        ]);
+
+        $this->assertEquals(1, $count);
+
+        $database->deleteCollection('vectorCount');
+    }
+
+    public function testVetorUpsert(): void
+    {
+        /** @var Database $database */
+        $database = static::getDatabase();
+
+        if (!$database->getAdapter()->getSupportForVectors()) {
+            $this->expectNotToPerformAssertions();
+            return;
+        }
+
+        $database->createCollection('vectorUpsert');
+        $database->createAttribute('vectorUpsert', 'embedding', Database::VAR_VECTOR, 3, true);
+
+        $insertedDoc = $database->upsertDocument('vectorUpsert', new Document([
+            '$id' => 'vectorUpsert',
+            '$permissions' => [
+                Permission::read(Role::any()),
+                Permission::update(Role::any())
+            ],
+            'embedding' => [1.0, 0.0, 0.0],
+        ]));
+
+        $this->assertEquals([1.0, 0.0, 0.0], $insertedDoc->getAttribute('embedding'));
+
+        $insertedDoc = $database->getDocument('vectorUpsert', 'vectorUpsert');
+        $this->assertEquals([1.0, 0.0, 0.0], $insertedDoc->getAttribute('embedding'));
+
+        $updatedDoc = $database->upsertDocument('vectorUpsert', new Document([
+            '$id' => 'vectorUpsert',
+            '$permissions' => [
+                Permission::read(Role::any()),
+                Permission::update(Role::any())
+            ],
+            'embedding' => [2.0, 0.0, 0.0],
+        ]));
+
+        $this->assertEquals([2.0, 0.0, 0.0], $updatedDoc->getAttribute('embedding'));
+
+        $updatedDoc = $database->getDocument('vectorUpsert', 'vectorUpsert');
+        $this->assertEquals([2.0, 0.0, 0.0], $updatedDoc->getAttribute('embedding'));
+
+        $database->deleteCollection('vectorUpsert');
+    }
 }