Merge branch 'issue/79' into 'develop'

Issue #79: Fix tests, independent from variable create

See merge request !65

config/ci_test.env.example

@@ -3,7 +3,5 @@ BLENDB_DB_NAME=blendb_fixture
 BLENDB_DB_PASSWORD=
 BLENDB_DB_HOST=postgres
 BLENDB_DB_PORT=5432
-BLENDB_ST_CREATE=true
-BLENDB_ST_INSERT=true
 BLENDB_ADAPTER=postgres
 PORT=3000

config/config.env.example

@@ -3,7 +3,5 @@ BLENDB_DB_NAME=blendb-test
 BLENDB_DB_PASSWORD=secret
 BLENDB_DB_HOST=localhost
 BLENDB_DB_PORT=5432
-BLENDB_ST_CREATE=false
-BLENDB_ST_INSERT=false
 BLENDB_ADAPTER=postgres
 PORT=3000

src/adapter/postgres.spec.ts

@@ -40,7 +40,7 @@ describe("postgres adapter", () => {
         config = ConfigParser.parse("config/test.yaml");
         if (config.adapter === "postgres") {
             fixture = new FixPostgres(config.connection);
-            fixture.load(config.loadViews, config.struct.create, (err) => {
+            fixture.load(config.loadViews, (err) => {
                 if (err) {
                     throw err;
                 }

src/api/controllers/collect.spec.ts

@@ -39,7 +39,7 @@ describe("API collect controller", () => {
         config = ConfigParser.parse("config/test.yaml");
         if (config.adapter === "postgres") {
             fixture = new FixPostgres(config.connection);
-            fixture.LoadSource(config.sources, config.struct.create, (err) => {
+            fixture.loadSource(config.sources, (err) => {
                 if (err) {
                     throw err;
                 }

src/util/configParser.ts

@@ -77,15 +77,6 @@ interface BuildView {
     alias: string;
 }
 
-/** Information required to conduct fixture loading. */
-export interface LoadStruct{
-    /** True if is required create structures in the database before loading. */
-    create: boolean;
-    /** True any fixture is loaded yet. */
-    insert: boolean;
-}
-
-/** Configuration file representation with objects, not strings. */
 export interface ParsedConfig {
     /** What adapter is in use. */
     adapter: string;
@@ -101,9 +92,6 @@ export interface ParsedConfig {
     enumTypes: EnumType[];
     /** Set of all dimensions available. */
     dimensions: Dimension[];
-    /** Fixture loading policy. */
-    struct: LoadStruct;
-    /** Fixture data configuration. */
     loadViews: LoadView[];
     /** SQL views build configuration. */
     buildViews: BuildView[];
@@ -175,15 +163,6 @@ export class ConfigParser {
             host: process.env.BLENDB_DB_HOST,
             port: parseInt(process.env.BLENDB_DB_PORT, 10)
         };
-
-        const strCreate = process.env.BLENDB_ST_CREATE;
-        const strInsert = process.env.BLENDB_ST_INSERT;
-
-        let struct: LoadStruct = {
-            create: (strCreate) ? strCreate.toLowerCase() === "true" : false,
-            insert: (strInsert) ? strInsert.toLowerCase() === "true" : false
-        };
-
         let metricsOpts = config.metrics;
         let viewsOpts = config.views;
         let dimensionsOpts = config.dimensions;
@@ -196,7 +175,6 @@ export class ConfigParser {
             metrics: [],
             enumTypes: [],
             dimensions: [],
-            struct: struct,
             loadViews: [],
             buildViews: [],
             sources: []

test/postgres/fixture.ts

@@ -52,31 +52,23 @@ export class Fixture {
         this.database = config.database;
     }
 
-    public load(schemas: LoadView[], create: boolean, cb: (err: Error) => void): void {
+    public load(schemas: LoadView[], cb: (err: Error) => void): void {
         let client = new Client(this.config);
 
         /*
             Loading data has 2 steps:
             1 - Create a table or truncate a existing one.
-                Create or truncate dependes from a parameter in the configure
-                file, this parameter reaches this function as the create
-                parameter.
             2 - Insert data.
         */
-        let init: string[] = [];
         let data: string[] = [];
         for (let i = 0; i < schemas.length; ++i) {
-            let table: TransSet = this.createTransSet(schemas[i].view, schemas[i].data, create);
-            init.push(table.init);
-            data = data.concat(table.data);
+            data = data.concat(this.extractDataView(schemas[i].view, schemas[i].data));
         }
-
         client.connect((error) => {
             if (error) {
                 cb(error);
                 return;
             }
-
             /*
                 Tables must be creates before data could be inserted, so the
                 queries that create and insert are splited in 2 arrays.
@@ -84,8 +76,16 @@ export class Fixture {
                 is used. Inside series each query is executed, using each;
             */
             series([(callback: (err: Error) => void) => {
-                each(init, (query, cback) => {
-                    return client.query(query, [], (err: Error) => cback(err));
+                each(schemas, (query, cback) => {
+                    client.query(this.createTransSet(query.view, query.data, true), [], (errCreate: Error) => {
+                        if (errCreate) {
+                            let regex = new RegExp(/relation \".*\" already exists/);
+                            if (regex.test(errCreate.message.toLowerCase())){
+                                return client.query(this.createTransSet(query.view, query.data, false), [], (errTrunc: Error) => cback(errTrunc));
+                            }
+                        }
+                        return cback(errCreate);
+                    });
                 }, (errQuery: Error) => callback(errQuery));
             }, (callback: (err: Error) => void) => {
                 each(data, (query, cback) => {
@@ -119,61 +119,66 @@ export class Fixture {
         }
     }
 
-    private createTransSet(view: View, filePath: string, create: boolean): TransSet {
-        let props = [];
+    private extractDataView(view: View, filePath: string): string[]{
+        let name = "view_" + view.id;
+        let data: string[] = [];
+        let rows = JSON.parse(fs.readFileSync(filePath, {encoding : "utf8"}));
+        for (let i = 0; i < rows.length; ++i) {
+            let values = [];
+            let keys = [];
+            for (let key of Object.keys(rows[i])) {
+                keys.push("\"" + key + "\"");
+                values.push("'" + rows[i][key] + "'");
+            }
+            data.push("INSERT INTO " + name +
+                                    "(" + keys.join(", ") + ") " +
+                                    "VALUES (" + values.join(", ") + ")");
+        }
+
+        return data;
+
+    }
 
+    private createTransSet(view: View, filePath: string, create: boolean): string {
+        let name = "view_" + view.id;
+        let init: string = "";
+        let props = [];
         for (let i = 0; i < view.metrics.length; ++i) {
             let met = view.metrics[i];
             props.push("\"" + met.name + "\" " + this.typeConvertion(met.dataType));
         }
-
         for (let i = 0; i < view.dimensions.length; ++i) {
             let dim = view.dimensions[i];
             props.push("\"" + dim.name + "\" " + this.typeConvertion(dim.dataType));
         }
-
-        let name = "view_" + view.id;
-        let transaction: TransSet = {init: "", data: []};
         if (create) {
-            transaction.init = "CREATE TABLE " + name + "(" + props.join(", ") + ")";
+            init = "CREATE TABLE " + name + "(" + props.join(", ") + ")";
         }
         else {
-            transaction.init = "TRUNCATE TABLE " + name;
-        }
-
-        transaction.data = [];
-        let rows = JSON.parse(fs.readFileSync(filePath, {encoding : "utf8"}));
-        for (let i = 0; i < rows.length; ++i) {
-            let values = [];
-            let keys = [];
-            for (let key of Object.keys(rows[i])) {
-                keys.push("\"" + key + "\"");
-                values.push("'" + rows[i][key] + "'");
+            init = "TRUNCATE TABLE " + name;
         }
-            transaction.data.push("INSERT INTO " + name +
-                                    "(" + keys.join(", ") + ") " +
-                                    "VALUES (" + values.join(", ") + ")");
-        }
-        return transaction;
+        return init;
     }
-    public LoadSource(source: Source[], create: boolean , cb: (err: Error) => void): void {
+    public loadSource(source: Source[] , cb: (err: Error) => void): void {
 
         let client = new Client(this.config);
 
-        let query: string[] = [];
-        for (let i = 0; i < source.length; i++ ){
-        query[i] = this.ExtractData(source[i], create);
-        }
-
         client.connect((error) => {
             if (error) {
                 cb(error);
                 return;
             }
-
             series([(callback: (err: Error) => void) => {
-                each(query, (insere, cback) => {
-                    return client.query(insere , [], (err: Error) => cback(err));
+                each(source, (insere, cback) => {
+                    client.query ( this.extractData(insere, true), [], (errCreate: Error) => {
+                        if (errCreate) {
+                            let regex = new RegExp(/relation \".*\" already exists/);
+                            if (regex.test(errCreate.message.toLowerCase())){
+                                return client.query ( this.extractData(insere, false), [], (errTrunc: Error) => cback(errTrunc));
+                            }
+                        }
+                        return cback(errCreate);
+                    });
                 }, (errQuery: Error) => callback(errQuery));
             }], (errQuery: Error) => {
                  if (errQuery) {
@@ -184,10 +189,10 @@ export class Fixture {
                      cb(err);
                  });
             });
-        });
 
+        });
     }
-    private ExtractData(data: Source , create: boolean): string{
+    private extractData(data: Source, create: boolean): string{
         let name: string;
         let type: DataType[];
         let fields: string[];
@@ -208,6 +213,7 @@ export class Fixture {
         else{
         consult = "TRUNCATE TABLE " + name + ";";
         }
+
         return consult;
 
     }