branch master updated: Fix ignoring canceled builds

[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 54c7a1a  Fix ignoring canceled builds
54c7a1a is described below

commit 54c7a1a88006ca2c393fc914755d5cc91ccb466f
Author: Christopher Baines <mail@cbaines.net>
AuthorDate: Thu May 18 12:31:58 2023 +0100

    Fix ignoring canceled builds
    
    The previous changes only affected searching for package derivations, and 
they
    also didn't work.
---
 guix-data-service/model/derivation.scm | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/guix-data-service/model/derivation.scm 
b/guix-data-service/model/derivation.scm
index 693f11a..20f481a 100644
--- a/guix-data-service/model/derivation.scm
+++ b/guix-data-service/model/derivation.scm
@@ -256,8 +256,11 @@ ORDER BY systems.system DESC,
 EXISTS(
   SELECT 1
   FROM builds
+  INNER JOIN latest_build_status
+    ON builds.id = latest_build_status.build_id
   WHERE builds.derivation_output_details_set_id =
         derivations_by_output_details_set.derivation_output_details_set_id
+    AND latest_build_status.status != 'canceled'
     AND builds.build_server_id = " (number->string build-server-id) "
 )"))
           (or build-from-build-servers '()))
@@ -268,8 +271,11 @@ EXISTS(
 NOT EXISTS(
   SELECT 1
   FROM builds
+  INNER JOIN latest_build_status
+    ON builds.id = latest_build_status.build_id
   WHERE builds.derivation_output_details_set_id =
         derivations_by_output_details_set.derivation_output_details_set_id
+    AND latest_build_status.status != 'canceled'
     AND builds.build_server_id = " (number->string build-server-id) "
 )"))
           (or no-build-from-build-servers '()))
@@ -477,7 +483,7 @@ EXISTS(
     ON builds.id = latest_build_status.build_id
   WHERE builds.derivation_output_details_set_id =
         derivations_by_output_details_set.derivation_output_details_set_id
-    AND latest_build_status != 'canceled'
+    AND latest_build_status.status != 'canceled'
     AND builds.build_server_id = " (number->string build-server-id) "
 )"))
           (or build-from-build-servers '()))
@@ -492,7 +498,7 @@ NOT EXISTS(
     ON builds.id = latest_build_status.build_id
   WHERE builds.derivation_output_details_set_id =
         derivations_by_output_details_set.derivation_output_details_set_id
-    AND latest_build_status != 'canceled'
+    AND latest_build_status.status != 'canceled'
     AND builds.build_server_id = " (number->string build-server-id) "
 )"))
           (or no-build-from-build-servers '()))