cbaines/guix-data-service
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Try to adapt the PostgreSQL paramstring to use with sqitch

Browse source
This commit is contained in:
Christopher Baines 2021-06-16 13:43:32 +01:00
parent 673d762e68
commit 0dc05982cd
2 changed files with 47 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

38
scripts/guix-data-service.in
View file

@ -141,18 +141,36 @@
(list (%config 'sqitch)
"deploy"
"--db-client" (%config 'sqitch-psql)
"--chdir" (dirname (%config 'sqitch-plan))
"--chdir" (dirname (dirname (%config 'sqitch-plan)))
"--plan-file" (%config 'sqitch-plan)
(string-append "db:pg://"
(%config 'database-user)
"@"
(if (string=? (%config 'database-host)
"localhost")
"" ; This means the unix socket
(let* ((database-config (get-database-config))
(params (string-join
(map
(match-lambda
((key . val)
(string-append key "=" val)))
(filter
(match-lambda
((key . _)
(not (member key '("user"
"host"
"dbname")))))
database-config))
"&")))
(string-append "db:pg://"
(assoc-ref database-config "user")
"@"
(if (string=? (assoc-ref database-config "host")
"localhost")
"" ; This means the unix socket
; connection will be used
(%config 'database-host))
"/"
(%config 'database-name)))))
(assoc-ref database-config "host"))
"/"
(assoc-ref database-config "dbname")
(if (string-null? params)
""
"?")
params)))))
(simple-format #t "running command: ~A\n"
(string-join command))
(unless (zero? (apply system* command))