Skip to content

Commit

Permalink
fix(azure-db): fix drop (#877)
Browse files Browse the repository at this point in the history
* fix(azure-db): fix drop

* fix test

* fix: handle weird db names
  • Loading branch information
Julien Bouquillon committed Oct 11, 2021
1 parent c4df076 commit 7ffce9b
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 7 deletions.
14 changes: 7 additions & 7 deletions azure-db/bin/drop-db-user
Expand Up @@ -38,17 +38,17 @@ echo
echo "deleting database ${DROP_DATABASE} on ${PGHOST}"
psql -abe "$PG_URL_ADMIN" <<EOF
SET SESSION CHARACTERISTICS AS TRANSACTION READ WRITE;
DROP DATABASE $DROP_DATABASE;
DROP DATABASE "$DROP_DATABASE";
EOF

echo
echo "deleting user ${DROP_USER_BASE} on ${PGHOST}"
psql -abe "$PG_URL_ADMIN" <<EOF
SET SESSION CHARACTERISTICS AS TRANSACTION READ WRITE;
REVOKE ALL PRIVILEGES ON SCHEMA public FROM \"${DROP_USER_BASE}\";
REVOKE ALL PRIVILEGES ON ALL TABLES IN SCHEMA public FROM \"${DROP_USER_BASE}\";
REVOKE ALL PRIVILEGES ON ALL SEQUENCES IN SCHEMA public FROM \"${DROP_USER_BASE}\";
REVOKE ALL PRIVILEGES ON ALL FUNCTIONS IN SCHEMA public FROM \"${DROP_USER_BASE}\";
DROP OWNED BY ${DROP_USER_BASE} CASCADE;
DROP USER ${DROP_USER_BASE};
REVOKE ALL PRIVILEGES ON SCHEMA public FROM "$DROP_USER_BASE";
REVOKE ALL PRIVILEGES ON ALL TABLES IN SCHEMA public FROM "$DROP_USER_BASE";
REVOKE ALL PRIVILEGES ON ALL SEQUENCES IN SCHEMA public FROM "$DROP_USER_BASE";
REVOKE ALL PRIVILEGES ON ALL FUNCTIONS IN SCHEMA public FROM "$DROP_USER_BASE";
DROP OWNED BY "${DROP_USER_BASE}" CASCADE;
DROP USER "${DROP_USER_BASE}";
EOF
4 changes: 4 additions & 0 deletions azure-db/tests/drop-db-user.bats
Expand Up @@ -38,6 +38,10 @@ teardown_file() {
assert_line --partial 'SET SESSION CHARACTERISTICS AS TRANSACTION READ WRITE;'
assert_line --partial 'SELECT pg_terminate_backend (pg_stat_activity.pid)'
assert_line --partial 'deleting database autodevops_'${ID}' on localhost'
assert_line --partial 'deleting user user_'${ID}' on localhost'
assert_line 'DROP DATABASE'
assert_line 'DROP OWNED'
assert_line 'DROP ROLE'
assert_success
}

Expand Down

0 comments on commit 7ffce9b

Please sign in to comment.