Merge branch 'main' into fix/test-split

Author: ArnabChatterjee20k

src/Database/Database.php

@@ -349,6 +349,13 @@ class Database
 
     protected bool $migrating = false;
 
+    /**
+     * List of collections that should be treated as globally accessible
+     *
+     * @var array<string, bool>
+     */
+    protected array $globalCollections = [];
+
     /**
      * Stack of collection IDs when creating or updating related documents
      * @var array<string>
@@ -1013,6 +1020,31 @@ public function getMaxQueryValues(): int
         return $this->maxQueryValues;
     }
 
+    /**
+     * Set list of collections which are globally accessible
+     *
+     * @param array<string> $collections
+     * @return $this
+     */
+    public function setGlobalCollections(array $collections): static
+    {
+        foreach ($collections as $collection) {
+            $this->globalCollections[$collection] = true;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get list of collections which are globally accessible
+     *
+     * @return array<string>
+     */
+    public function getGlobalCollections(): array
+    {
+        return \array_keys($this->globalCollections);
+    }
+
     /**
      * Get list of keywords that cannot be used
      *
@@ -4710,11 +4742,8 @@ public function createOrUpdateDocumentsWithIncrease(
         $documentSecurity = $collection->getAttribute('documentSecurity', false);
         $time = DateTime::now();
 
-        $selects = ['$internalId', '$permissions'];
-
-        if ($this->getSharedTables()) {
-            $selects[] = '$tenant';
-        }
+        $created = 0;
+        $updated = 0;
 
         foreach ($documents as $key => $document) {
             if ($this->getSharedTables() && $this->getTenantPerDocument()) {
@@ -4732,7 +4761,13 @@ public function createOrUpdateDocumentsWithIncrease(
             $updatesPermissions = \in_array('$permissions', \array_keys($document->getArrayCopy()))
                 && $document->getPermissions() != $old->getPermissions();
 
-            if ($old->getAttributes() == $document->getAttributes() && !$updatesPermissions) {
+            if (
+                empty($attribute)
+                && !$updatesPermissions
+                && $old->getAttributes() == $document->getAttributes()
+            ) {
+                // If not updating a single attribute and the
+                // document is the same as the old one, skip it
                 unset($documents[$key]);
                 continue;
             }
@@ -4806,8 +4841,6 @@ public function createOrUpdateDocumentsWithIncrease(
             );
         }
 
-        $modified = 0;
-
         foreach (\array_chunk($documents, $batchSize) as $chunk) {
             /**
              * @var array<Change> $chunk
@@ -4818,11 +4851,21 @@ public function createOrUpdateDocumentsWithIncrease(
                 $chunk
             )));
 
+            foreach ($chunk as $change) {
+                if ($change->getOld()->isEmpty()) {
+                    $created++;
+                } else {
+                    $updated++;
+                }
+            }
+
             foreach ($batch as $doc) {
                 if ($this->resolveRelationships) {
                     $doc = $this->silent(fn () => $this->populateDocumentRelationships($collection, $doc));
                 }
 
+                $doc = $this->decode($collection, $doc);
+
                 if ($this->getSharedTables() && $this->getTenantPerDocument()) {
                     $this->withTenant($doc->getTenant(), function () use ($collection, $doc) {
                         $this->purgeCachedDocument($collection->getId(), $doc->getId());
@@ -4832,16 +4875,16 @@ public function createOrUpdateDocumentsWithIncrease(
                 }
 
                 $onNext && $onNext($doc);
-                $modified++;
             }
         }
 
         $this->trigger(self::EVENT_DOCUMENTS_UPSERT, new Document([
             '$collection' => $collection->getId(),
-            'modified' => $modified,
+            'created' => $created,
+            'updated' => $updated,
         ]));
 
-        return $modified;
+        return $created + $updated;
     }
 
     /**
@@ -5595,16 +5638,12 @@ public function deleteDocuments(
                 }
             }
 
-            $this->withTransaction(function () use ($collection, $skipAuth, $authorization, $internalIds, $permissionIds) {
-                $getResults = fn () => $this->adapter->deleteDocuments(
+            $this->withTransaction(function () use ($collection, $internalIds, $permissionIds) {
+                $this->adapter->deleteDocuments(
                     $collection->getId(),
                     $internalIds,
                     $permissionIds
                 );
-
-                $skipAuth
-                    ? $authorization->skip($getResults)
-                    : $getResults();
             });
 
             foreach ($batch as $document) {
@@ -6461,12 +6500,18 @@ public function getCacheKeys(string $collectionId, ?string $documentId = null, a
             $hostname = $this->adapter->getHostname();
         }
 
+        $tenantSegment = $this->adapter->getTenant();
+
+        if (isset($this->globalCollections[$collectionId])) {
+            $tenantSegment = null;
+        }
+
         $collectionKey = \sprintf(
             '%s-cache-%s:%s:%s:collection:%s',
             $this->cacheName,
             $hostname ?? '',
             $this->getNamespace(),
-            $this->adapter->getTenant(),
+            $tenantSegment,
             $collectionId
         );