Remove use of last-insert-rowid in insert-build

This can be done through RETURNING now.

1 files changed, 9 insertions, 5 deletions

diff --git a/guix-build-coordinator/datastore/sqlite.scm b/guix-build-coordinator/datastore/sqlite.scm
index d900224..72bf091 100644
--- a/guix-build-coordinator/datastore/sqlite.scm
+++ b/guix-build-coordinator/datastore/sqlite.scm
@@ -3574,23 +3574,27 @@ INSERT INTO derivation_outputs (derivation_id, name, output_id)
             db
             "
 INSERT INTO builds (uuid, derivation_id, priority, created_at, deferred_until)
-VALUES (:uuid, :derivation_id, :priority, datetime('now'), :deferred_until)"
+VALUES (:uuid, :derivation_id, :priority, datetime('now'), :deferred_until)
+RETURNING id"
             #:cache? #t)))
 
       (sqlite-bind-arguments
        statement
        #:uuid uuid
-       #:derivation_id (db-find-derivation-id db drv-name)
+       #:derivation_id (call-with-delay-logging
+                        db-find-derivation-id
+                        #:args (list db drv-name))
        #:priority priority
        #:deferred_until
        (and=> defer-until
               (lambda (date)
                 (date->string date "~1 ~3"))))
 
-      (sqlite-step statement)
-      (sqlite-reset statement))
+      (match (sqlite-step statement)
+        (#(id)
+         (sqlite-reset statement)
 
-    (last-insert-rowid db))
+         id))))
 
   (define (get-derived-priority db build-id)
     (let ((statement