Skip to content

Fix: Shared table operations #456

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

Closed
Meldiron wants to merge 5 commits into from
Closed

Fix: Shared table operations #456

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f0e89ad
Fix shared table metadata updates
Meldiron Oct 7, 2024
66a2c0f
PR review changes
Meldiron Oct 7, 2024
4a77962
More exception type fixes
Meldiron Oct 7, 2024
0751761
Remove unsafe catches
Meldiron Oct 7, 2024
73f3f75
Fix override issues
Meldiron Oct 7, 2024
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
46 changes: 42 additions & 4 deletions src/Database/Database.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1041,7 +1041,10 @@ public function createCollection(string $id, array $attributes = [], array $inde
$collection = $this->silent(fn () => $this->getCollection($id));

if (!$collection->isEmpty() && $id !== self::METADATA) {
throw new DuplicateException('Collection ' . $id . ' already exists');
// HACK: Metadata should still be updated, can be removed when null tenant collections are supported.
if (!$this->adapter->getSharedTables()) {
throw new DuplicateException('Collection ' . $id . ' already exists');
}
}

$collection = new Document([
Expand Down Expand Up @@ -1093,7 +1096,12 @@ public function createCollection(string $id, array $attributes = [], array $inde
}
}

$createdCollection = $this->silent(fn () => $this->createDocument(self::METADATA, $collection));
$createdCollection = new Document();
try {
$createdCollection = $this->silent(fn () => $this->createDocument(self::METADATA, $collection));
} catch(DuplicateException) {
$createdCollection = $this->silent(fn () => $this->updateDocument(self::METADATA, $collection->getId(), $collection));
}

$this->trigger(self::EVENT_COLLECTION_CREATE, $createdCollection);

Expand Down Expand Up @@ -1390,7 +1398,22 @@ public function createAttribute(string $collection, string $id, string $type, in
'filters' => $filters,
]);

$collection->setAttribute('attributes', $attribute, Document::SET_TYPE_APPEND);
$existingAttributes = [];
$exists = false;
foreach ($collection->getAttribute('attributes', []) as $existingAttribute) {
if($existingAttribute->getId() === $attribute->getId()) {
$existingAttributes[] = $attribute;
$exists = true;
} else {
$existingAttributes[] = $existingAttribute;
}
}

if($exists) {
$collection->setAttribute('attributes', $existingAttributes);
} else {
$collection->setAttribute('attributes', $attribute, Document::SET_TYPE_APPEND);
}

if (
$this->adapter->getDocumentSizeLimit() > 0 &&
Expand Down Expand Up @@ -2674,7 +2697,22 @@ public function createIndex(string $collection, string $id, string $type, array
'orders' => $orders,
]);

$collection->setAttribute('indexes', $index, Document::SET_TYPE_APPEND);
$existingIndexes = [];
$exists = false;
foreach ($collection->getAttribute('indexes', []) as $existingIndex) {
if($existingIndex->getId() === $index->getId()) {
$existingIndexes[] = $index;
$exists = true;
} else {
$existingIndexes[] = $existingIndex;
}
}

if($exists) {
$collection->setAttribute('indexes', $existingIndexes);
} else {
$collection->setAttribute('indexes', $index, Document::SET_TYPE_APPEND);
}

if ($this->validate) {
$validator = new IndexValidator(
Expand Down