From a6e19a4102f5160d6fb60f851474fb09dc83742d Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sat, 15 Feb 2020 18:23:04 +0000 Subject: [PATCH] Avoid an error when there are no references to insert --- guix-data-service/model/nar.scm | 39 +++++++++++++++++---------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/guix-data-service/model/nar.scm b/guix-data-service/model/nar.scm index 7e27034..4c5d070 100644 --- a/guix-data-service/model/nar.scm +++ b/guix-data-service/model/nar.scm @@ -60,27 +60,28 @@ '(store_path hash_algorithm hash size system deriver) data))) - (exec-query - conn - (string-append - " + (let ((reference-data + (concatenate + (map (lambda (nar-id narinfo) + (map (lambda (reference) + (simple-format + #f + "(~A, ~A)" + nar-id + (quote-string reference))) + (narinfo-references narinfo))) + nar-ids + narinfos)))) + (unless (null? reference-data) + (exec-query + conn + (string-append + " INSERT INTO nar_references (nar_id, reference) VALUES " - (string-join - (concatenate - (map (lambda (nar-id narinfo) - (map (lambda (reference) - (simple-format - #f - "(~A, ~A)" - nar-id - (quote-string reference))) - (narinfo-references narinfo))) - nar-ids - narinfos)) - ", ") - " -ON CONFLICT DO NOTHING")) + (string-join reference-data ", ") + " +ON CONFLICT DO NOTHING")))) (exec-query conn