pg 8.0.0 → 8.1.0

package/lib/connection.js

@@ -35,7 +35,7 @@ var Connection = function (config) {
   this._emitMessage = false
   this._reader = new Reader({
     headerSize: 1,
-    lengthPadding: -4
+    lengthPadding: -4,
   })
   var self = this
   this.on('newListener', function (eventName) {
@@ -50,13 +50,10 @@ util.inherits(Connection, EventEmitter)
 Connection.prototype.connect = function (port, host) {
   var self = this
 
-  if (this.stream.readyState === 'closed') {
-    this.stream.connect(port, host)
-  } else if (this.stream.readyState === 'open') {
-    this.emit('connect')
-  }
+  this._connecting = true
+  this.stream.connect(port, host)
 
-  this.stream.on('connect', function () {
+  this.stream.once('connect', function () {
     if (self._keepAlive) {
       self.stream.setKeepAlive(true, self._keepAliveInitialDelayMillis)
     }
@@ -88,14 +85,18 @@ Connection.prototype.connect = function (port, host) {
       case 'N': // Server does not support SSL connections
         self.stream.end()
         return self.emit('error', new Error('The server does not support SSL connections'))
-      default: // Any other response byte, including 'E' (ErrorResponse) indicating a server error
+      default:
+        // Any other response byte, including 'E' (ErrorResponse) indicating a server error
         self.stream.end()
         return self.emit('error', new Error('There was an error establishing an SSL connection'))
     }
     var tls = require('tls')
-    const options = Object.assign({
-      socket: self.stream
-    }, self.ssl)
+    const options = Object.assign(
+      {
+        socket: self.stream,
+      },
+      self.ssl
+    )
     if (net.isIP(host) === 0) {
       options.servername = host
     }
@@ -127,23 +128,16 @@ Connection.prototype.attachListeners = function (stream) {
 }
 
 Connection.prototype.requestSsl = function () {
-  var bodyBuffer = this.writer
-    .addInt16(0x04D2)
-    .addInt16(0x162F).flush()
+  var bodyBuffer = this.writer.addInt16(0x04d2).addInt16(0x162f).flush()
 
   var length = bodyBuffer.length + 4
 
-  var buffer = new Writer()
-    .addInt32(length)
-    .add(bodyBuffer)
-    .join()
+  var buffer = new Writer().addInt32(length).add(bodyBuffer).join()
   this.stream.write(buffer)
 }
 
 Connection.prototype.startup = function (config) {
-  var writer = this.writer
-    .addInt16(3)
-    .addInt16(0)
+  var writer = this.writer.addInt16(3).addInt16(0)
 
   Object.keys(config).forEach(function (key) {
     var val = config[key]
@@ -157,27 +151,16 @@ Connection.prototype.startup = function (config) {
 
   var length = bodyBuffer.length + 4
 
-  var buffer = new Writer()
-    .addInt32(length)
-    .add(bodyBuffer)
-    .join()
+  var buffer = new Writer().addInt32(length).add(bodyBuffer).join()
   this.stream.write(buffer)
 }
 
 Connection.prototype.cancel = function (processID, secretKey) {
-  var bodyBuffer = this.writer
-    .addInt16(1234)
-    .addInt16(5678)
-    .addInt32(processID)
-    .addInt32(secretKey)
-    .flush()
+  var bodyBuffer = this.writer.addInt16(1234).addInt16(5678).addInt32(processID).addInt32(secretKey).flush()
 
   var length = bodyBuffer.length + 4
 
-  var buffer = new Writer()
-    .addInt32(length)
-    .add(bodyBuffer)
-    .join()
+  var buffer = new Writer().addInt32(length).add(bodyBuffer).join()
   this.stream.write(buffer)
 }
 
@@ -188,18 +171,14 @@ Connection.prototype.password = function (password) {
 
 Connection.prototype.sendSASLInitialResponseMessage = function (mechanism, initialResponse) {
   // 0x70 = 'p'
-  this.writer
-    .addCString(mechanism)
-    .addInt32(Buffer.byteLength(initialResponse))
-    .addString(initialResponse)
+  this.writer.addCString(mechanism).addInt32(Buffer.byteLength(initialResponse)).addString(initialResponse)
 
   this._send(0x70)
 }
 
 Connection.prototype.sendSCRAMClientFinalMessage = function (additionalData) {
   // 0x70 = 'p'
-  this.writer
-    .addString(additionalData)
+  this.writer.addString(additionalData)
 
   this._send(0x70)
 }
@@ -263,13 +242,17 @@ Connection.prototype.bind = function (config, more) {
   var values = config.values || []
   var len = values.length
   var useBinary = false
-  for (var j = 0; j < len; j++) { useBinary |= values[j] instanceof Buffer }
-  var buffer = this.writer
-    .addCString(config.portal)
-    .addCString(config.statement)
-  if (!useBinary) { buffer.addInt16(0) } else {
+  for (var j = 0; j < len; j++) {
+    useBinary |= values[j] instanceof Buffer
+  }
+  var buffer = this.writer.addCString(config.portal).addCString(config.statement)
+  if (!useBinary) {
+    buffer.addInt16(0)
+  } else {
     buffer.addInt16(len)
-    for (j = 0; j < len; j++) { buffer.addInt16(values[j] instanceof Buffer) }
+    for (j = 0; j < len; j++) {
+      buffer.addInt16(values[j] instanceof Buffer)
+    }
   }
   buffer.addInt16(len)
   for (var i = 0; i < len; i++) {
@@ -301,9 +284,7 @@ Connection.prototype.execute = function (config, more) {
   config = config || {}
   config.portal = config.portal || ''
   config.rows = config.rows || ''
-  this.writer
-    .addCString(config.portal)
-    .addInt32(config.rows)
+  this.writer.addCString(config.portal).addInt32(config.rows)
 
   // 0x45 = 'E'
   this._send(0x45, more)
@@ -332,7 +313,7 @@ Connection.prototype.end = function () {
   // 0x58 = 'X'
   this.writer.add(emptyBuffer)
   this._ending = true
-  if (!this.stream.writable) {
+  if (!this._connecting || !this.stream.writable) {
     this.stream.end()
     return
   }

package/lib/defaults.js

@@ -70,7 +70,7 @@ module.exports = {
 
   keepalives: 1,
 
-  keepalives_idle: 0
+  keepalives_idle: 0,
 }
 
 var pgTypes = require('pg-types')

package/lib/index.js

@@ -14,7 +14,7 @@ var Pool = require('pg-pool')
 
 const poolFactory = (Client) => {
   return class BoundPool extends Pool {
-    constructor (options) {
+    constructor(options) {
       super(options, Client)
     }
   }
@@ -54,10 +54,10 @@ if (typeof process.env.NODE_PG_FORCE_NATIVE !== 'undefined') {
 
       // overwrite module.exports.native so that getter is never called again
       Object.defineProperty(module.exports, 'native', {
-        value: native
+        value: native,
       })
 
       return native
-    }
+    },
   })
 }

package/lib/native/client.js

@@ -22,7 +22,7 @@ assert(semver.gte(Native.version, pkg.minNativeVersion), msg)
 
 var NativeQuery = require('./query')
 
-var Client = module.exports = function (config) {
+var Client = (module.exports = function (config) {
   EventEmitter.call(this)
   config = config || {}
 
@@ -30,7 +30,7 @@ var Client = module.exports = function (config) {
   this._types = new TypeOverrides(config.types)
 
   this.native = new Native({
-    types: this._types
+    types: this._types,
   })
 
   this._queryQueue = []
@@ -41,7 +41,7 @@ var Client = module.exports = function (config) {
 
   // keep these on the object for legacy reasons
   // for the time being. TODO: deprecate all this jazz
-  var cp = this.connectionParameters = new ConnectionParameters(config)
+  var cp = (this.connectionParameters = new ConnectionParameters(config))
   this.user = cp.user
 
   // "hiding" the password so it doesn't show up in stack traces
@@ -50,7 +50,7 @@ var Client = module.exports = function (config) {
     configurable: true,
     enumerable: false,
     writable: true,
-    value: cp.password
+    value: cp.password,
   })
   this.database = cp.database
   this.host = cp.host
@@ -58,7 +58,7 @@ var Client = module.exports = function (config) {
 
   // a hash to hold named queries
   this.namedQueries = {}
-}
+})
 
 Client.Query = NativeQuery
 
@@ -115,7 +115,7 @@ Client.prototype._connect = function (cb) {
       self.native.on('notification', function (msg) {
         self.emit('notification', {
           channel: msg.relname,
-          payload: msg.extra
+          payload: msg.extra,
         })
       })
 
@@ -180,7 +180,7 @@ Client.prototype.query = function (config, values, callback) {
         resolveOut = resolve
         rejectOut = reject
       })
-      query.callback = (err, res) => err ? rejectOut(err) : resolveOut(res)
+      query.callback = (err, res) => (err ? rejectOut(err) : resolveOut(res))
     }
   }
 
@@ -248,7 +248,7 @@ Client.prototype.end = function (cb) {
   var result
   if (!cb) {
     result = new this._Promise(function (resolve, reject) {
-      cb = (err) => err ? reject(err) : resolve()
+      cb = (err) => (err ? reject(err) : resolve())
     })
   }
   this.native.end(function () {

package/lib/native/query.js

@@ -11,7 +11,7 @@ var EventEmitter = require('events').EventEmitter
 var util = require('util')
 var utils = require('../utils')
 
-var NativeQuery = module.exports = function (config, values, callback) {
+var NativeQuery = (module.exports = function (config, values, callback) {
   EventEmitter.call(this)
   config = utils.normalizeQueryConfig(config, values, callback)
   this.text = config.text
@@ -27,27 +27,30 @@ var NativeQuery = module.exports = function (config, values, callback) {
   // this has almost no meaning because libpq
   // reads all rows into memory befor returning any
   this._emitRowEvents = false
-  this.on('newListener', function (event) {
-    if (event === 'row') this._emitRowEvents = true
-  }.bind(this))
-}
+  this.on(
+    'newListener',
+    function (event) {
+      if (event === 'row') this._emitRowEvents = true
+    }.bind(this)
+  )
+})
 
 util.inherits(NativeQuery, EventEmitter)
 
 var errorFieldMap = {
   /* eslint-disable quote-props */
-  'sqlState': 'code',
-  'statementPosition': 'position',
-  'messagePrimary': 'message',
-  'context': 'where',
-  'schemaName': 'schema',
-  'tableName': 'table',
-  'columnName': 'column',
-  'dataTypeName': 'dataType',
-  'constraintName': 'constraint',
-  'sourceFile': 'file',
-  'sourceLine': 'line',
-  'sourceFunction': 'routine'
+  sqlState: 'code',
+  statementPosition: 'position',
+  messagePrimary: 'message',
+  context: 'where',
+  schemaName: 'schema',
+  tableName: 'table',
+  columnName: 'column',
+  dataTypeName: 'dataType',
+  constraintName: 'constraint',
+  sourceFile: 'file',
+  sourceLine: 'line',
+  sourceFunction: 'routine',
 }
 
 NativeQuery.prototype.handleError = function (err) {
@@ -77,10 +80,12 @@ NativeQuery.prototype.catch = function (callback) {
 
 NativeQuery.prototype._getPromise = function () {
   if (this._promise) return this._promise
-  this._promise = new Promise(function (resolve, reject) {
-    this._once('end', resolve)
-    this._once('error', reject)
-  }.bind(this))
+  this._promise = new Promise(
+    function (resolve, reject) {
+      this._once('end', resolve)
+      this._once('error', reject)
+    }.bind(this)
+  )
   return this._promise
 }
 
@@ -105,7 +110,7 @@ NativeQuery.prototype.submit = function (client) {
     if (self._emitRowEvents) {
       if (results.length > 1) {
         rows.forEach((rowOfRows, i) => {
-          rowOfRows.forEach(row => {
+          rowOfRows.forEach((row) => {
             self.emit('row', row, results[i])
           })
         })

package/lib/query.js

@@ -42,14 +42,22 @@ class Query extends EventEmitter {
 
   requiresPreparation() {
     // named queries must always be prepared
-    if (this.name) { return true }
+    if (this.name) {
+      return true
+    }
     // always prepare if there are max number of rows expected per
     // portal execution
-    if (this.rows) { return true }
+    if (this.rows) {
+      return true
+    }
     // don't prepare empty text queries
-    if (!this.text) { return false }
+    if (!this.text) {
+      return false
+    }
     // prepare if there are values
-    if (!this.values) { return false }
+    if (!this.values) {
+      return false
+    }
     return this.values.length > 0
   }
 
@@ -168,10 +176,13 @@ class Query extends EventEmitter {
   }
 
   _getRows(connection, rows) {
-    connection.execute({
-      portal: this.portal,
-      rows: rows
-    }, true)
+    connection.execute(
+      {
+        portal: this.portal,
+        rows: rows,
+      },
+      true
+    )
     connection.flush()
   }
 
@@ -181,11 +192,14 @@ class Query extends EventEmitter {
     this.isPreparedStatement = true
     // TODO refactor this poor encapsulation
     if (!this.hasBeenParsed(connection)) {
-      connection.parse({
-        text: this.text,
-        name: this.name,
-        types: this.types
-      }, true)
+      connection.parse(
+        {
+          text: this.text,
+          name: this.name,
+          types: this.types,
+        },
+        true
+      )
     }
 
     if (this.values) {
@@ -198,17 +212,23 @@ class Query extends EventEmitter {
     }
 
     // http://developer.postgresql.org/pgdocs/postgres/protocol-flow.html#PROTOCOL-FLOW-EXT-QUERY
-    connection.bind({
-      portal: this.portal,
-      statement: this.name,
-      values: this.values,
-      binary: this.binary
-    }, true)
-
-    connection.describe({
-      type: 'P',
-      name: this.portal || ''
-    }, true)
+    connection.bind(
+      {
+        portal: this.portal,
+        statement: this.name,
+        values: this.values,
+        binary: this.binary,
+      },
+      true
+    )
+
+    connection.describe(
+      {
+        type: 'P',
+        name: this.portal || '',
+      },
+      true
+    )
 
     this._getRows(connection, this.rows)
   }

package/lib/sasl.js

@@ -1,7 +1,7 @@
 'use strict'
 const crypto = require('crypto')
 
-function startSession (mechanisms) {
+function startSession(mechanisms) {
   if (mechanisms.indexOf('SCRAM-SHA-256') === -1) {
     throw new Error('SASL: Only mechanism SCRAM-SHA-256 is currently supported')
   }
@@ -12,11 +12,11 @@ function startSession (mechanisms) {
     mechanism: 'SCRAM-SHA-256',
     clientNonce,
     response: 'n,,n=*,r=' + clientNonce,
-    message: 'SASLInitialResponse'
+    message: 'SASLInitialResponse',
   }
 }
 
-function continueSession (session, password, serverData) {
+function continueSession(session, password, serverData) {
   if (session.message !== 'SASLInitialResponse') {
     throw new Error('SASL: Last message was not SASLInitialResponse')
   }
@@ -53,42 +53,46 @@ function continueSession (session, password, serverData) {
   session.response = clientFinalMessageWithoutProof + ',p=' + clientProof
 }
 
-function finalizeSession (session, serverData) {
+function finalizeSession(session, serverData) {
   if (session.message !== 'SASLResponse') {
     throw new Error('SASL: Last message was not SASLResponse')
   }
 
   var serverSignature
 
-  String(serverData).split(',').forEach(function (part) {
-    switch (part[0]) {
-      case 'v':
-        serverSignature = part.substr(2)
-        break
-    }
-  })
+  String(serverData)
+    .split(',')
+    .forEach(function (part) {
+      switch (part[0]) {
+        case 'v':
+          serverSignature = part.substr(2)
+          break
+      }
+    })
 
   if (serverSignature !== session.serverSignature) {
     throw new Error('SASL: SCRAM-SERVER-FINAL-MESSAGE: server signature does not match')
   }
 }
 
-function extractVariablesFromFirstServerMessage (data) {
+function extractVariablesFromFirstServerMessage(data) {
   var nonce, salt, iteration
 
-  String(data).split(',').forEach(function (part) {
-    switch (part[0]) {
-      case 'r':
-        nonce = part.substr(2)
-        break
-      case 's':
-        salt = part.substr(2)
-        break
-      case 'i':
-        iteration = parseInt(part.substr(2), 10)
-        break
-    }
-  })
+  String(data)
+    .split(',')
+    .forEach(function (part) {
+      switch (part[0]) {
+        case 'r':
+          nonce = part.substr(2)
+          break
+        case 's':
+          salt = part.substr(2)
+          break
+        case 'i':
+          iteration = parseInt(part.substr(2), 10)
+          break
+      }
+    })
 
   if (!nonce) {
     throw new Error('SASL: SCRAM-SERVER-FIRST-MESSAGE: nonce missing')
@@ -105,11 +109,11 @@ function extractVariablesFromFirstServerMessage (data) {
   return {
     nonce,
     salt,
-    iteration
+    iteration,
   }
 }
 
-function xorBuffers (a, b) {
+function xorBuffers(a, b) {
   if (!Buffer.isBuffer(a)) a = Buffer.from(a)
   if (!Buffer.isBuffer(b)) b = Buffer.from(b)
   var res = []
@@ -125,11 +129,11 @@ function xorBuffers (a, b) {
   return Buffer.from(res)
 }
 
-function createHMAC (key, msg) {
+function createHMAC(key, msg) {
   return crypto.createHmac('sha256', key).update(msg).digest()
 }
 
-function Hi (password, saltBytes, iterations) {
+function Hi(password, saltBytes, iterations) {
   var ui1 = createHMAC(password, Buffer.concat([saltBytes, Buffer.from([0, 0, 0, 1])]))
   var ui = ui1
   for (var i = 0; i < iterations - 1; i++) {
@@ -143,5 +147,5 @@ function Hi (password, saltBytes, iterations) {
 module.exports = {
   startSession,
   continueSession,
-  finalizeSession
+  finalizeSession,
 }

package/lib/type-overrides.js

@@ -9,7 +9,7 @@
 
 var types = require('pg-types')
 
-function TypeOverrides (userTypes) {
+function TypeOverrides(userTypes) {
   this._types = userTypes || types
   this.text = {}
   this.binary = {}
@@ -17,9 +17,12 @@ function TypeOverrides (userTypes) {
 
 TypeOverrides.prototype.getOverrides = function (format) {
   switch (format) {
-    case 'text': return this.text
-    case 'binary': return this.binary
-    default: return {}
+    case 'text':
+      return this.text
+    case 'binary':
+      return this.binary
+    default:
+      return {}
   }
 }