From 0f947d683d6b3de552b563f785082fa7923fbb53 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sat, 20 Jun 2020 12:08:27 +0100 Subject: Pass through the db connection in datastore-call-with-transaction --- guix-build-coordinator/build-allocator.scm | 2 +- guix-build-coordinator/datastore/sqlite.scm | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/guix-build-coordinator/build-allocator.scm b/guix-build-coordinator/build-allocator.scm index fda893c..58ae6ef 100644 --- a/guix-build-coordinator/build-allocator.scm +++ b/guix-build-coordinator/build-allocator.scm @@ -342,7 +342,7 @@ build-ids-for-unprocessed-builds-with-built-inputs) (datastore-call-with-transaction datastore - (lambda () + (lambda (db) (values (datastore-fetch-unprocessed-builds-with-propagated-priorities datastore) (datastore-list-unprocessed-builds-with-built-inputs datastore))) diff --git a/guix-build-coordinator/datastore/sqlite.scm b/guix-build-coordinator/datastore/sqlite.scm index 6a49f19..6afa872 100644 --- a/guix-build-coordinator/datastore/sqlite.scm +++ b/guix-build-coordinator/datastore/sqlite.scm @@ -132,7 +132,7 @@ result)) (thunk))) -(define* (datastore-call-with-transaction datastore thunk +(define* (datastore-call-with-transaction datastore proc #:key readonly?) (call-with-worker-thread (slot-ref datastore (if readonly? @@ -149,7 +149,8 @@ (raise-exception exn)) (lambda () (call-with-values - thunk + (lambda () + (proc db)) (lambda vals (sqlite-exec db "COMMIT TRANSACTION;") (apply values vals)))) -- cgit v1.2.3