From 02947cc9c4af9b92d8806c073bff5d8a2d7c6acb Mon Sep 17 00:00:00 2001
From: Christopher Baines <mail@cbaines.net>
Date: Fri, 4 Jul 2025 14:16:03 +0100
Subject: [PATCH] Replace more instances of system->system-id with
 lookup-system-id

To avoid systems being inserted from queries.
---
 guix-data-service/jobs/load-new-guix-revision.scm | 2 +-
 guix-data-service/model/build.scm                 | 4 ++--
 guix-data-service/model/derivation.scm            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/guix-data-service/jobs/load-new-guix-revision.scm b/guix-data-service/jobs/load-new-guix-revision.scm
index 9f9af6c..3bb99a6 100644
--- a/guix-data-service/jobs/load-new-guix-revision.scm
+++ b/guix-data-service/jobs/load-new-guix-revision.scm
@@ -1421,7 +1421,7 @@ SELECT store_path FROM derivation_source_files WHERE id = $1"
                         (get-sql-to-select-package-and-related-derivations-for-revision
                          conn
                          (commit->revision-id conn commit)
-                         #:system-id (system->system-id conn system)
+                         #:system-id (lookup-system-id conn system)
                          #:target target)
                         "
 SELECT derivations.file_name
diff --git a/guix-data-service/model/build.scm b/guix-data-service/model/build.scm
index acf745a..dd43a8c 100644
--- a/guix-data-service/model/build.scm
+++ b/guix-data-service/model/build.scm
@@ -55,7 +55,7 @@
             '())
       ,@(if system
             `(("package_derivations.system_id = $" .
-               ,(number->string (system->system-id conn system))))
+               ,(number->string (lookup-system-id conn system))))
             '())
       ,@(if target
             `(("package_derivations.target = $" . ,target))
@@ -184,7 +184,7 @@ WHERE derivations.file_name = $1"
             '())
       ,@(if system
             `(("package_derivations.system_id = $" .
-               ,(number->string (system->system-id conn system))))
+               ,(number->string (lookup-system-id conn system))))
             '())
       ,@(if target
             `(("package_derivations.target = $" . ,target))
diff --git a/guix-data-service/model/derivation.scm b/guix-data-service/model/derivation.scm
index a19bfca..f6a2d0d 100644
--- a/guix-data-service/model/derivation.scm
+++ b/guix-data-service/model/derivation.scm
@@ -240,7 +240,7 @@ ORDER BY systems.system DESC,
           '("package_derivations.system_id" "target")
           (list
            (and=> system (lambda (system)
-                           (system->system-id conn system)))
+                           (lookup-system-id conn system)))
            targets))
        ,@(if minimum-builds
              (list