From 53c2b3f6f48c7dfa6362baba2f37ec1eb6cc6a9a Mon Sep 17 00:00:00 2001 From: Reid Barton Date: Thu, 20 Aug 2015 15:39:39 -0700 Subject: [PATCH] Clean up vagrant postgres user creation code We don't need to check whether the user exists before creating it: CREATE USER failing is fine. (imported from commit e8b2bc5495e328ee30d15445a566c0edff2f069d) --- tools/postgres-init-db | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/tools/postgres-init-db b/tools/postgres-init-db index 082a91f781..da96eae4a0 100755 --- a/tools/postgres-init-db +++ b/tools/postgres-init-db @@ -34,16 +34,7 @@ ALTER USER $USERNAME PASSWORD '$PASSWORD'; ALTER USER $USERNAME CREATEDB; ALTER ROLE $USERNAME SET search_path TO $SEARCH_PATH; -DO \$\$ - BEGIN - IF NOT EXISTS ( - SELECT * FROM pg_catalog.pg_user WHERE usename -- [sic] - = '$VAGRANTUSERNAME') THEN - - CREATE USER $VAGRANTUSERNAME; - END IF; - END -\$\$ ; +CREATE USER $VAGRANTUSERNAME; GRANT $USERNAME TO $VAGRANTUSERNAME; ALTER ROLE $VAGRANTUSERNAME SET search_path TO $SEARCH_PATH; EOF