Skip to content

Fix upsert duplicate IDs #600

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 6 commits into from
May 30, 2025
Merged

Fix upsert duplicate IDs #600

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e2d0a26
Catch duplicate ID edge case
abnegate May 30, 2025
33b1b08
Fix additional bind
abnegate May 30, 2025
9d731df
Add more test cases
abnegate May 30, 2025
0dffc8e
Fix stan
abnegate May 30, 2025
4486a49
Fix permissions removal for shared tables
abnegate May 30, 2025
6d26eee
Remove invalid test
abnegate May 30, 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
6 changes: 4 additions & 2 deletions src/Database/Adapter/MariaDB.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1445,12 +1445,14 @@ public function createOrUpdateDocuments(
if (!empty($toRemove)) {
$removeQueries[] = "(
_document = :_uid_{$index}
{$this->getTenantQuery($collection, tenantCount: \count($toRemove))}
" . ($this->sharedTables ? " AND _tenant = :_tenant_{$index}" : '') . "
AND _type = '{$type}'
AND _permission IN (" . \implode(',', \array_map(fn ($i) => ":remove_{$type}_{$index}_{$i}", \array_keys($toRemove))) . ")
)";
$removeBindValues[":_uid_{$index}"] = $document->getId();
$removeBindValues[":_tenant_{$index}"] = $document->getTenant();
if ($this->sharedTables) {
$removeBindValues[":_tenant_{$index}"] = $document->getTenant();
}
foreach ($toRemove as $i => $perm) {
$removeBindValues[":remove_{$type}_{$index}_{$i}"] = $perm;
}
Expand Down
9 changes: 8 additions & 1 deletion src/Database/Database.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4920,7 +4920,7 @@ public function createOrUpdateDocumentsWithIncrease(
$time = DateTime::now();
$created = 0;
$updated = 0;

$seenIds = [];
foreach ($documents as $key => $document) {
if ($this->getSharedTables() && $this->getTenantPerDocument()) {
$old = Authorization::skip(fn () => $this->withTenant($document->getTenant(), fn () => $this->silent(fn () => $this->getDocument(
Expand Down Expand Up @@ -5028,12 +5028,19 @@ public function createOrUpdateDocumentsWithIncrease(
$document = $this->silent(fn () => $this->createDocumentRelationships($collection, $document));
}

$seenIds[] = $document->getId();

$documents[$key] = new Change(
old: $old,
new: $document
);
}

// Required because *some* DBs will allow duplicate IDs for upsert
if (\count($seenIds) !== \count(\array_unique($seenIds))) {
throw new DuplicateException('Duplicate document IDs found in the input array.');
}

foreach (\array_chunk($documents, $batchSize) as $chunk) {
/**
* @var array<Change> $chunk
Expand Down
69 changes: 69 additions & 0 deletions tests/e2e/Adapter/Scopes/DocumentTests.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -735,6 +735,75 @@ public function testUpsertDocumentsNoop(): void
$this->assertEquals(0, $count);
}

public function testUpsertDuplicateIds(): void
{
$db = static::getDatabase();
if (!$db->getAdapter()->getSupportForUpserts()) {
$this->expectNotToPerformAssertions();
return;
}

$db->createCollection(__FUNCTION__);
$db->createAttribute(__FUNCTION__, 'num', Database::VAR_INTEGER, 0, true);

$doc1 = new Document(['$id' => 'dup', 'num' => 1]);
$doc2 = new Document(['$id' => 'dup', 'num' => 2]);

try {
$db->createOrUpdateDocuments(__FUNCTION__, [$doc1, $doc2]);
$this->fail('Failed to throw exception');
} catch (\Throwable $e) {
$this->assertInstanceOf(DuplicateException::class, $e, $e->getMessage());
}
}

public function testUpsertMixedPermissionDelta(): void
{
$db = static::getDatabase();
if (!$db->getAdapter()->getSupportForUpserts()) {
$this->expectNotToPerformAssertions();
return;
}

$db->createCollection(__FUNCTION__);
$db->createAttribute(__FUNCTION__, 'v', Database::VAR_INTEGER, 0, true);

$d1 = $db->createDocument(__FUNCTION__, new Document([
'$id' => 'a',
'v' => 0,
'$permissions' => [
Permission::update(Role::any())
]
]));
$d2 = $db->createDocument(__FUNCTION__, new Document([
'$id' => 'b',
'v' => 0,
'$permissions' => [
Permission::update(Role::any())
]
]));

// d1 adds write, d2 removes update
$d1->setAttribute('$permissions', [
Permission::read(Role::any()),
Permission::update(Role::any())
]);
$d2->setAttribute('$permissions', [
Permission::read(Role::any())
]);

$db->createOrUpdateDocuments(__FUNCTION__, [$d1, $d2]);

$this->assertEquals([
Permission::read(Role::any()),
Permission::update(Role::any()),
], $db->getDocument(__FUNCTION__, 'a')->getPermissions());

$this->assertEquals([
Permission::read(Role::any()),
], $db->getDocument(__FUNCTION__, 'b')->getPermissions());
}

public function testRespectNulls(): Document
{
static::getDatabase()->createCollection('documents_nulls');
Expand Down