Merge branch 'issue/102' into 'develop'

Issue #102: Update auxiliar scripts to use new configuration file

See merge request !84

.gitlab-ci.yml

@@ -28,7 +28,7 @@ run_test:
     stage: test
     script:                
         - yarn install --frozen-lockfile --silent --non-interactive
-        - mv config/ci_database_test.env.example config/test.env
+        - mv config/test.env.example config/test.env
         - yarn test
         - yarn run lint
     tags:
@@ -59,4 +59,3 @@ deploy:
         - build
     only:
         - develop
-

config/config.env.example

-BLENDB_DB_NAME=blendb-test
-BLENDB_DB_USER=blendb
-BLENDB_DB_PASSWORD=secret
-BLENDB_DB_HOST=localhost
-BLENDB_DB_PORT=5432
-BLENDB_ADAPTER=postgres
 BLENDB_SCHEMA_FILE=config/config.yaml.example
 PORT=3000
+BLENDB_N_DB=1
+BLENDB_DB0_USER=blendb
+BLENDB_DB0_NAME=blendb-test
+BLENDB_DB0_PASSWORD=secret
+BLENDB_DB0_HOST=localhost
+BLENDB_DB0_PORT=5432
+BLENDB_DB0_ADAPTER=postgres

config/test/postgres/fixtures/sellerstatus.json

-[
-    {"met:seller:count:age" : 4, "dim:seller:status" : "active"},
-    {"met:seller:count:age" : 1, "dim:seller:status" : "sick leave"}
-]

docker-compose.yml

@@ -12,18 +12,20 @@ services:
         security_opt:
            - no-new-privileges
     blendb:
-        image: marula.c3sl.ufpr.br:5000/c3sl/blendb:latest
+        # image: marula.c3sl.ufpr.br:5000/c3sl/blendb:latest
+        image: blendb
         build: .
         container_name: blendb
         environment:
-            BLENDB_DB_USER: postgres
-            BLENDB_DB_PASSWORD: passwd
-            BLENDB_DB_NAME: postgres
-            BLENDB_DB_HOST: postgres
-            BLENDB_DB_PORT: 5432
-            BLENDB_ADAPTER: postgres
             BLENDB_SCHEMA_FILE: config/config.yaml.example
             PORT: 3000
+            BLENDB_N_DB: 1
+            BLENDB_DB0_USER: postgres
+            BLENDB_DB0_NAME: postgres
+            BLENDB_DB0_PASSWORD: passwd
+            BLENDB_DB0_HOST: postgres
+            BLENDB_DB0_PORT: 5432
+            BLENDB_DB0_ADAPTER: postgres
         ports:
             - 3000:3000
         command: ["yarn","test-mode"]

scripts/loadTest.ts

@@ -37,7 +37,7 @@ else{
 }
 config = ConfigParser.parse(configPath);
 
-fixture = new FixPostgres(config.connection);
+fixture = new FixPostgres(config.connections[0]);
 
 fixture.load(config.loadViews, (err) => {
     if (err) {

scripts/schema.ts

@@ -40,7 +40,7 @@ const config = ConfigParser.parse(configFile);
 const referencePath = path.dirname(configFile);
 
 const engine = new Engine(config);
-const adapter = new PostgresAdapter(config.connection);
+const adapter = new PostgresAdapter(config.connections[0]);
 
 let schema = "";