Mikescher/www.mikescher.com
1
0
Fork 0
Code Actions Activity

fix DB-locked error in egg_update?

Browse Source
This commit is contained in:
Mike Schwörer
2022-10-17 10:30:19 +02:00
parent 81bbdd1aef
commit 8ed58917ff
2 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
www/extern/egg/EGGDatabase.php vendored
View File

@@ -62,7 +62,7 @@ class EGGDatabase
public function abortTransactionIfExists()
{
if ($this->pdo !== null) $this->pdo->rollBack();
if ($this->pdo !== null && $this->pdo->inTransaction()) $this->pdo->rollBack();
}
private function init()
@@ -222,7 +222,7 @@ class EGGDatabase
* @param Commit[] $commits
*/
public function insertNewCommits(string $source, Repository $repo, Branch $branch, array $commits) {
$this->logger->proclog("Inserted " . count($commits) . " (new) commits into [" . $source . "|" . $repo->Name . "|" . $branch->Name . "]");
$this->logger->proclog("Inserting " . count($commits) . " (new) commits into [" . $source . "|" . $repo->Name . "|" . $branch->Name . "]");
foreach ($commits as $commit)
{
@@ -261,6 +261,8 @@ class EGGDatabase
* @param string $head
*/
public function setBranchHead(Branch $branch, string $head) {
$this->logger->proclog("Set HEAD of branch [" . $branch->Repo->Source . "|" . $branch->Repo->Name . "|" . $branch->Name . "] to {".substr($head, 0, 8)."}");
$this->sql_exec_prep("UPDATE branches SET head = :head WHERE id = :id",
[
[":id", $branch->ID, PDO::PARAM_INT],