Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

postgresql: allow populating required DB using script

Browse source 
Extend UCI mechanics to allow pre-populating a newly created
database by executing SQL statements from a scripts file.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
This commit is contained in:
Daniel Golle 2017-07-02 19:38:30 +02:00
parent b61af9703e
commit c709189de4
No known key found for this signature in database
GPG key ID: DD8D36F0A710502F
2 changed files with 38 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libs/postgresql/Makefile
View file

@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=postgresql PKG_NAME:=postgresql
PKG_VERSION:=9.6.3 PKG_VERSION:=9.6.3
PKG_RELEASE:=2 PKG_RELEASE:=3
PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org> PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
PKG_LICENSE:=PostgreSQL PKG_LICENSE:=PostgreSQL

48
libs/postgresql/files/postgresql.sh
View file

@ -26,30 +26,56 @@ pg_server_ready() {
return 1 return 1
} }
# $1: dbname, $2: username, $3: password
pg_test_db() {
if [ "$3" ]; then
echo "SHOW ALL;" | env PGPASSWORD="$3" $PSQL -U "$2" -d "$1" -q 2>/dev/null >/dev/null
return $?
else
echo "SHOW ALL;" | $PSQL -w -U "$2" -d "$1" -q 2>/dev/null >/dev/null
return $?
fi
}
pg_include_sql() {
if [ "$3" ]; then
env PGPASSWORD="$3" $PSQL -U "$2" -d "$1" -e -f "$4"
return $?
else
$PSQL -w -U "$2" -d "$1" -e -f "$4"
return $?
fi
}
# $1: dbname, $2: username, $3: password, $4: sql populate script
pg_require_db() { pg_require_db() {
local ret
pg_test_db $@ && return 0 pg_test_db $@ && return 0
( echo "CREATE DATABASE $1;" ( echo "CREATE DATABASE $1;"
echo -n "CREATE USER $2" echo -n "CREATE USER $2"
[ "$3" ] && echo -n " WITH PASSWORD '$3'" [ "$3" ] && echo -n " WITH PASSWORD '$3'"
echo ";" echo " NOCREATEDB NOSUPERUSER NOCREATEROLE NOINHERIT;"
echo "GRANT ALL PRIVILEGES ON DATABASE \"$1\" to $2;" ) | echo "GRANT ALL PRIVILEGES ON DATABASE \"$1\" TO $2;" ) |
$PSQL -U postgres -d template1 -e $PSQL -U postgres -d template1 -e
return $? ret=$?
} [ "$ret" = "0" ] || return $ret
pg_test_db() { if [ "$4" ]; then
PGPASSWORD=$3 pg_include_sql "$@"
echo "SHOW ALL;" | $PSQL -U $2 -d $1 -q 2>/dev/null >/dev/null ret=$?
return $? fi
return $ret
} }
uci_require_db() { uci_require_db() {
local dbname dbuser dbpass local dbname dbuser dbpass dbscript
config_get dbname $1 name config_get dbname $1 name
config_get dbuser $1 user config_get dbuser $1 user
config_get dbpass $1 pass config_get dbpass $1 pass
pg_require_db $dbname $dbuser $dbpass config_get dbscript $1 script
pg_require_db "$dbname" "$dbuser" "$dbpass" "$dbscript"
} }
[ "$1" = "init" ] && { [ "$1" = "init" ] && {