Skip to content

Protect against deadlocks #344

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 1 commit into from
Oct 24, 2023
Merged

Protect against deadlocks #344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 15 additions & 3 deletions src/Database/Adapter/MariaDB.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -654,7 +654,11 @@ public function createDocument(string $collection, Document $document): Document
$columns = '';
$columnNames = '';

$this->getPDO()->beginTransaction();
try {
$this->getPDO()->beginTransaction();
} catch (PDOException $e) {
$this->getPDO()->rollBack();
}

/**
* Insert Attributes
Expand Down Expand Up @@ -798,7 +802,11 @@ public function updateDocument(string $collection, Document $document): Document
return $carry;
}, $initial);

$this->getPDO()->beginTransaction();
try {
$this->getPDO()->beginTransaction();
} catch (PDOException $e) {
$this->getPDO()->rollBack();
}

/**
* Get removed Permissions
Expand Down Expand Up @@ -1005,7 +1013,11 @@ public function deleteDocument(string $collection, string $id): bool
{
$name = $this->filter($collection);

$this->getPDO()->beginTransaction();
try {
$this->getPDO()->beginTransaction();
} catch (PDOException $e) {
$this->getPDO()->rollBack();
}

$sql = "
DELETE FROM {$this->getSQLTable($name)}
Expand Down
24 changes: 20 additions & 4 deletions src/Database/Adapter/SQLite.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,11 @@ public function createCollection(string $name, array $attributes = [], array $in
$namespace = $this->getNamespace();
$id = $this->filter($name);

$this->getPDO()->beginTransaction();
try {
$this->getPDO()->beginTransaction();
} catch (PDOException $e) {
$this->getPDO()->rollBack();
}

/** @var array<string> $attributeStrings */
$attributeStrings = [];
Expand Down Expand Up @@ -228,7 +232,11 @@ public function deleteCollection(string $id): bool
{
$id = $this->filter($id);

$this->getPDO()->beginTransaction();
try {
$this->getPDO()->beginTransaction();
} catch (PDOException $e) {
$this->getPDO()->rollBack();
}

$sql = "DROP TABLE `{$this->getNamespace()}_{$id}`";
$sql = $this->trigger(Database::EVENT_COLLECTION_DELETE, $sql);
Expand Down Expand Up @@ -424,7 +432,11 @@ public function createDocument(string $collection, Document $document): Document
$columns = ['_uid'];
$values = ['_uid'];

$this->getPDO()->beginTransaction();
try {
$this->getPDO()->beginTransaction();
} catch (PDOException $e) {
$this->getPDO()->rollBack();
}

/**
* Insert Attributes
Expand Down Expand Up @@ -567,7 +579,11 @@ public function updateDocument(string $collection, Document $document): Document
return $carry;
}, $initial);

$this->getPDO()->beginTransaction();
try {
$this->getPDO()->beginTransaction();
} catch (PDOException $e) {
$this->getPDO()->rollBack();
}

/**
* Get removed Permissions
Expand Down