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

update extgitgraph

Browse Source
This commit is contained in:
Mike Schwörer
2020-03-05 18:20:27 +01:00
parent e91fc7b61a
commit a7fe74504b
5 changed files with 59 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,6 +6,8 @@ require_once 'Utils.php';
class EGGDatabase
{
const DB_NAME = "";
/** @var string */
private $path;
@@ -67,7 +69,9 @@ class EGGDatabase
public function sql_query_assoc(string $query)
{
return $this->pdo->query($query)->fetchAll(PDO::FETCH_ASSOC);
$r = $this->pdo->query($query)->fetchAll(PDO::FETCH_ASSOC);
return $r;
}
public function sql_query_assoc_prep(string $query, array $params)
@@ -80,7 +84,9 @@ class EGGDatabase
}
$stmt->execute();
return $stmt->fetchAll(PDO::FETCH_ASSOC);
$r = $stmt->fetchAll(PDO::FETCH_ASSOC);
return $r;
}
public function sql_exec_prep(string $query, array $params)
@@ -202,10 +208,15 @@ class EGGDatabase
{
$strparents = implode(";", $commit->Parents);
$this->sql_exec_prep("INSERT INTO commits ([branch_id], [hash], [author_name], [author_email], [committer_name], [committer_email], [message], [date], [parent_commits]) VALUES (:brid, :sha, :an, :am, :cn, :cm, :msg, :dat, :prt)",
$this->sql_exec_prep("INSERT INTO commits ([branch_id], [hash]) VALUES (:brid, :sha)",
[
[":brid", $branch->ID, PDO::PARAM_INT],
[":sha", $commit->Hash, PDO::PARAM_STR],
]);
$this->sql_exec_prep("INSERT OR IGNORE INTO metadata ([hash], [author_name], [author_email], [committer_name], [committer_email], [message], [date], [parent_commits]) VALUES (:sha, :an, :am, :cn, :cm, :msg, :dat, :prt)",
[
[":sha", $commit->Hash, PDO::PARAM_STR],
[":an", $commit->AuthorName, PDO::PARAM_STR],
[":am", $commit->AuthorEmail, PDO::PARAM_STR],
[":cn", $commit->CommitterName, PDO::PARAM_STR],
@@ -320,6 +331,15 @@ class EGGDatabase
}
}
public function deleteDanglingCommitdata(string $name)
{
$db = $this->sql_query_assoc_prep("SELECT metadata.hash FROM metadata LEFT JOIN commits WHERE commits.hash IS NULL", []);
if (count($db) === 0) return;
$this->logger->proclog("Delete ".count($db)." dangling commits [" . $name . "] from database (no longer linked)");
}
/**
* @param string $source
* @param string $name
@@ -416,7 +436,7 @@ class EGGDatabase
*/
public function getAllYears(): array
{
$rows = $this->sql_query_assoc("SELECT d FROM (SELECT cast(strftime('%Y', commits.date) as decimal) AS d FROM commits) GROUP BY d ORDER BY d");
$rows = $this->sql_query_assoc("SELECT d FROM (SELECT cast(strftime('%Y', metadata.date) as decimal) AS d FROM commits LEFT JOIN metadata ON commits.hash = metadata.hash) GROUP BY d ORDER BY d");
$r = [];
foreach ($rows as $row) $r []= $row['d'];
return $r;