fix(scripts): Abort snapshot restoration on error

 * Add `--exit-on-error`
 * Add `--schema=public` to skip schema creation

Author: sgillespie

scripts/postgresql-setup.sh

@@ -194,14 +194,23 @@ function restore_snapshot {
 	  lstate_file=$(basename "${lstate_gz_file}" | sed 's/.gz$//')
 	  gunzip --to-stdout "${lstate_gz_file}" > "$2/${lstate_file}"
 	  drop_db
-	  pg_restore --jobs="${numcores}" --format=directory --dbname="${PGDATABASE}" "${tmp_dir}/db/"
+
+          # Important: specify --schema=public below to skip over `create schema public`
+          # statement generated by pg_dump
+	  pg_restore \
+	    --schema=public \
+	    --jobs="${numcores}" \
+	    --format=directory \
+	    --dbname="${PGDATABASE}" \
+	    --exit-on-error \
+	    "${tmp_dir}/db/"
 	else
 	  # Old snapshot format produced by this script
 	  db_file=$(find "${tmp_dir}/" -iname "*.sql")
-      lstate_file=$(find "${tmp_dir}/" -iname "*.lstate")
-      mv "${lstate_file}" "$2"
-      psql --dbname="${PGDATABASE}" -f "${db_file}"
-	  fi
+	  lstate_file=$(find "${tmp_dir}/" -iname "*.lstate")
+	  mv "${lstate_file}" "$2"
+	  psql --dbname="${PGDATABASE}" --file="${db_file}"
+	fi
 	rm "${recursive}" "${tmp_dir}"
 }