Merge pull request #8697 from chbrown/pg-connect-cb-done-arg

pg.connect(...) callback done argument to signal client removal from pool
This commit is contained in:
Masahiro Wakame
2016-03-26 23:05:30 +09:00
2 changed files with 7 additions and 4 deletions
+5 -2
View File
@@ -12,10 +12,13 @@ pg.connect(conString, (err, client, done) => {
return console.error("Error fetching client from pool", err);
}
client.query("SELECT $1::int AS number", ["1"], (err, result) => {
done();
if (err) {
done(err);
return console.error("Error running query", err);
}
else {
done();
}
console.log(result.rows[0]["number"]);
return null;
});
@@ -37,4 +40,4 @@ client.connect((err) => {
return null;
});
return null;
});
});
Vendored
+2 -2
View File
@@ -9,8 +9,8 @@ declare module "pg" {
import events = require("events");
import stream = require("stream");
export function connect(connection: string, callback: (err: Error, client: Client, done: () => void) => void): void;
export function connect(config: ClientConfig, callback: (err: Error, client: Client, done: () => void) => void): void;
export function connect(connection: string, callback: (err: Error, client: Client, done: (err?: any) => void) => void): void;
export function connect(config: ClientConfig, callback: (err: Error, client: Client, done: (err?: any) => void) => void): void;
export function end(): void;
export interface ConnectionConfig {