Merge branch 'develop'

silinternational · Apr 13, 2022 · 842d654 · 842d654
2 parents b41486a + 3bf9a14
commit 842d654
Showing 1 changed file with 18 additions and 1 deletion.
diff --git a/application/restore.sh b/application/restore.sh
@@ -16,8 +16,23 @@ if [ -z "${result}" ]; then
     fi
 fi
 
-echo "postgresql-backup-restore: restoring ${DB_NAME}"
+# Delete database if it exists.
+echo "postgresql-backup-restore: checking for DB ${DB_NAME}"
+result=$(psql --host=${DB_HOST} --username=${DB_ROOTUSER} --list | grep ${DB_NAME})
+if [ -z "${result}" ]; then
+    message="Database "${DB_NAME}" on host "${DB_HOST}" does not exist."
+    echo "postgresql-backup-restore: INFO: ${message}"
+else
+    echo "postgresql-backup-restore: deleting database ${DB_NAME}"
+    result=$(psql --host=${DB_HOST} --dbname=postgres --username=${DB_USER} --command="DROP DATABASE ${DB_NAME};")
+    if [ "${result}" != "DROP DATABASE" ]; then
+        message="Create database command failed: ${result}"
+        echo "postgresql-backup-restore: FATAL: ${message}"
+        exit 1
+    fi
+fi
 
+echo "postgresql-backup-restore: copying database ${DB_NAME} backup from ${S3_BUCKET}"
 start=$(date +%s)
 s3cmd get -f ${S3_BUCKET}/${DB_NAME}.sql.gz /tmp/${DB_NAME}.sql.gz || STATUS=$?
 end=$(date +%s)
@@ -29,6 +44,7 @@ else
     echo "postgresql-backup-restore: Copy backup of ${DB_NAME} from ${S3_BUCKET} completed in $(expr ${end} - ${start}) seconds."
 fi
 
+echo "postgresql-backup-restore: decompressing backup of ${DB_NAME}"
 start=$(date +%s)
 gunzip -f /tmp/${DB_NAME}.sql.gz || STATUS=$?
 end=$(date +%s)
@@ -40,6 +56,7 @@ else
     echo "postgresql-backup-restore: Decompressing backup of ${DB_NAME} completed in $(expr ${end} - ${start}) seconds."
 fi
 
+echo "postgresql-backup-restore: restoring ${DB_NAME}"
 start=$(date +%s)
 psql --host=${DB_HOST} --username=${DB_ROOTUSER} --dbname=postgres ${DB_OPTIONS}  < /tmp/${DB_NAME}.sql || STATUS=$?
 end=$(date +%s)