From fea4dc9385f6f42e7b89f1fafe1a8189f62af9eb Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 3 Nov 2019 16:03:51 +0000 Subject: Sort the derivation inputs by derivation file name As this is the way they're sorted in the derivation. --- guix-data-service/model/derivation.scm | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/guix-data-service/model/derivation.scm b/guix-data-service/model/derivation.scm index 3b121a1..9502ee6 100644 --- a/guix-data-service/model/derivation.scm +++ b/guix-data-service/model/derivation.scm @@ -245,16 +245,18 @@ ORDER BY derivations.system DESC, (define (select-derivation-inputs-by-derivation-id conn id) (define query (string-append - "SELECT derivations.file_name, derivation_outputs.name, " - "derivation_output_details.path " - "FROM derivation_inputs " - "INNER JOIN derivation_outputs" - " ON derivation_outputs.id = derivation_inputs.derivation_output_id " - "INNER JOIN derivation_output_details" - " ON derivation_outputs.derivation_output_details_id = derivation_output_details.id " - "INNER JOIN derivations" - " ON derivation_outputs.derivation_id = derivations.id " - "WHERE derivation_inputs.derivation_id = $1")) + " +SELECT derivations.file_name, derivation_outputs.name, + derivation_output_details.path +FROM derivation_inputs +INNER JOIN derivation_outputs + ON derivation_outputs.id = derivation_inputs.derivation_output_id +INNER JOIN derivation_output_details + ON derivation_outputs.derivation_output_details_id = derivation_output_details.id +INNER JOIN derivations + ON derivation_outputs.derivation_id = derivations.id +WHERE derivation_inputs.derivation_id = $1 +ORDER BY derivations.file_name")) (exec-query conn query (list id))) -- cgit v1.2.3