diff --git a/src/adapter/postgres.ts b/src/adapter/postgres.ts index 6c70e28fd87e156391e5c1e546c71d2aeab3d5cd..e01b2bb32064cd0da0078df23935297e5dbac5ce 100644 --- a/src/adapter/postgres.ts +++ b/src/adapter/postgres.ts @@ -33,7 +33,10 @@ export class PostgresAdapter extends SQLAdapter { } public getDataFromView(view: View, cb: (error: Error, result?: any[]) => void): void { const query = this.getQueryFromView(view); + this.executeQuery(query, cb); + } + private executeQuery(query: string, cb: (err: Error, result?: any[]) => void): void{ this.pool.connect((err, client, done) => { if (err) { cb (err); @@ -48,19 +51,7 @@ export class PostgresAdapter extends SQLAdapter { } public insertIntoSource(source: Source, data: any[], cb: (err: Error, result?: any[]) => void): void { const query = this.getQueryFromSource(source, data); - - this.pool.connect((err, client, done) => { - if (err) { - cb (err); - return; - } - client.query(query, [], (error, result) => { - // call 'done()' to release client back to pool - done(); - cb(error, (result) ? result.rows : null); - }); - }); - + this.executeQuery(query, cb); } public materializeView(view: View): boolean { diff --git a/src/api/controllers/collect.spec.ts b/src/api/controllers/collect.spec.ts index 45bc6d982273ee9016678e710033655a4944e007..10d0fb5a01675d0f37f7529d9391d2665b199d06 100644 --- a/src/api/controllers/collect.spec.ts +++ b/src/api/controllers/collect.spec.ts @@ -44,7 +44,6 @@ describe("API collect controller", () => { let adapter: Adapter; let fixture; before(function (done): void { - // Arrow function not used to get acces to this and skip the test config = ConfigParser.parse("config/test.yaml"); if (config.adapter === "postgres") { fixture = new FixPostgres(config.connection);