Skip to content

Fix update documents #646

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
merged 8 commits into from
Aug 5, 2025
Merged

Fix update documents #646

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
03ba92c
comments
fogelito Aug 3, 2025
11b0d98
Check $permissions keys
fogelito Aug 4, 2025
04fec5d
Run tests
fogelito Aug 4, 2025
69f6d65
Merge branch 'main' of github.com:utopia-php/database into fix-update…
fogelito Aug 4, 2025
5bcef6e
formatting
fogelito Aug 4, 2025
69f08e3
Remove comment
fogelito Aug 4, 2025
3d8c85b
stopOnFailure
fogelito Aug 4, 2025
7c1eba7
Merge branch 'main' into fix-update-documents
abnegate Aug 5, 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
9 changes: 6 additions & 3 deletions src/Database/Adapter/SQL.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,7 @@ public function updateDocuments(string $collection, Document $updates, array $do
$attributes['_createdAt'] = $updates->getCreatedAt();
}

if (!empty($updates->getPermissions())) {
if ($updates->offsetExists('$permissions')) {
$attributes['_permissions'] = json_encode($updates->getPermissions());
}

Expand Down Expand Up @@ -484,15 +484,18 @@ public function updateDocuments(string $collection, Document $updates, array $do
$affected = $stmt->rowCount();

// Permissions logic
if (!empty($updates->getPermissions())) {
if ($updates->offsetExists('$permissions')) {
$removeQueries = [];
$removeBindValues = [];

$addQuery = '';
$addBindValues = [];

foreach ($documents as $index => $document) {
// Permissions logic
if ($document->getAttribute('$skipPermissionsUpdate', false)) {
continue;
}

$sql = "
SELECT _type, _permission
FROM {$this->getSQLTable($name . '_perms')}
Expand Down
30 changes: 27 additions & 3 deletions src/Database/Database.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4385,13 +4385,16 @@ public function updateDocuments(
if (!empty($cursor) && $cursor->getCollection() !== $collection->getId()) {
throw new DatabaseException("Cursor document must be from the same Collection.");
}

unset($updates['$id']);
unset($updates['$tenant']);

if (($updates->getCreatedAt() === null || !$this->preserveDates)) {
unset($updates['$createdAt']);
} else {
$updates['$createdAt'] = $updates->getCreatedAt();
}

if ($this->adapter->getSharedTables()) {
$updates['$tenant'] = $this->adapter->getTenant();
}
Expand Down Expand Up @@ -4441,8 +4444,27 @@ public function updateDocuments(
break;
}

$this->withTransaction(function () use ($collection, $updates, &$batch) {
foreach ($batch as &$document) {
$currentPermissions = $updates->getPermissions();
sort($currentPermissions);

$this->withTransaction(function () use ($collection, $updates, &$batch, $currentPermissions) {
foreach ($batch as $index => $document) {

$skipPermissionsUpdate = true;

if ($updates->offsetExists('$permissions')) {
if (!$document->offsetExists('$permissions')) {
throw new QueryException('Permission document missing in select');
}

$originalPermissions = $document->getPermissions();
sort($originalPermissions);

$skipPermissionsUpdate = ($originalPermissions === $currentPermissions);
}

$document->setAttribute('$skipPermissionsUpdate', $skipPermissionsUpdate);

$new = new Document(\array_merge($document->getArrayCopy(), $updates->getArrayCopy()));

if ($this->resolveRelationships) {
Expand All @@ -4462,7 +4484,7 @@ public function updateDocuments(
throw new ConflictException('Document was updated after the request timestamp');
}

$document = $this->encode($collection, $document);
$batch[$index] = $this->encode($collection, $document);
}

$this->adapter->updateDocuments(
Expand All @@ -4473,6 +4495,8 @@ public function updateDocuments(
});

foreach ($batch as $doc) {
$doc->removeAttribute('$skipPermissionsUpdate');

$this->purgeCachedDocument($collection->getId(), $doc->getId());
$doc = $this->decode($collection, $doc);
try {
Expand Down
154 changes: 154 additions & 0 deletions tests/e2e/Adapter/Scopes/PermissionTests.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,160 @@

trait PermissionTests
{
public function testUnsetPermissions(): void
{
/** @var Database $database */
$database = static::getDatabase();

$database->createCollection(__FUNCTION__);
$this->assertTrue($database->createAttribute(
collection: __FUNCTION__,
id: 'president',
type: Database::VAR_STRING,
size: 255,
required: false
));

$permissions = [
Permission::read(Role::any()),
Permission::create(Role::any()),
Permission::update(Role::any()),
Permission::delete(Role::any()),
];

$documents = [];

for ($i = 0; $i < 3; $i++) {
$documents[] = new Document([
'$permissions' => $permissions,
'president' => 'Donald Trump'
]);
}

$results = [];
$count = $database->createDocuments(__FUNCTION__, $documents, onNext: function ($doc) use (&$results) {
$results[] = $doc;
});

$this->assertEquals(3, $count);

foreach ($results as $result) {
$this->assertEquals('Donald Trump', $result->getAttribute('president'));
$this->assertEquals($permissions, $result->getPermissions());
}

/**
* No permissions passed, Check old is preserved
*/
$updates = new Document([
'president' => 'George Washington'
]);

$results = [];
$modified = $database->updateDocuments(
__FUNCTION__,
$updates,
onNext: function ($doc) use (&$results) {
$results[] = $doc;
}
);

$this->assertEquals(3, $modified);

foreach ($results as $result) {
$this->assertEquals('George Washington', $result->getAttribute('president'));
$this->assertEquals($permissions, $result->getPermissions());
}

$documents = $database->find(__FUNCTION__);

$this->assertEquals(3, count($documents));

foreach ($documents as $document) {
$this->assertEquals('George Washington', $document->getAttribute('president'));
$this->assertEquals($permissions, $document->getPermissions());
}

/**
* Change permissions remove delete
*/
$permissions = [
Permission::read(Role::any()),
Permission::create(Role::any()),
Permission::update(Role::any()),
];

$updates = new Document([
'$permissions' => $permissions,
'president' => 'Joe biden'
]);

$results = [];
$modified = $database->updateDocuments(
__FUNCTION__,
$updates,
onNext: function ($doc) use (&$results) {
$results[] = $doc;
}
);

$this->assertEquals(3, $modified);

foreach ($results as $result) {
$this->assertEquals('Joe biden', $result->getAttribute('president'));
$this->assertEquals($permissions, $result->getPermissions());
$this->assertArrayNotHasKey('$skipPermissionsUpdate', $result);
}

$documents = $database->find(__FUNCTION__);

$this->assertEquals(3, count($documents));

foreach ($documents as $document) {
$this->assertEquals('Joe biden', $document->getAttribute('president'));
$this->assertEquals($permissions, $document->getPermissions());
}

/**
* Unset permissions
*/
$updates = new Document([
'$permissions' => [],
'president' => 'Richard Nixon'
]);

$results = [];
$modified = $database->updateDocuments(
__FUNCTION__,
$updates,
onNext: function ($doc) use (&$results) {
$results[] = $doc;
}
);

$this->assertEquals(3, $modified);

foreach ($results as $result) {
$this->assertEquals('Richard Nixon', $result->getAttribute('president'));
$this->assertEquals([], $result->getPermissions());
}

$documents = $database->find(__FUNCTION__);
$this->assertEquals(0, count($documents));

Authorization::disable();
$documents = $database->find(__FUNCTION__);
Authorization::reset();

$this->assertEquals(3, count($documents));

foreach ($documents as $document) {
$this->assertEquals('Richard Nixon', $document->getAttribute('president'));
$this->assertEquals([], $document->getPermissions());
$this->assertArrayNotHasKey('$skipPermissionsUpdate', $document);
}
}

public function testCreateDocumentsEmptyPermission(): void
{
/** @var Database $database */
Expand Down