pg 7.18.2 → 8.0.3

package/lib/connection.js

@@ -14,8 +14,6 @@ var util = require('util')
 var Writer = require('buffer-writer')
 var Reader = require('packet-reader')
 
-var warnDeprecation = require('./compat/warn-deprecation')
-
 var TEXT_MODE = 0
 var BINARY_MODE = 1
 var Connection = function (config) {
@@ -37,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) {
@@ -52,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)
     }
@@ -90,26 +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 = {
-      socket: self.stream,
-      checkServerIdentity: self.ssl.checkServerIdentity || tls.checkServerIdentity,
-      rejectUnauthorized: self.ssl.rejectUnauthorized,
-      ca: self.ssl.ca,
-      pfx: self.ssl.pfx,
-      key: self.ssl.key,
-      passphrase: self.ssl.passphrase,
-      cert: self.ssl.cert,
-      secureOptions: self.ssl.secureOptions,
-      NPNProtocols: self.ssl.NPNProtocols
-    }
-    if (typeof self.ssl.rejectUnauthorized !== 'boolean') {
-      warnDeprecation('Implicit disabling of certificate verification is deprecated and will be removed in pg 8. Specify `rejectUnauthorized: true` to require a valid CA or `rejectUnauthorized: false` to explicitly opt out of MITM protection.', 'PG-SSL-VERIFY')
-    }
+    const options = Object.assign(
+      {
+        socket: self.stream,
+      },
+      self.ssl
+    )
     if (net.isIP(host) === 0) {
       options.servername = host
     }
@@ -141,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]
@@ -171,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)
 }
 
@@ -202,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)
 }
@@ -277,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++) {
@@ -315,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)
@@ -346,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
   }
@@ -602,7 +569,7 @@ Connection.prototype._readValue = function (buffer) {
 }
 
 // parses error
-Connection.prototype.parseE = function (buffer, length) {
+Connection.prototype.parseE = function (buffer, length, isNotice) {
   var fields = {}
   var fieldType = this.readString(buffer, 1)
   while (fieldType !== '\0') {
@@ -611,10 +578,10 @@ Connection.prototype.parseE = function (buffer, length) {
   }
 
   // the msg is an Error instance
-  var msg = new Error(fields.M)
+  var msg = isNotice ? { message: fields.M } : new Error(fields.M)
 
   // for compatibility with Message
-  msg.name = 'error'
+  msg.name = isNotice ? 'notice' : 'error'
   msg.length = length
 
   msg.severity = fields.S
@@ -638,7 +605,7 @@ Connection.prototype.parseE = function (buffer, length) {
 
 // same thing, different name
 Connection.prototype.parseN = function (buffer, length) {
-  var msg = this.parseE(buffer, length)
+  var msg = this.parseE(buffer, length, true)
   msg.name = 'notice'
   return msg
 }

package/lib/defaults.js

@@ -15,7 +15,7 @@ module.exports = {
   user: process.platform === 'win32' ? process.env.USERNAME : process.env.USER,
 
   // name of database to connect
-  database: process.platform === 'win32' ? process.env.USERNAME : process.env.USER,
+  database: undefined,
 
   // database user's password
   password: null,
@@ -70,7 +70,7 @@ module.exports = {
 
   keepalives: 1,
 
-  keepalives_idle: 0
+  keepalives_idle: 0,
 }
 
 var pgTypes = require('pg-types')

package/lib/index.js

@@ -7,25 +7,17 @@
  * README.md file in the root directory of this source tree.
  */
 
-var util = require('util')
 var Client = require('./client')
 var defaults = require('./defaults')
 var Connection = require('./connection')
 var Pool = require('pg-pool')
-const checkConstructor = require('./compat/check-constructor')
 
 const poolFactory = (Client) => {
-  var BoundPool = function (options) {
-    // eslint-disable-next-line no-eval
-    checkConstructor('pg.Pool', 'PG-POOL-NEW', () => eval('new.target'))
-
-    var config = Object.assign({ Client: Client }, options)
-    return new Pool(config)
+  return class BoundPool extends Pool {
+    constructor(options) {
+      super(options, Client)
+    }
   }
-
-  util.inherits(BoundPool, Pool)
-
-  return BoundPool
 }
 
 var PG = function (clientConstructor) {
@@ -44,20 +36,28 @@ if (typeof process.env.NODE_PG_FORCE_NATIVE !== 'undefined') {
   module.exports = new PG(Client)
 
   // lazy require native module...the native module may not have installed
-  module.exports.__defineGetter__('native', function () {
-    delete module.exports.native
-    var native = null
-    try {
-      native = new PG(require('./native'))
-    } catch (err) {
-      if (err.code !== 'MODULE_NOT_FOUND') {
-        throw err
+  Object.defineProperty(module.exports, 'native', {
+    configurable: true,
+    enumerable: false,
+    get() {
+      var native = null
+      try {
+        native = new PG(require('./native'))
+      } catch (err) {
+        if (err.code !== 'MODULE_NOT_FOUND') {
+          throw err
+        }
+        /* eslint-disable no-console */
+        console.error(err.message)
+        /* eslint-enable no-console */
       }
-      /* eslint-disable no-console */
-      console.error(err.message)
-      /* eslint-enable no-console */
-    }
-    module.exports.native = native
-    return native
+
+      // overwrite module.exports.native so that getter is never called again
+      Object.defineProperty(module.exports, '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,16 +41,24 @@ 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
-  this.password = cp.password
+
+  // "hiding" the password so it doesn't show up in stack traces
+  // or if the client is console.logged
+  Object.defineProperty(this, 'password', {
+    configurable: true,
+    enumerable: false,
+    writable: true,
+    value: cp.password,
+  })
   this.database = cp.database
   this.host = cp.host
   this.port = cp.port
 
   // a hash to hold named queries
   this.namedQueries = {}
-}
+})
 
 Client.Query = NativeQuery
 
@@ -107,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,
         })
       })
 
@@ -172,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))
     }
   }
 
@@ -240,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])
           })
         })