Fix upgrade script

Makefile

@@ -4,9 +4,8 @@ COMPOSE_FILES = -f docker-compose.yaml -f .docker-compose-db.yaml -f .docker-com
 
 DATAPUSHER_TYPE ?= datapusher-plus
 CKAN_DB_NAME ?= ckan
-CKAN_DB_USER ?= ckan
-DB_USERNAME ?= postgres
 CKAN_DB_USERNAME ?= ckan
+DB_USERNAME ?= postgres
 DATASTORE_DB_NAME ?= datastore
 DATASTORE_DB_USERNAME ?= postgres
 
@@ -72,4 +71,4 @@ backup-db:
 	docker-compose $(COMPOSE_FILES) exec -T datastore-db pg_dump -U postgres --format=custom -d datastore > datastore.dump
 
 upgrade-db:
-	./db/migration/upgrade_databases.sh "$(COMPOSE_FILES)" "$(CKAN_DB_NAME)" "$(CKAN_DB_USERNAME)" "$(DB_USERNAME)" "$(CKAN_DB_USERNAME)" "$(DATASTORE_DB_NAME)" "$(DATASTORE_DB_USERNAME)"
+	./db/migration/upgrade_databases.sh "$(COMPOSE_FILES)" "$(CKAN_DB_NAME)" "$(CKAN_DB_USERNAME)" "$(DB_USERNAME)" "$(DATASTORE_DB_NAME)" "$(DATASTORE_DB_USERNAME)"

db/migration/upgrade_databases.sh

@@ -2,8 +2,8 @@
 
 COMPOSE_FILES=$1
 CKAN_DB_NAME=$2
-DB_USERNAME=$3
-CKAN_DB_USERNAME=$4
+CKAN_DB_USERNAME=$3
+DB_USERNAME=$4
 DATASTORE_DB_NAME=$5
 DATSTORE_DB_USERNAME=$6
 
@@ -53,13 +53,6 @@ reset_database() {
 reset_database ${CKAN_DB_NAME} ${DB_SERVICE} ${CKAN_DB_USERNAME}
 reset_database ${DATASTORE_DB_NAME} ${DATASTORE_SERVICE} ${DATSTORE_DB_USERNAME}
 
-echo ""
-echo "### Create ROLE and DATABASE for datapusher_jobs in Datastore database..."
-echo ""
-
-docker-compose ${COMPOSE_FILES} exec -T ${DATASTORE_SERVICE} psql -U ${DB_USERNAME} -c "CREATE ROLE datapusher_jobs WITH LOGIN PASSWORD '123456';"
-docker-compose ${COMPOSE_FILES} exec -T ${DATASTORE_SERVICE} psql -U ${DB_USERNAME} -c "CREATE DATABASE datapusher_jobs OWNER datapusher_jobs ENCODING 'utf8';"
-
 echo ""
 echo "### ROLE and DATABASE for datapusher_jobs created in Datastore database."
 
@@ -81,6 +74,13 @@ docker-compose ${COMPOSE_FILES} exec -T ${DATASTORE_SERVICE} pg_restore -U postg
 echo ""
 echo "### Restoring Datastore DB from backup completed."
 
+echo ""
+echo "### Create ROLE and DATABASE for datapusher_jobs in Datastore database..."
+echo ""
+
+docker-compose ${COMPOSE_FILES} exec -T ${DATASTORE_SERVICE} psql -U ${DB_USERNAME} -c "CREATE ROLE datapusher_jobs WITH LOGIN PASSWORD '123456';"
+docker-compose ${COMPOSE_FILES} exec -T ${DATASTORE_SERVICE} psql -U ${DB_USERNAME} -c "CREATE DATABASE datapusher_jobs OWNER datapusher_jobs ENCODING 'utf8';"
+
 echo ""
 echo "### Restoring data files to CKAN..."
 echo ""