From 55bf786d3b612481ac41bc9ce04095a211df6e87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ant=C3=B3nio=20Marques?= <me@antoniomarques.eu>
Date: Fri, 24 Mar 2017 14:44:32 +0000
Subject: [PATCH] Fix pg-query-stream by adding a compatible overload to
 query() (#15351)

---
 pg-query-stream/index.d.ts               | 6 +++++-
 pg-query-stream/pg-query-stream-tests.ts | 4 ++--
 pg/index.d.ts                            | 1 +
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/pg-query-stream/index.d.ts b/pg-query-stream/index.d.ts
index 1a7a694a6a..34331358e7 100644
--- a/pg-query-stream/index.d.ts
+++ b/pg-query-stream/index.d.ts
@@ -3,6 +3,10 @@
 // Definitions by: António Marques <https://github.com/asmarques>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
+/// <reference types="node" />
+
+import stream = require("stream");
+
 declare namespace QueryStream {
     interface Options {
         highWaterMark?: number;
@@ -10,7 +14,7 @@ declare namespace QueryStream {
     }
 }
 
-declare class QueryStream {
+declare class QueryStream extends stream.Readable {
     batchSize: number;
     text: string;
     values?: any[];
diff --git a/pg-query-stream/pg-query-stream-tests.ts b/pg-query-stream/pg-query-stream-tests.ts
index 04796580de..6c4c034102 100644
--- a/pg-query-stream/pg-query-stream-tests.ts
+++ b/pg-query-stream/pg-query-stream-tests.ts
@@ -10,10 +10,10 @@ const query = new QueryStream('SELECT * FROM generate_series(0, $1) num', [10000
 
 pg.connect('', (err, client, done) => {
     const stream = client.query(query);
-    stream.then(() => {
+    stream.on('end', () => {
         client.end();
     });
-    stream.then((data: any) => {
+    stream.on('data', (data: any) => {
         console.log(data);
     });
 });
diff --git a/pg/index.d.ts b/pg/index.d.ts
index ca3d6c0105..75d075700c 100644
--- a/pg/index.d.ts
+++ b/pg/index.d.ts
@@ -89,6 +89,7 @@ export declare class Client extends events.EventEmitter {
     end(callback?: (err: Error) => void): void;
     release(): void;
 
+    query(queryStream: QueryConfig & stream.Readable): stream.Readable;
     query(queryTextOrConfig: string | QueryConfig): Promise<QueryResult>;
     query(queryText: string, values: any[]): Promise<QueryResult>;