cbaines/guix-data-service
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Guard against some changes in how guile-json represents null values

Browse source
This commit is contained in:
Christopher Baines 2020-06-19 14:12:24 +01:00
parent 480d718fa8
commit 308e553b11
4 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
guix-data-service/model/channel-instance.scm
View file

@ -94,7 +94,7 @@ ORDER BY channel_instances.system DESC")
(list system (list system
derivation_file_name derivation_file_name
(filter (lambda (build) (filter (lambda (build)
(assoc-ref build "status")) (string? (assoc-ref build "status")))
(vector->list (vector->list
(json-string->scm builds-json)))))) (json-string->scm builds-json))))))
(exec-query conn query (list commit-hash)))) (exec-query conn query (list commit-hash))))

2
guix-data-service/model/derivation.scm
View file

@ -179,7 +179,7 @@ ORDER BY derivations.system DESC,
target target
file-name file-name
(filter (lambda (build) (filter (lambda (build)
(assoc-ref build "status")) (string? (assoc-ref build "status")))
(vector->list (vector->list
(json-string->scm builds-json))))) (json-string->scm builds-json)))))
((file_name system target) ((file_name system target)

6
guix-data-service/model/package.scm
View file

@ -346,8 +346,7 @@ ORDER BY first_datetime DESC, package_version DESC")
(if (string-null? builds-json) (if (string-null? builds-json)
'() '()
(filter (lambda (build) (filter (lambda (build)
(not (eq? (assoc-ref build "build_server_id") (number? (assoc-ref build "build_server_id")))
#nil)))
(vector->list (vector->list
(json-string->scm builds-json))))))) (json-string->scm builds-json)))))))
(exec-query (exec-query
@ -462,8 +461,7 @@ ORDER BY first_datetime DESC, package_version DESC")
(if (string-null? builds-json) (if (string-null? builds-json)
'() '()
(filter (lambda (build) (filter (lambda (build)
(not (eq? (assoc-ref build "build_server_id") (number? (assoc-ref build "build_server_id")))
#nil)))
(vector->list (vector->list
(json-string->scm builds-json))))))) (json-string->scm builds-json)))))))
(exec-query (exec-query

2
guix-data-service/model/system-test.scm
View file

@ -136,7 +136,7 @@ ORDER BY name ASC")
(string->number column_number) (string->number column_number)
derivation_file_name derivation_file_name
(filter (lambda (build) (filter (lambda (build)
(assoc-ref build "status")) (string? (assoc-ref build "status")))
(vector->list (vector->list
(json-string->scm builds-json)))))) (json-string->scm builds-json))))))
(exec-query conn query (list system commit-hash)))) (exec-query conn query (list system commit-hash))))