[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#31755] [PATCH 05/19] database: Provide a way to specify the schema
From: |
Ludovic Courtès |
Subject: |
[bug#31755] [PATCH 05/19] database: Provide a way to specify the schema location. |
Date: |
Fri, 8 Jun 2018 11:34:37 +0200 |
* guix/store/database.scm (sqlite-register): Add #:schema. Parameterize
'sql-schema' based on this.
(register-path): Add #:schema and pass it to 'sqlite-register'.
---
guix/store/database.scm | 30 +++++++++++++++++-------------
1 file changed, 17 insertions(+), 13 deletions(-)
diff --git a/guix/store/database.scm b/guix/store/database.scm
index d5e34ef04..0f6d2e2c0 100644
--- a/guix/store/database.scm
+++ b/guix/store/database.scm
@@ -88,7 +88,7 @@ If FILE doesn't exist, create it and initialize it as a new
database."
;; XXX: (sqlite3) currently lacks bindings for 'sqlite3_last_insert_rowid'.
;; Work around that.
(let* ((stmt (sqlite-prepare db "SELECT last_insert_rowid();"
- #:cache? #t))
+ #:cache? #t))
(result (sqlite-fold cons '() stmt)))
(sqlite-finalize stmt)
(match result
@@ -157,7 +157,8 @@ ids of items referred to."
;; XXX figure out caching of statement and database objects... later
(define* (sqlite-register #:key db-file path (references '())
- deriver hash nar-size)
+ deriver hash nar-size
+ (schema (sql-schema)))
"Registers this stuff in a database specified by DB-FILE. PATH is the string
path of some store item, REFERENCES is a list of string paths which the store
item PATH refers to (they need to be already registered!), DERIVER is a string
@@ -167,16 +168,17 @@ base16-encoded sha256 hash of the store item denoted by
PATH (prefixed with
bytes of the store item denoted by PATH after being converted to nar form.
Every store item in REFERENCES must already be registered."
- (with-database db-file db
- (let ((id (update-or-insert db #:path path
- #:deriver deriver
- #:hash hash
- #:nar-size nar-size
- #:time (time-second (current-time time-utc)))))
- ;; Call 'path-id' on each of REFERENCES. This ensures we get a
- ;; "non-NULL constraint" failure if one of REFERENCES is unregistered.
- (add-references db id
- (map (cut path-id db <>) references)))))
+ (parameterize ((sql-schema schema))
+ (with-database db-file db
+ (let ((id (update-or-insert db #:path path
+ #:deriver deriver
+ #:hash hash
+ #:nar-size nar-size
+ #:time (time-second (current-time
time-utc)))))
+ ;; Call 'path-id' on each of REFERENCES. This ensures we get a
+ ;; "non-NULL constraint" failure if one of REFERENCES is unregistered.
+ (add-references db id
+ (map (cut path-id db <>) references))))))
;;;
@@ -221,7 +223,8 @@ it's a directory."
(define* (register-path path
#:key (references '()) deriver prefix
- state-directory (deduplicate? #t))
+ state-directory (deduplicate? #t)
+ (schema (sql-schema)))
;; Priority for options: first what is given, then environment variables,
;; then defaults. %state-directory, %store-directory, and
;; %store-database-directory already handle the "environment variables /
@@ -267,6 +270,7 @@ be used internally by the daemon's build hook."
(reset-timestamps real-path)
(sqlite-register
#:db-file (string-append db-dir "/db.sqlite")
+ #:schema schema
#:path to-register
#:references references
#:deriver deriver
--
2.17.1
- [bug#31755] [PATCH 00/19] Use (guix store database) instead of 'guix-register', Ludovic Courtès, 2018/06/08
- [bug#31755] [PATCH 01/19] database: 'with-database' can now initialize new databases., Ludovic Courtès, 2018/06/08
- [bug#31755] [PATCH 06/19] database: 'register-path' creates the database directory if needed., Ludovic Courtès, 2018/06/08
- [bug#31755] [PATCH 07/19] deduplicate: Fix a couple of thinkos., Ludovic Courtès, 2018/06/08
- [bug#31755] [PATCH 08/19] database: Remove extra SQL parameter in 'update-or-insert'., Ludovic Courtès, 2018/06/08
- [bug#31755] [PATCH 10/19] database: Replace existing entries in Refs., Ludovic Courtès, 2018/06/08
- [bug#31755] [PATCH 02/19] database: Fail registration when encountering unregistered references., Ludovic Courtès, 2018/06/08
- [bug#31755] [PATCH 09/19] database: Add #:reset-timestamps? to 'register-path'., Ludovic Courtès, 2018/06/08
- [bug#31755] [PATCH 05/19] database: Provide a way to specify the schema location.,
Ludovic Courtès <=
- [bug#31755] [PATCH 11/19] database: 'reset-timestamps' sets file permissions as well., Ludovic Courtès, 2018/06/08
- [bug#31755] [PATCH 12/19] vm: 'expression->derivation-in-linux-vm' code can now use dlopen., Ludovic Courtès, 2018/06/08
- [bug#31755] [PATCH 04/19] build: Require Guile-SQLite3., Ludovic Courtès, 2018/06/08
- [bug#31755] [PATCH 18/19] store: Remove 'register-path'., Ludovic Courtès, 2018/06/08
- [bug#31755] [PATCH 14/19] database: 'sqlite-register' takes a database, not a file name., Ludovic Courtès, 2018/06/08
- [bug#31755] [PATCH 19/19] Remove 'guix-register' and its traces., Ludovic Courtès, 2018/06/08
- [bug#31755] [PATCH 03/19] store-copy: 'read-reference-graph' returns a list of records., Ludovic Courtès, 2018/06/08
- [bug#31755] [PATCH 15/19] database: Add 'register-items'., Ludovic Courtès, 2018/06/08
- [bug#31755] [PATCH 16/19] install: Use 'reset-timestamps' from (guix store database)., Ludovic Courtès, 2018/06/08
- [bug#31755] [PATCH 17/19] database: Allow for deterministic database construction., Ludovic Courtès, 2018/06/08