xanderio/cdist
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'master' into 'master'

Browse source 
__postgres_*: use delimited identifiers (double quoted) in generated SQL

See merge request ungleich-public/cdist!826
This commit is contained in:
poljakowski 2020-01-04 10:09:07 +01:00
commit c51571b47f
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cdist/conf/type/__postgres_database/gencode-remote
View file

@ -41,12 +41,12 @@ if [ "$state_should" != "$state_is" ]; then
present) present)
owner="" owner=""
if [ -f "$__object/parameter/owner" ]; then if [ -f "$__object/parameter/owner" ]; then
owner="-O '$(cat "$__object/parameter/owner")'" owner="-O \"$(cat "$__object/parameter/owner")\""
fi fi
echo "su - '$postgres_user' -c \"createdb $owner '$name'\"" echo "su - '$postgres_user' -c \"createdb $owner \"$name\"\""
;; ;;
absent) absent)
echo "su - '$postgres_user' -c \"dropdb '$name'\"" echo "su - '$postgres_user' -c \"dropdb \"$name\"\""
;; ;;
esac esac
fi fi

2
cdist/conf/type/__postgres_role/gencode-remote
View file

@ -54,7 +54,7 @@ case "$state_should" in
[ -n "$password" ] && password="PASSWORD '$password'" [ -n "$password" ] && password="PASSWORD '$password'"
cmd="CREATE ROLE $name WITH $password $booleans" cmd="CREATE ROLE \"$name\" WITH $password $booleans"
echo "su - '$postgres_user' -c \"psql postgres -wc \\\"$cmd\\\"\"" echo "su - '$postgres_user' -c \"psql postgres -wc \\\"$cmd\\\"\""
;; ;;
absent) absent)