diff options
| author | Christopher Baines <mail@cbaines.net> | 2019-03-24 10:55:17 +0000 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2019-03-24 10:57:22 +0000 |
| commit | daa2790f59c7353b3dcd0218f975684c7101acae (patch) | |
| tree | 48692f5d0891a1e510ad051c838074819d248a96 /guix-data-service | |
| parent | 5be4ebca0c159d3029426c45d71f4f0b2b542a6c (diff) | |
| download | data-service-daa2790f59c7353b3dcd0218f975684c7101acae.tar data-service-daa2790f59c7353b3dcd0218f975684c7101acae.tar.gz | |
Differentiate filtering better for select-derivations-and-build-status
An empty list of derivation-file-names should result in no results,
but in the case of the systems, targets and build-statuses, we want
all of the results.
Diffstat (limited to 'guix-data-service')
| -rw-r--r-- | guix-data-service/comparison.scm | 6 | ||||
| -rw-r--r-- | guix-data-service/model/derivation.scm | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/guix-data-service/comparison.scm b/guix-data-service/comparison.scm index 733d740..fcb1dee 100644 --- a/guix-data-service/comparison.scm +++ b/guix-data-service/comparison.scm @@ -114,9 +114,9 @@ ORDER BY base_packages.name DESC, base_packages.version, target_packages.name, t (select-derivations-and-build-status conn #:file-names derivation-file-names - #:systems systems - #:targets targets - #:build-statuses build-statuses))) + #:systems (if (null? systems) #f systems) + #:targets (if (null? targets) #f targets) + #:build-statuses (if (null? build-statuses) #f build-statuses)))) derivation-data)) (define (package-data-vhash->package-name-and-version-vhash vhash) diff --git a/guix-data-service/model/derivation.scm b/guix-data-service/model/derivation.scm index 2469d0e..84801a9 100644 --- a/guix-data-service/model/derivation.scm +++ b/guix-data-service/model/derivation.scm @@ -478,7 +478,7 @@ ORDER BY derivations.system DESC, (string-join (filter-map (lambda (field values) - (if (and values (not (null? values))) + (if values (string-append field " IN (" (string-join (map (lambda (value) |