git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #66401 from eadwu/postgresql/fix-quoted-query

nixos/postgresql: fix quoted queries

commit329fa4b01e417d660796e920f8fae9652b6c57d7 authorDanylo Hlynskyi <abcz2.uprola@gmail.com> dateSun 11 Aug 2019, 22:46 (7 years ago) parent208aad418d176d
1 file changed+2−2
nixos/modules/services/databases/postgresql.nix+2−2
nixos/modules/services/databases/postgresql.nix+2−2
@@ -330,13 +330,13 @@ in
330330 fi
331331 '' + optionalString (cfg.ensureDatabases != []) ''
332332 ${concatMapStrings (database: ''
333− $PSQL -tAc "SELECT 1 FROM pg_database WHERE datname = '${database}'" | grep -q 1 || $PSQL -tAc "CREATE DATABASE ${database}"
333+ $PSQL -tAc "SELECT 1 FROM pg_database WHERE datname = '${database}'" | grep -q 1 || $PSQL -tAc 'CREATE DATABASE "${database}"'
334334 '') cfg.ensureDatabases}
335335 '' + ''
336336 ${concatMapStrings (user: ''
337337 $PSQL -tAc "SELECT 1 FROM pg_roles WHERE rolname='${user.name}'" | grep -q 1 || $PSQL -tAc "CREATE USER ${user.name}"
338338 ${concatStringsSep "\n" (mapAttrsToList (database: permission: ''
339− $PSQL -tAc "GRANT ${permission} ON ${database} TO ${user.name}"
339+ $PSQL -tAc 'GRANT ${permission} ON ${database} TO ${user.name}'
340340 '') user.ensurePermissions)}
341341 '') cfg.ensureUsers}
342342 '';