From b73cfa5d49a0b296c667df3a6d3dd7812af35183 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Tue, 24 May 2022 12:22:52 +0100 Subject: [PATCH] Fix delete-guix-revision-package-derivation-entries For the table schema change. --- ...kage-derivation-by-guix-revision-range.scm | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/guix-data-service/model/package-derivation-by-guix-revision-range.scm b/guix-data-service/model/package-derivation-by-guix-revision-range.scm index 15c2fa7..cc232d3 100644 --- a/guix-data-service/model/package-derivation-by-guix-revision-range.scm +++ b/guix-data-service/model/package-derivation-by-guix-revision-range.scm @@ -30,22 +30,25 @@ git-repository-id guix-revision-id branch-name) - (exec-query - conn - " + (and=> + (git-branch-for-repository-and-name conn + (string->number git-repository-id) + branch-name) + (lambda (git-branch-id) + (exec-query + conn + " DELETE FROM package_derivations_by_guix_revision_range -WHERE git_repository_id = $1 AND - branch_name = $2 AND +WHERE git_branch_id = $1 AND derivation_id IN ( SELECT package_derivations.derivation_id FROM package_derivations INNER JOIN guix_revision_package_derivations ON package_derivations.id = guix_revision_package_derivations.package_derivation_id - WHERE revision_id = $3 + WHERE revision_id = $2 )" - (list git-repository-id - branch-name - guix-revision-id))) + (list (number->string git-branch-id) + guix-revision-id))))) (define (insert-guix-revision-package-derivation-entries conn git-repository-id