diff options
| author | 宋文武 <iyzsong@member.fsf.org> | 2023-08-11 20:19:52 +0800 |
|---|---|---|
| committer | 宋文武 <iyzsong@member.fsf.org> | 2023-08-11 20:19:52 +0800 |
| commit | 770f3f587d35e32aba3c6cb0b606f2d2fe8d5ace (patch) | |
| tree | 7e15565a6959867d4bb1bdaf446bbfaff6235259 /gnu/services/databases.scm | |
| parent | 446ec58af67910191be1be06efda6c43fc3cf8d7 (diff) | |
| parent | ad4520b92662e42d7d0b1e648b2068300dbb95c8 (diff) | |
Merge remote-tracking branch 'origin/master' into kde-updates
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))) |