From ed0f905cc709dc7c89aac4ba1104a863459fbd3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 23 Feb 2020 23:25:23 +0100 Subject: database: 'db-get-builds' returns each build's evaluation ID. * src/cuirass/database.scm (db-get-builds): Fetch 'Builds.evaluation' and return it as #:eval-id. --- src/cuirass/database.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/cuirass/database.scm b/src/cuirass/database.scm index 7c1f286..40c4b92 100644 --- a/src/cuirass/database.scm +++ b/src/cuirass/database.scm @@ -1,7 +1,7 @@ ;;; database.scm -- store evaluation and build results ;;; Copyright © 2016, 2017 Mathieu Lirzin ;;; Copyright © 2017 Mathieu Othacehe -;;; Copyright © 2018 Ludovic Courtès +;;; Copyright © 2018, 2020 Ludovic Courtès ;;; Copyright © 2018 Clément Lassieur ;;; Copyright © 2018 Tatiana Sholokhova ;;; Copyright © 2019 Ricardo Wurmus @@ -721,7 +721,7 @@ FILTERS is an assoc list whose possible keys are 'derivation | 'id | 'jobset | (stmt-text (format #f "SELECT * FROM ( SELECT Builds.derivation, Builds.rowid, Builds.timestamp, Builds.starttime, Builds.stoptime, Builds.log, Builds.status, Builds.job_name, Builds.system, -Builds.nix_name, Specifications.name +Builds.nix_name, Builds.evaluation, Specifications.name FROM Builds INNER JOIN Evaluations ON Builds.evaluation = Evaluations.id INNER JOIN Specifications ON Evaluations.specification = Specifications.name @@ -773,7 +773,7 @@ ORDER BY ~a, rowid ASC;" order)) (match rows (() (reverse builds)) ((#(derivation id timestamp starttime stoptime log status job-name - system nix-name specification) . rest) + system nix-name eval-id specification) . rest) (loop rest (cons `((#:derivation . ,derivation) (#:id . ,id) @@ -785,6 +785,7 @@ ORDER BY ~a, rowid ASC;" order)) (#:job-name . ,job-name) (#:system . ,system) (#:nix-name . ,nix-name) + (#:eval-id . ,eval-id) (#:specification . ,specification) (#:outputs . ,(db-get-outputs derivation))) builds)))))))) -- cgit v1.2.3