cartodb/cartodb-postgresql
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not assume "postgres" user exists

Browse Source
This commit is contained in:
Sandro Santilli 2014-06-18 11:49:56 +02:00
parent 2743b1767b
commit 36dca36927
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
test/organization/test.sh
View File

@ -1,5 +1,12 @@
#!/bin/sh #!/bin/sh
#
# It is expected that you run this script
# as a PostgreSQL superuser, for example:
#
# PGUSER=postgres bash ./test.sh
#
DATABASE=test_organizations DATABASE=test_organizations
CMD='echo psql' CMD='echo psql'
CMD=psql CMD=psql
@ -14,13 +21,16 @@ function sql() {
ROLE="$1" ROLE="$1"
QUERY="$2" QUERY="$2"
else else
ROLE="postgres"
QUERY="$1" QUERY="$1"
fi fi
log_debug "Executing query '${QUERY}' as ${ROLE}" if [ -n "${ROLE}" ]; then
log_debug "Executing query '${QUERY}' as ${ROLE}"
RESULT=`${CMD} -U "${ROLE}" ${DATABASE} -c "${QUERY}" -A -t` RESULT=`${CMD} -U "${ROLE}" ${DATABASE} -c "${QUERY}" -A -t`
else
log_debug "Executing query '${QUERY}'"
RESULT=`${CMD} ${DATABASE} -c "${QUERY}" -A -t`
fi
CODERESULT=$? CODERESULT=$?
echo ${RESULT} echo ${RESULT}
@ -93,12 +103,12 @@ function create_table() {
function setup() { function setup() {
${CMD} -U postgres -c "CREATE DATABASE ${DATABASE}" ${CMD} -c "CREATE DATABASE ${DATABASE}"
sql "CREATE SCHEMA cartodb AUTHORIZATION postgres;" sql "CREATE SCHEMA cartodb;"
sql "GRANT USAGE ON SCHEMA cartodb TO public;" sql "GRANT USAGE ON SCHEMA cartodb TO public;"
log_info "########################### BOOTSTRAP ###########################" log_info "########################### BOOTSTRAP ###########################"
${CMD} -U postgres -d ${DATABASE} -f scripts-available/CDB_Organizations.sql ${CMD} -d ${DATABASE} -f scripts-available/CDB_Organizations.sql
log_info "############################# SETUP #############################" log_info "############################# SETUP #############################"
@ -133,7 +143,7 @@ function tear_down() {
sql "REVOKE CONNECT ON DATABASE \"${DATABASE}\" FROM member_2;" sql "REVOKE CONNECT ON DATABASE \"${DATABASE}\" FROM member_2;"
sql 'DROP ROLE member_2;' sql 'DROP ROLE member_2;'
${CMD} -U postgres -c "DROP DATABASE ${DATABASE}" ${CMD} -c "DROP DATABASE ${DATABASE}"
} }
function run_tests() { function run_tests() {
@ -215,4 +225,4 @@ function test_member_1_removes_access_and_member_2_can_no_longer_write_to_the_ta
run_tests $@ run_tests $@
exit ${OK} exit ${OK}