branch master updated: Fix the select-guix-revision-for-branch-and-datetime query

[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 5b82be8  Fix the select-guix-revision-for-branch-and-datetime query
5b82be8 is described below

commit 5b82be803ccb942de1441d25a550c80f533a83be
Author: Christopher Baines <m...@cbaines.net>
AuthorDate: Mon May 30 23:29:42 2022 +0100

    Fix the select-guix-revision-for-branch-and-datetime query
    
    I think it was broken with the git_branches/git_commits switch.
---
 guix-data-service/model/guix-revision.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/guix-data-service/model/guix-revision.scm 
b/guix-data-service/model/guix-revision.scm
index 40bff02..8bb20da 100644
--- a/guix-data-service/model/guix-revision.scm
+++ b/guix-data-service/model/guix-revision.scm
@@ -99,13 +99,14 @@ SELECT guix_revisions.id,
 FROM guix_revisions
 INNER JOIN git_branches
   ON git_branches.git_repository_id = guix_revisions.git_repository_id
+ AND git_branches.name = $1
 INNER JOIN git_commits
   ON git_commits.commit = guix_revisions.commit
+ AND git_commits.git_branch_id = git_branches.id
+ AND git_commits.datetime <= $2
 INNER JOIN load_new_guix_revision_jobs
   ON load_new_guix_revision_jobs.commit = guix_revisions.commit
-WHERE git_branches.name = $1
-  AND git_commits.datetime <= $2
-  AND load_new_guix_revision_jobs.succeeded_at IS NOT NULL
+WHERE load_new_guix_revision_jobs.succeeded_at IS NOT NULL
 ORDER BY git_commits.datetime DESC
 LIMIT 1")