diff options
| author | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-08-14 00:32:53 +0200 |
|---|---|---|
| committer | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-08-14 00:32:53 +0200 |
| commit | 51deacd8604b59aa434e944c73aecefd5183d13e (patch) | |
| tree | 7429b8652ce656f883e8277ec95e273d88fe0fe3 /gnu/services/databases.scm | |
| parent | 3349a50d700a2112a31ac4ce6cc6639d3b4cf1e2 (diff) | |
| parent | be6f5edd445850720dfcec2642db643b84fc0645 (diff) | |
| download | guix-51deacd8604b59aa434e944c73aecefd5183d13e.tar.gz guix-51deacd8604b59aa434e944c73aecefd5183d13e.zip | |
Merge branch 'master' into emacs-team
Diffstat (limited to 'gnu/services/databases.scm')
| -rw-r--r-- | gnu/services/databases.scm | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/gnu/services/databases.scm b/gnu/services/databases.scm index e8e42d3b7b..7148971c1d 100644 --- a/gnu/services/databases.scm +++ b/gnu/services/databases.scm @@ -363,7 +363,15 @@ and stores the database cluster in @var{data-directory}." (permissions postgresql-role-permissions (default '(createdb login))) ;list (create-database? postgresql-role-create-database? ;boolean - (default #f))) + (default #f)) + (encoding postgresql-role-encoding ;string + (default "UTF8")) + (collation postgresql-role-collation ;string + (default "en_US.utf8")) + (ctype postgresql-role-ctype ;string + (default "en_US.utf8")) + (template postgresql-role-template ;string + (default "template1"))) (define-record-type* <postgresql-role-configuration> postgresql-role-configuration make-postgresql-role-configuration @@ -392,7 +400,8 @@ and stores the database cluster in @var{data-directory}." (append-map (lambda (role) (match-record role <postgresql-role> - (name permissions create-database?) + (name permissions create-database? encoding collation ctype + template) `("SELECT NOT(EXISTS(SELECT 1 FROM pg_catalog.pg_roles WHERE \ rolname = '" ,name "')) as not_exists;\n" "\\gset\n" @@ -402,7 +411,11 @@ rolname = '" ,name "')) as not_exists;\n" ";\n" ,@(if create-database? `("CREATE DATABASE \"" ,name "\"" - " OWNER \"" ,name "\";\n") + " OWNER \"" ,name "\"\n" + " ENCODING '" ,encoding "'\n" + " LC_COLLATE '" ,collation "'\n" + " LC_CTYPE '" ,ctype "'\n" + " TEMPLATE " ,template ";") '()) "\\endif\n"))) roles))) |