From 2ffd0e0828e388376905fe4bb5a3158506d9736e Mon Sep 17 00:00:00 2001 From: Charmander <~@charmander.me> Date: Fri, 16 Aug 2019 18:44:09 +0000 Subject: [PATCH] pg: Update return type for query() callback overloads (#37661) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit `Client.prototype.query` switched from returning a (thenable) `Query` when given a callback to returning nothing in pg@7.0.0. `Pool.prototype.query`’s history is similar. --- types/pg/index.d.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/types/pg/index.d.ts b/types/pg/index.d.ts index 081213eb86..6397115ed3 100644 --- a/types/pg/index.d.ts +++ b/types/pg/index.d.ts @@ -157,9 +157,9 @@ export class Pool extends events.EventEmitter { query(queryConfig: QueryArrayConfig, values?: any[]): Promise; query(queryConfig: QueryConfig): Promise; query(queryTextOrConfig: string | QueryConfig, values?: any[]): Promise; - query(queryConfig: QueryArrayConfig, callback: (err: Error, result: QueryArrayResult) => void): Query; - query(queryTextOrConfig: string | QueryConfig, callback: (err: Error, result: QueryResult) => void): Query; - query(queryText: string, values: any[], callback: (err: Error, result: QueryResult) => void): Query; + query(queryConfig: QueryArrayConfig, callback: (err: Error, result: QueryArrayResult) => void): void; + query(queryTextOrConfig: string | QueryConfig, callback: (err: Error, result: QueryResult) => void): void; + query(queryText: string, values: any[], callback: (err: Error, result: QueryResult) => void): void; on(event: "error", listener: (err: Error, client: PoolClient) => void): this; on(event: "connect" | "acquire" | "remove", listener: (client: PoolClient) => void): this; @@ -175,9 +175,9 @@ export class ClientBase extends events.EventEmitter { query(queryConfig: QueryArrayConfig, values?: any[]): Promise; query(queryConfig: QueryConfig): Promise; query(queryTextOrConfig: string | QueryConfig, values?: any[]): Promise; - query(queryConfig: QueryArrayConfig, callback: (err: Error, result: QueryArrayResult) => void): Query; - query(queryTextOrConfig: string | QueryConfig, callback: (err: Error, result: QueryResult) => void): Query; - query(queryText: string, values: any[], callback: (err: Error, result: QueryResult) => void): Query; + query(queryConfig: QueryArrayConfig, callback: (err: Error, result: QueryArrayResult) => void): void; + query(queryTextOrConfig: string | QueryConfig, callback: (err: Error, result: QueryResult) => void): void; + query(queryText: string, values: any[], callback: (err: Error, result: QueryResult) => void): void; copyFrom(queryText: string): stream.Writable; copyTo(queryText: string): stream.Readable;