Skip to content

Don't wait to return empty#683

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
abnegate merged 3 commits into from
Sep 3, 2025
Merged

Don't wait to return empty #683

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e2bdc83
Don't wait to return empty
abnegate Sep 3, 2025
42f35b7
Return empty on empty
abnegate Sep 3, 2025
82aa0e8
Only trigger deleted if deleted
abnegate Sep 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions src/Database/Database.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4275,6 +4275,9 @@ public function updateDocument(string $collection, string $id, Document $documen
$old = Authorization::skip(fn () => $this->silent(
fn () => $this->getDocument($collection->getId(), $id, forUpdate: true)
));
if ($old->isEmpty()) {
return new Document();
}

$skipPermissionsUpdate = true;

Expand DownExpand Up@@ -4414,10 +4417,6 @@ public function updateDocument(string $collection, string $id, Document $documen
}
}

if ($old->isEmpty()) {
return new Document();
}

if ($shouldUpdate) {
$document->setAttribute('$updatedAt', ($newUpdatedAt === null || !$this->preserveDates) ? $time : $newUpdatedAt);
}
Expand DownExpand Up@@ -4450,6 +4449,10 @@ public function updateDocument(string $collection, string $id, Document $documen
return $document;
});

if ($document->isEmpty()) {
return $document;
}

if ($this->resolveRelationships) {
$document = $this->silent(fn () => $this->populateDocumentRelationships($collection, $document));
}
Expand DownExpand Up@@ -5573,7 +5576,9 @@ public function deleteDocument(string $collection, string $id): bool
return $result;
});

$this->trigger(self::EVENT_DOCUMENT_DELETE, $document);
if ($deleted) {
$this->trigger(self::EVENT_DOCUMENT_DELETE, $document);
}

return $deleted;
}
Expand Down