branch master updated: Adjust all-branches-with-most-recent-commit for recent changes

[Christopher Baines]

This is an automated email from the git hooks/post-receive script.

cbaines pushed a commit to branch master
in repository data-service.

The following commit(s) were added to refs/heads/master by this push:
     new 4c14e16  Adjust all-branches-with-most-recent-commit for recent changes
4c14e16 is described below

commit 4c14e161488cf7f69de888da56dcd7b46f49dff6
Author: Christopher Baines <mail@cbaines.net>
AuthorDate: Wed Feb 3 13:20:41 2021 +0000

    Adjust all-branches-with-most-recent-commit for recent changes
    
    Look at the job succeeded_at, rather than the guix_revisions.id field.
---
 guix-data-service/model/git-branch.scm | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/guix-data-service/model/git-branch.scm 
b/guix-data-service/model/git-branch.scm
index 14ce48b..a9b0202 100644
--- a/guix-data-service/model/git-branch.scm
+++ b/guix-data-service/model/git-branch.scm
@@ -163,7 +163,10 @@ LIMIT 1"))
      "
 SELECT DISTINCT ON (name)
   name, git_branches.commit,
-  datetime, (guix_revisions.id IS NOT NULL) guix_revision_exists,
+  datetime,
+  (
+    load_new_guix_revision_jobs.succeeded_at IS NOT NULL
+  ) AS guix_revision_exists,
   (
     SELECT json_agg(event)
     FROM load_new_guix_revision_job_events
@@ -173,7 +176,11 @@ SELECT DISTINCT ON (name)
           git_branches.git_repository_id = 
load_new_guix_revision_jobs.git_repository_id
   ) AS job_events
 FROM git_branches
-LEFT OUTER JOIN guix_revisions ON git_branches.commit = guix_revisions.commit
+LEFT OUTER JOIN guix_revisions
+  ON git_branches.commit = guix_revisions.commit
+LEFT JOIN load_new_guix_revision_jobs
+  ON git_branches.commit = load_new_guix_revision_jobs.commit
+ AND git_branches.git_repository_id = 
load_new_guix_revision_jobs.git_repository_id
 WHERE git_branches.git_repository_id = $1
 ORDER BY name, datetime DESC"))