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 '()))