Drop database before restore

reloni · reloni · commit 409144d2cd3d · 2017-09-11T22:05:36.000+03:00
diff --git a/Scripts/MigrateLastDB.sh b/Scripts/MigrateLastDB.sh
@@ -19,7 +19,7 @@ sleep 7
 
 aws s3 --region ${SECRETS_BUCKET_REGION} cp s3://${BACKUPS_BUCKET_NAME}/latest.psql.gz ./latest.psql.gz
 #restore backup
-gunzip -c ./latest.psql.gz | pg_restore --clean --dbname=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB} >> ${BACKUP_RESTORE_LOG} 2>&1 && \
+gunzip -c ./latest.psql.gz | psql --dbname=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB} >> ${BACKUP_RESTORE_LOG} 2>&1 && \
 rm ./latest.psql.gz
 
 sh MigrateDB.sh
diff --git a/Scripts/RestoreDB.sh b/Scripts/RestoreDB.sh
@@ -5,8 +5,11 @@ if [ "$LOAD_S3_SECRETS" = "YES" ]; then
   eval $(aws s3 --region ${SECRETS_BUCKET_REGION} cp s3://${SECRETS_BUCKET_NAME}/${SECRETS_FILE_NAME} - | sed 's/^/export /')
 fi
 
+#drop database
+psql --dbname=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB} -t -c "drop database if exists ${POSTGRES_DB};" >> ${BACKUP_RESTORE_LOG} 2>&1
+
 #load latest database backup
 aws s3 --region ${SECRETS_BUCKET_REGION} cp s3://${BACKUPS_BUCKET_NAME}/latest.psql.gz ./latest.psql.gz > ${BACKUP_RESTORE_LOG} 2>&1
 #restore backup
-gunzip -c ./latest.psql.gz | pg_restore --clean --dbname=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB} >> ${BACKUP_RESTORE_LOG} 2>&1 && \
+gunzip -c ./latest.psql.gz | psql --dbname=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB} >> ${BACKUP_RESTORE_LOG} 2>&1 && \
 rm ./latest.psql.gz
