diff options
| author | Christopher Baines <mail@cbaines.net> | 2023-05-18 12:31:58 +0100 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2023-05-18 12:31:58 +0100 |
| commit | 54c7a1a88006ca2c393fc914755d5cc91ccb466f (patch) | |
| tree | 649e925cde34f8d2b38bfd5a2078c337c7f02805 | |
| parent | 4208b5f1480b7f89db0a829f3536c6db2798f2f5 (diff) | |
| download | data-service-54c7a1a88006ca2c393fc914755d5cc91ccb466f.tar data-service-54c7a1a88006ca2c393fc914755d5cc91ccb466f.tar.gz | |
Fix ignoring canceled builds
The previous changes only affected searching for package derivations, and they
also didn't work.
| -rw-r--r-- | guix-data-service/model/derivation.scm | 10 |
1 files 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 '())) |