Skip to content

Commit 7c5e186

Browse files
author
Laszlo Radics
committed
fix: option is passed to pg connect by a copied object not prototype
1 parent b4df573 commit 7c5e186

File tree

4 files changed

+7
-17
lines changed

4 files changed

+7
-17
lines changed

lib/pgDb.js

+2-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/pgDb.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/pgDb.ts

+2-4
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import {PgTable} from "./pgTable";
33
import {PgSchema} from "./pgSchema";
44
import * as PgConverters from "./pgConverters";
55
import {pgUtils} from "./pgUtils";
6+
import * as _ from 'lodash';
67

78
const pg = require('pg');
89
const readline = require('readline');
@@ -213,10 +214,7 @@ export class PgDb extends QueryAble {
213214
}
214215

215216
private async init(): Promise<PgDb> {
216-
this.pool = new pg.Pool(Object.create(this.config, {
217-
logger: {value: undefined},
218-
skipUndefined: {value: undefined}
219-
}));
217+
this.pool = new pg.Pool(_.omit(this.config, ['logger','skipUndefined']));
220218
if (this.config.logger)
221219
this.setLogger(this.config.logger);
222220

src/test/pgDbSpec.ts

+2-8
Original file line numberDiff line numberDiff line change
@@ -102,15 +102,9 @@ describe("pgdb", () => {
102102
}));
103103

104104
afterEach(w(async () => {
105-
if (pgdb.pool._pendingQueue.length != 0) {
105+
if (pgdb.pool.waitingCount != 0) {
106106
expect('Not all connection is released').toBeFalsy();
107-
for (let connection of pgdb.pool._clients) {
108-
await connection.query('ROLLBACK');
109-
if (connection.release) {
110-
console.log('stuck connection:', connection.processID);
111-
connection.release();
112-
}
113-
}
107+
await pgdb.pool.end();
114108
}
115109
}));
116110

0 commit comments

Comments
 (0)