From 71aba798d3d586a42afe8a61e8e36b95ca41bc37 Mon Sep 17 00:00:00 2001 From: Miguel Moreno Date: Mon, 27 Mar 2023 19:30:45 +0200 Subject: services: postgresql: Add more role fields. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/services/databases.scm (postgresql-role): Add more role fields. (postgresql-create-roles): Honor it. * doc/guix.texi (Database Services): Document it. Signed-off-by: Ludovic Courtès --- doc/guix.texi | 16 +++++++++++++++- gnu/services/databases.scm | 19 ++++++++++++++++--- 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 71f9f29169..409ca2ad62 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -25258,7 +25258,21 @@ The role permissions list. Supported permissions are @code{bypassrls}, @code{superuser}. @item @code{create-database?} (default: @code{#f}) -Whether to create a database with the same name as the role. +whether to create a database with the same name as the role. + +@item @code{encoding} (default: @code{"UTF8"}) +The character set to use for storing text in the database. + +@item @code{collation} (default: @code{"en_US.utf8"}) +The string sort order locale setting. + +@item @code{ctype} (default: @code{"en_US.utf8"}) +The character classification locale setting. + +@item @code{template} (default: @code{"template1"}) +The default template to copy the new database from when creating it. +Use @code{"template0"} for a pristine database with no system-local +modifications. @end table @end deftp 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 make-postgresql-role-configuration @@ -392,7 +400,8 @@ and stores the database cluster in @var{data-directory}." (append-map (lambda (role) (match-record 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))) -- cgit v1.2.3