Merge pull request brianc#2271 from aravindanve/master

brianc · web-flow · commit 3c176bdf86a1 · 2020-07-15T13:01:39.000-05:00
Fix: use types configured on pg client in pg-query-stream
diff --git a/packages/pg-query-stream/index.js b/packages/pg-query-stream/index.js
@@ -16,6 +16,9 @@ class PgQueryStream extends Readable {
     this.handleReadyForQuery = this.cursor.handleReadyForQuery.bind(this.cursor)
     this.handleError = this.cursor.handleError.bind(this.cursor)
     this.handleEmptyQuery = this.cursor.handleEmptyQuery.bind(this.cursor)
+
+    // pg client sets types via _result property
+    this._result = this.cursor._result
   }
 
   submit(connection) {
diff --git a/packages/pg-query-stream/test/client-options.js b/packages/pg-query-stream/test/client-options.js
@@ -0,0 +1,27 @@
+var pg = require('pg')
+var assert = require('assert')
+var QueryStream = require('../')
+
+describe('client options', function () {
+  it('uses custom types from client config', function (done) {
+    const types = {
+      getTypeParser: () => (string) => string,
+    }
+    var client = new pg.Client({ types })
+    client.connect()
+    var stream = new QueryStream('SELECT * FROM generate_series(0, 10) num')
+    var query = client.query(stream)
+    var result = []
+    query.on('data', (datum) => {
+      result.push(datum)
+    })
+    query.on('end', () => {
+      const expected = new Array(11).fill(0).map((_, i) => ({
+        num: i.toString(),
+      }))
+      assert.deepEqual(result, expected)
+      client.end()
+      done()
+    })
+  })
+})

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,9 @@ class PgQueryStream extends Readable {`
`16`	`16`	`this.handleReadyForQuery = this.cursor.handleReadyForQuery.bind(this.cursor)`
`17`	`17`	`this.handleError = this.cursor.handleError.bind(this.cursor)`
`18`	`18`	`this.handleEmptyQuery = this.cursor.handleEmptyQuery.bind(this.cursor)`
	`19`	`+`
	`20`	`+ // pg client sets types via _result property`
	`21`	`+ this._result = this.cursor._result`
`19`	`22`	`}`
`20`	`23`
`21`	`24`	`submit(connection) {`