Update psql helper

data/helpers.d/psql

@@ -74,8 +74,16 @@ ynh_psql_execute_file_as_root() {
 ynh_psql_create_db() {
 	local db=$1
 
-    ynh_psql_create_user "$user" "$pwd"
+    local sql="CREATE DATABASE ${db};"
-	sudo --login --user=postgres createdb --owner="$user" "$db"
+
+    # grant all privilegies to user
+	if [[ $# -gt 1 ]]; then
+		#ynh_psql_create_user "$user" "$pwd"
+		sql+=" GRANT ALL PRIVILEGES ON ${db} TO ${2}  WITH GRANT OPTION;"
+	fi
+
+	#sudo --login --user=postgres createdb --owner="$user" "$db"
+	ynh_psql_execute_as_root --sql="$sql"
 }
 
 # Drop a database
@@ -127,8 +135,7 @@ ynh_psql_create_user() {
 #
 # usage: ynh_psql_user_exists --user=user
 # | arg: -u, --user - the user for which to check existence
-ynh_psql_user_exists()
+ynh_psql_user_exists() {
-{
 	# Declare an array to define the options of this helper.
 	local legacy_args=u
 	declare -Ar args_array=([u]=user=)
@@ -136,89 +143,95 @@ ynh_psql_user_exists()
 	# Manage arguments with getopts
 	ynh_handle_getopts_args "$@"
 
-   if [[ -n $(sudo --login --user=postgres PGUSER="postgres" PGPASSWORD="$(sudo cat $PSQL_ROOT_PWD_FILE)" psql -tAc "SELECT rolname FROM pg_roles WHERE rolname='$user';") ]]
+	if [[ -n $(sudo --login --user=postgres PGUSER="postgres" PGPASSWORD="$(sudo cat $PSQL_ROOT_PWD_FILE)" psql -tAc "SELECT rolname FROM pg_roles WHERE rolname='$user';") ]]; then
-   then
 		return 1
 	else
 		return 0
 	fi
 }
 
+# Check if a psql database exists
+#
+# usage: ynh_psql_database_exists --database=database
+# | arg: -d, --database - the database for which to check existence
+ynh_psql_database_exists() {
+	# Declare an array to define the options of this helper.
+	local legacy_args=u
+	declare -Ar args_array=([u]=database=)
+	local database
+	# Manage arguments with getopts
+	ynh_handle_getopts_args "$@"
+
+	if [[ -n $(sudo --login --user=postgres PGUSER="postgres" PGPASSWORD="$(sudo cat $PSQL_ROOT_PWD_FILE)" psql -tAc "SELECT datname FROM pg_database WHERE datname='$database';") ]]; then
+		return 1
+	else
+		return 0
+	fi
+}
+
+# Drop a user
+#
+# [internal]
+#
+# usage: ynh_psql_drop_user user
+# | arg: user - the user name to drop
+ynh_psql_drop_user() {
+	ynh_psql_execute_as_root --sql="DROP USER '${1}';"
+}
+
 # Create a database, an user and its password. Then store the password in the app's config
 #
 # After executing this helper, the password of the created database will be available in $db_pwd
 # It will also be stored as "psqlpwd" into the app settings.
 #
-# usage: ynh_psql_setup_db user name [pwd]
+# usage: ynh_psql_setup_db --db_user=user --db_name=name [--db_pwd=pwd]
-# | arg: user - Owner of the database
+# | arg: -u, --db_user - Owner of the database
-# | arg: name - Name of the database
+# | arg: -n, --db_name - Name of the database
-# | arg: pwd - Password of the database. If not given, a password will be generated
+# | arg: -p, --db_pwd - Password of the database. If not given, a password will be generated
 ynh_psql_setup_db() {
-	local db_user="$1"
+	# Declare an array to define the options of this helper.
-	local db_name="$2"
+	local legacy_args=unp
+	declare -Ar args_array=([u]=db_user= [n]=db_name= [p]=db_pwd=)
+	local db_user
+	local db_name
+	db_pwd=""
+	# Manage arguments with getopts
+	ynh_handle_getopts_args "$@"
+
 	local new_db_pwd=$(ynh_string_random) # Generate a random password
-	# If $3 is not given, use new_db_pwd instead for db_pwd.
+	# If $db_pwd is not given, use new_db_pwd instead for db_pwd
-	local db_pwd="${3:-$new_db_pwd}"
+	db_pwd="${db_pwd:-$new_db_pwd}"
+
 	ynh_psql_create_db "$db_name" "$db_user" "$db_pwd"           # Create the database
-	ynh_app_setting_set "$app" psqlpwd "$db_pwd"	# Store the password in the app's config
+	ynh_app_setting_set --app=$app --key=psqlpwd --value=$db_pwd # Store the password in the app's config
 }
 
-# Create a database and grant privilegies to a user
+# Remove a database if it exists, and the associated user
 #
-# usage: ynh_psql_create_db db [user [pwd]]
+# usage: ynh_psql_remove_db --db_user=user --db_name=name
-# | arg: db - the database name to create
+# | arg: -u, --db_user - Owner of the database
-# | arg: user - the user to grant privilegies
+# | arg: -n, --db_name - Name of the database
-# | arg: pwd  - the user password
-ynh_psql_create_db() {
-	local db="$1"
-	local user="$2"
-	local pwd="$3"
-	ynh_psql_create_user "$user" "$pwd"
-	sudo --login --user=postgres createdb --owner="$user" "$db"
-}
-
-# Drop a database
-#
-# usage: ynh_psql_drop_db db
-# | arg: db - the database name to drop
-# | arg: user - the user to drop
 ynh_psql_remove_db() {
-	local db="$1"
+	# Declare an array to define the options of this helper.
-	local user="$2"
+	local legacy_args=un
-	sudo --login --user=postgres dropdb "$db"
+	declare -Ar args_array=([u]=db_user= [n]=db_name=)
-	ynh_psql_drop_user "$user"
+	local db_user
-}
+	local db_name
+	# Manage arguments with getopts
+	ynh_handle_getopts_args "$@"
 
-# Dump a database
+	local psql_root_password=$(sudo cat $PSQL_ROOT_PWD_FILE)
-#
+	if ynh_psql_database_exists "$db_name"; then # Check if the database exists
-# example: ynh_psql_dump_db 'roundcube' > ./dump.sql
+		echo "Removing database $db_name" >&2
-#
+		ynh_psql_drop_db $db_name # Remove the database
-# usage: ynh_psql_dump_db db
+	else
-# | arg: db - the database name to dump
+		echo "Database $db_name not found" >&2
-# | ret: the psqldump output
+	fi
-ynh_psql_dump_db() {
-	local db="$1"
-	sudo --login --user=postgres pg_dump "$db"
-}
 
-
+	# Remove psql user if it exists
-# Create a user
+	if $(ynh_psql_user_exists --user=$db_user); then
-#
+		ynh_psql_drop_user $db_user
-# usage: ynh_psql_create_user user pwd [host]
+	fi
-# | arg: user - the user name to create
-ynh_psql_create_user() {
-	local user="$1"
-	local pwd="$2"
-	sudo --login --user=postgres psql -c"CREATE USER $user WITH PASSWORD '$pwd'" postgres
-}
-
-# Drop a user
-#
-# usage: ynh_psql_drop_user user
-# | arg: user - the user name to drop
-ynh_psql_drop_user() {
-	local user="$1"
-	sudo --login --user=postgres dropuser "$user"
 }
 
 # Create a master password and set up global settings
@@ -226,18 +239,15 @@ ynh_psql_drop_user() {
 #
 # usage: ynh_psql_test_if_first_run
 ynh_psql_test_if_first_run() {
-	if [ -f /etc/yunohost/psql ];
+	if [ -f /etc/yunohost/psql ]; then
-	then
 		echo "PostgreSQL is already installed, no need to create master password"
 	else
 		local pgsql="$(ynh_string_random)"
 		echo "$pgsql" >/etc/yunohost/psql
 
-		if [ -e /etc/postgresql/9.4/ ]
+		if [ -e /etc/postgresql/9.4/ ]; then
-		then
 			local pg_hba=/etc/postgresql/9.4/main/pg_hba.conf
-		elif [ -e /etc/postgresql/9.6/ ]
+		elif [ -e /etc/postgresql/9.6/ ]; then
-		then
 			local pg_hba=/etc/postgresql/9.6/main/pg_hba.conf
 		else
 			ynh_die "postgresql shoud be 9.4 or 9.6"