From ce17cbae1fbfe39c646d643bbc8eb5d87169bf17 Mon Sep 17 00:00:00 2001 From: Constantine Date: Sat, 28 Feb 2026 16:28:12 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=A4=96=20Merge=20PR=20#74427=20Change=20r?= =?UTF-8?q?eturn=20type=20of=20Client.connect=20in=20`pg`=20by=20@sirkosty?= =?UTF-8?q?a009?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- types/pg/index.d.ts | 9 ++++++--- types/pg/package.json | 2 +- types/pg/pg-tests.ts | 8 ++++---- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/types/pg/index.d.ts b/types/pg/index.d.ts index 954f9f4bd6a841..4782e9a5b90b3a 100644 --- a/types/pg/index.d.ts +++ b/types/pg/index.d.ts @@ -238,8 +238,8 @@ export class Pool extends events.EventEmitter { export class ClientBase extends events.EventEmitter { constructor(config?: string | ClientConfig); - connect(): Promise; - connect(callback: (err: Error) => void): void; + connect(): Promise; + connect(callback: ((err: Error) => void) | ((err: null, c: ClientBase) => void)): void; query(queryStream: T): T; // tslint:disable:no-unnecessary-generics @@ -300,6 +300,9 @@ export class Client extends ClientBase { constructor(config?: string | ClientConfig); + connect(): Promise; + connect(callback: ((err: Error) => void) | ((err: null, c: Client) => void)): void; + end(): Promise; end(callback: (err: Error) => void): void; } @@ -342,8 +345,8 @@ import * as Pg from "."; export const native: typeof Pg | null; export { DatabaseError } from "pg-protocol"; -import TypeOverrides = require("./lib/type-overrides"); export { TypeOverrides }; +import TypeOverrides = require("./lib/type-overrides"); export class Result implements QueryResult { command: string; diff --git a/types/pg/package.json b/types/pg/package.json index 2ccdf737d260ca..afda2d97573cf2 100644 --- a/types/pg/package.json +++ b/types/pg/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@types/pg", - "version": "8.16.9999", + "version": "8.18.9999", "projects": [ "https://github.com/brianc/node-postgres" ], diff --git a/types/pg/pg-tests.ts b/types/pg/pg-tests.ts index 3ed4e80c0b0e34..750dcc54a69dcd 100644 --- a/types/pg/pg-tests.ts +++ b/types/pg/pg-tests.ts @@ -47,19 +47,19 @@ const escapeIdentifier: (str: string) => string = pg.escapeIdentifier; const escapeLiteral: (str: string) => string = pg.escapeLiteral; client.on("notice", (notice: NoticeMessage) => console.warn(`${notice.severity}: ${notice.message}`)); -client.connect(err => { +client.connect((err, c) => { if (err) { console.error("Could not connect to postgres", err); return; } - client.query("SELECT NOW() AS 'theTime'", (err, result) => { + c.query("SELECT NOW() AS 'theTime'", (err, result) => { if (err) { console.error("Error running query", err); return; } console.log(result.rowCount); console.log(result.rows[0]["theTime"]); - client.end(); + c.end(); return null; }); return null; @@ -68,7 +68,7 @@ client.on("end", () => console.log("Client was disconnected.")); client .connect() - .then(() => console.log("connected")) + .then((c) => console.log("connected")) .catch(e => console.error("connection error", e.stack)); client.query("SELECT NOW()", (err, res) => {