query-node: factor out db:migrate to script

query-node/db-migrate.sh

@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+set -e
+
+SCRIPT_PATH="$(dirname "${BASH_SOURCE[0]}")"
+cd $SCRIPT_PATH
+
+set -a
+. ../.env
+set +a
+
+yarn workspace query-node-root db:indexer:migrate
+yarn workspace query-node-root db:schema:migrate
+TYPEORM_DATABASE=${PROCESSOR_DB_NAME} yarn workspace query-node-root db:indexer:migrate

query-node/package.json

@@ -6,14 +6,14 @@
 		"build": "./build.sh",
 		"test": "echo \"Error: no test specified\" && exit 1",
 		"clean": "rm -rf ./generated",
-		"processor:start": "(cd ./generated/indexer && yarn && DEBUG=${DEBUG} yarn start:processor)",
-		"indexer:start": "(cd ./generated/indexer && yarn && DEBUG=${DEBUG} yarn start:indexer)",
+		"processor:start": "(cd ./generated/indexer && yarn && DEBUG=${DEBUG} yarn start:processor --env ../../../.env)",
+		"indexer:start": "(cd ./generated/indexer && yarn && DEBUG=${DEBUG} yarn start:indexer --env ../../../.env)",
 		"server:start:dev": "(cd ./generated/graphql-server && yarn start:dev)",
 		"server:start:prod": "(cd ./generated/graphql-server && yarn start:prod)",
 		"configure": "(cd ./generated/graphql-server && yarn config:dev)",
 		"db:up": "(cd ../ && docker-compose up -d db)",
 		"db:drop": "(cd ./generated/graphql-server && yarn db:drop)",
-		"db:migrate": "yarn db:schema:migrate && yarn db:indexer:migrate",
+		"db:migrate": "./db-migrate.sh",
 		"db:schema:migrate": "(cd ./generated/graphql-server && yarn db:create && yarn db:sync && yarn db:migrate)",
 		"db:indexer:migrate": "(cd ./generated/indexer && yarn db:migrate)",
 		"codegen:indexer": "yarn hydra-cli codegen --no-install --no-graphql && cp indexer-tsconfig.json generated/indexer/tsconfig.json",

query-node/run-tests.sh

@@ -11,8 +11,9 @@ cd $SCRIPT_PATH
 # typeorm commandline is used by db:migrate step below.
 ln -s ../../../../../node_modules/typeorm/cli.js generated/graphql-server/node_modules/.bin/typeorm || :
 
-# Move to root directory so docker-compose uses .env file from the project root directory
-cd ../
+set -a
+. ../.env
+set +a
 
 # Clean start
 docker-compose down -v
@@ -34,9 +35,7 @@ export WS_PROVIDER_ENDPOINT_URI=ws://joystream-node:9944/
 docker-compose up -d db
 
 # Migrate the databases
-yarn workspace query-node-root db:indexer:migrate
-yarn workspace query-node-root db:schema:migrate
-TYPEORM_DATABASE=query_node_processor yarn workspace query-node-root db:indexer:migrate
+yarn workspace query-node-root db:migrate
 
 docker-compose up -d graphql-server
 
@@ -44,4 +43,4 @@ docker-compose up -d graphql-server
 docker-compose up -d processor
 
 # Run tests
-ATTACH_TO_NETWORK=joystream_default tests/network-tests/run-tests.sh content-directory
+ATTACH_TO_NETWORK=joystream_default ../tests/network-tests/run-tests.sh content-directory

start.sh

@@ -4,6 +4,10 @@ set -e
 # Run a complete joystream development network on your machine using docker.
 # Make sure to run build.sh prior to running this script.
 
+set -a
+. .env
+set +a
+
 # Clean start!
 docker-compose down -v
 
@@ -30,7 +34,6 @@ yarn workspace @joystream/cd-schemas initialize:dev
 # Initialize a new database for the query node infrastructure
 docker-compose up -d db
 yarn workspace query-node-root db:migrate
-TYPEORM_DATABASE=query_node_processor yarn workspace query-node-root db:indexer:migrate
 
 # Startup all query-node infrastructure services
 docker-compose up -d graphql-server