Merge origin/master

Author: brianc

packages/pg-query-stream/src/index.ts

@@ -13,6 +13,7 @@ class QueryStream extends Readable implements Submittable {
   cursor: any
   _result: any
 
+  callback: Function
   handleRowDescription: Function
   handleDataRow: Function
   handlePortalSuspended: Function
@@ -26,6 +27,13 @@ class QueryStream extends Readable implements Submittable {
 
     super({ objectMode: true, autoDestroy: true, highWaterMark: batchSize || highWaterMark })
     this.cursor = new Cursor(text, values, config)
+    this.cursor
+      .on('end', (result) => {
+        this.callback && this.callback(null, result)
+      })
+      .on('error', (err) => {
+        this.callback && this.callback(err)
+      })
 
     // delegate Submittable callbacks to cursor
     this.handleRowDescription = this.cursor.handleRowDescription.bind(this.cursor)

packages/pg-query-stream/test/pool.ts

@@ -0,0 +1,17 @@
+import { Pool } from 'pg'
+import QueryStream from '../src'
+
+describe('pool', function () {
+  it('works', async function () {
+    const pool = new Pool()
+    const query = new QueryStream('SELECT * FROM generate_series(0, 10) num', [])
+    const q = pool.query(query)
+    query.on('data', (row) => {
+      // just consume the whole stream
+    })
+    await q
+    query.on('end', () => {
+      pool.end()
+    })
+  })
+})

packages/pg/Makefile

@@ -27,6 +27,7 @@ bench:
 	@find benchmark -name "*-bench.js" | $(node-command)
 
 test-unit:
+	@chmod 600 test/unit/client/pgpass.file
 	@find test/unit -name "*-tests.js" | $(node-command)
 
 test-connection:

packages/pg/lib/client.js

@@ -23,7 +23,7 @@ const queryQueueDeprecationNotice = nodeUtils.deprecate(
 const pgPassDeprecationNotice = nodeUtils.deprecate(
   () => {},
   'pgpass support is deprecated and will be removed in pg@9.0. ' +
-    'You can provide an async function as the password property to the Client/Pool constructor that returns a password instead. Within this funciton you can call the pgpass module in your own code.'
+    'You can provide an async function as the password property to the Client/Pool constructor that returns a password instead. Within this function you can call the pgpass module in your own code.'
 )
 
 const byoPromiseDeprecationNotice = nodeUtils.deprecate(
@@ -252,7 +252,7 @@ class Client extends EventEmitter {
     if (typeof this.password === 'function') {
       this._Promise
         .resolve()
-        .then(() => this.password())
+        .then(() => this.password(this.connectionParameters))
         .then((pass) => {
           if (pass !== undefined) {
             if (typeof pass !== 'string') {
@@ -612,8 +612,12 @@ class Client extends EventEmitter {
     } else if (typeof config.submit === 'function') {
       readTimeout = config.query_timeout || this.connectionParameters.query_timeout
       result = query = config
-      if (typeof values === 'function') {
-        query.callback = query.callback || values
+      if (!query.callback) {
+        if (typeof values === 'function') {
+          query.callback = values
+        } else if (callback) {
+          query.callback = callback
+        }
       }
     } else {
       readTimeout = config.query_timeout || this.connectionParameters.query_timeout

packages/pg/test/unit/client/password-callback-tests.js

@@ -0,0 +1,70 @@
+const helper = require('./test-helper')
+const assert = require('assert')
+const suite = new helper.Suite()
+const pgpass = require('pgpass')
+
+class Wait {
+  constructor() {
+    this.promise = new Promise((resolve) => {
+      this.resolve = resolve
+    })
+  }
+
+  until() {
+    return this.promise
+  }
+
+  done(time) {
+    if (time) {
+      setTimeout(this.resolve.bind(this), time)
+    } else {
+      this.resolve()
+    }
+  }
+}
+
+suite.test('password callback is called with conenction params', async function () {
+  const wait = new Wait()
+  const client = helper.client({
+    user: 'foo',
+    database: 'bar',
+    host: 'baz',
+    password: async (params) => {
+      assert.equal(params.user, 'foo')
+      assert.equal(params.database, 'bar')
+      assert.equal(params.host, 'baz')
+      wait.done(10)
+      return 'password'
+    },
+  })
+  client.connection.emit('authenticationCleartextPassword')
+  await wait.until()
+  assert.equal(client.user, 'foo')
+  assert.equal(client.database, 'bar')
+  assert.equal(client.host, 'baz')
+  assert.equal(client.connectionParameters.password, 'password')
+})
+
+suite.test('cleartext password auth does not crash with null password using pg-pass', async function () {
+  process.env.PGPASSFILE = `${__dirname}/pgpass.file`
+  // set this to undefined so pgpass will use the file
+  delete process.env.PGPASSWORD
+  const wait = new Wait()
+  const client = helper.client({
+    host: 'foo',
+    port: 5432,
+    database: 'bar',
+    user: 'baz',
+    password: (params) => {
+      return new Promise((resolve) => {
+        pgpass(params, (pass) => {
+          wait.done(10)
+          resolve(pass)
+        })
+      })
+    },
+  })
+  client.connection.emit('authenticationCleartextPassword')
+  await wait.until()
+  assert.equal(client.password, 'quz')
+})

packages/pg/test/unit/client/test-helper.js

@@ -3,15 +3,15 @@ const helper = require('../test-helper')
 const Connection = require('../../../lib/connection')
 const { Client } = helper
 
-const makeClient = function () {
+const makeClient = function (config) {
   const connection = new Connection({ stream: 'no' })
   connection.startup = function () {}
   connection.connect = function () {}
   connection.query = function (text) {
     this.queries.push(text)
   }
   connection.queries = []
-  const client = new Client({ connection: connection })
+  const client = new Client({ connection: connection, ...config })
   client.connect()
   client.connection.emit('connect')
   return client