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

test_foreign_tables: Better debugging and query the default database when needed

Browse Source
This commit is contained in:
Raul Marin
2019-10-24 12:35:46 +02:00
parent 7f9a748119
commit 164fba197f
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/extension/test.sh
+12 -2
View File
@@ -17,6 +17,10 @@ SED=sed
OK=0 OK=0
PARTIALOK=0 PARTIALOK=0
function reset_default_database() {
DATABASE=test_extension
}
function set_failed() { function set_failed() {
OK=1 OK=1
PARTIALOK=1 PARTIALOK=1
@@ -40,10 +44,10 @@ function sql() {
fi fi
if [ -n "${ROLE}" ]; then if [ -n "${ROLE}" ]; then
log_debug "Executing query '${QUERY}' as ${ROLE}" log_debug "Executing query '${QUERY}' as '${ROLE}' in '${DATABASE}'"
RESULT=`${CMD} -U "${ROLE}" ${DATABASE} -c "${QUERY}" -A -t` RESULT=`${CMD} -U "${ROLE}" ${DATABASE} -c "${QUERY}" -A -t`
else else
log_debug "Executing query '${QUERY}'" log_debug "Executing query '${QUERY}' in '${DATABASE}'"
RESULT=`${CMD} ${DATABASE} -c "${QUERY}" -A -t` RESULT=`${CMD} ${DATABASE} -c "${QUERY}" -A -t`
fi fi
CODERESULT=$? CODERESULT=$?
@@ -212,6 +216,8 @@ function tear_down_database() {
${CMD} -c "DROP DATABASE ${DATABASE}" ${CMD} -c "DROP DATABASE ${DATABASE}"
} }
function tear_down() { function tear_down() {
reset_default_database
log_info "########################### USER TEAR DOWN ###########################" log_info "########################### USER TEAR DOWN ###########################"
sql cdb_testmember_1 "SELECT * FROM cartodb.CDB_Organization_Remove_Access_Permission('cdb_testmember_1', 'foo', 'cdb_testmember_2');" sql cdb_testmember_1 "SELECT * FROM cartodb.CDB_Organization_Remove_Access_Permission('cdb_testmember_1', 'foo', 'cdb_testmember_2');"
sql cdb_testmember_2 "SELECT * FROM cartodb.CDB_Organization_Remove_Access_Permission('cdb_testmember_2', 'bar', 'cdb_testmember_1');" sql cdb_testmember_2 "SELECT * FROM cartodb.CDB_Organization_Remove_Access_Permission('cdb_testmember_2', 'bar', 'cdb_testmember_1');"
@@ -532,6 +538,8 @@ END
DATABASE=fdw_target sql postgres "SELECT cdb_tablemetadatatouch('test_fdw.foo'::regclass);" DATABASE=fdw_target sql postgres "SELECT cdb_tablemetadatatouch('test_fdw.foo'::regclass);"
DATABASE=fdw_target sql postgres "SELECT cdb_tablemetadatatouch('test_fdw.foo2'::regclass);" DATABASE=fdw_target sql postgres "SELECT cdb_tablemetadatatouch('test_fdw.foo2'::regclass);"
reset_default_database
# Add PGPORT to conf if it is set # Add PGPORT to conf if it is set
PORT_SPEC="" PORT_SPEC=""
if [[ "$PGPORT" != "" ]] ; then if [[ "$PGPORT" != "" ]] ; then
@@ -659,8 +667,10 @@ EOF
DATABASE=fdw_target sql postgres 'REVOKE SELECT ON cdb_tablemetadata_text FROM fdw_user;' DATABASE=fdw_target sql postgres 'REVOKE SELECT ON cdb_tablemetadata_text FROM fdw_user;'
DATABASE=fdw_target sql postgres 'DROP ROLE fdw_user;' DATABASE=fdw_target sql postgres 'DROP ROLE fdw_user;'
reset_default_database
sql postgres "select pg_terminate_backend(pid) from pg_stat_activity where datname='fdw_target';" sql postgres "select pg_terminate_backend(pid) from pg_stat_activity where datname='fdw_target';"
DATABASE=fdw_target tear_down_database DATABASE=fdw_target tear_down_database
reset_default_database
} }
function test_cdb_catalog_basic_node() { function test_cdb_catalog_basic_node() {