[#2039] allow PGPASSWORD to be set from outside admin-utils.sh

diff --git a/src/bin/admin/admin-utils.sh b/src/bin/admin/admin-utils.sh
index 5ed68937e0a592fac5ad820763de9144e3e09c0a..750b8d9ad980af91346303953553d4eb4c7aad62 100644 (file)
--- a/src/bin/admin/admin-utils.sh
+++ b/src/bin/admin/admin-utils.sh
@@ -115,7 +115,12 @@ pgsql_execute() {
     QUERY=$1
     shift
 
-    export PGPASSWORD="${db_password}"
+    # Prioritize externally set PGPASSWORD. wipe_data.sh sets it for example.
+    if test -z "${PGPASSWORD-}"; then
+        PGPASSWORD="${db_password}"
+    fi
+    export PGPASSWORD
+
     printf '%s' "${QUERY}" | psql --set ON_ERROR_STOP=1 -A -t -h "${db_host}" \
         ${db_port_full_parameter-} -q -U "${db_user}" -d "${db_name}" "${@}"
 }
@@ -129,7 +134,12 @@ pgsql_execute_script() {
     file=$1
     shift
 
-    export PGPASSWORD=$db_password
+    # Prioritize externally set PGPASSWORD. wipe_data.sh sets it for example.
+    if test -z "${PGPASSWORD-}"; then
+        PGPASSWORD="${db_password}"
+    fi
+    export PGPASSWORD
+
     psql --set ON_ERROR_STOP=1 -A -t -h "${db_host}" \
         ${db_port_full_parameter-} -q -U "${db_user}" -d "${db_name}" \
         -f "${file}" "${@}"