pg 8.0.2 → 8.2.1

package/README.md

@@ -5,7 +5,7 @@
 <span class="badge-npmversion"><a href="https://npmjs.org/package/pg" title="View this project on NPM"><img src="https://img.shields.io/npm/v/pg.svg" alt="NPM version" /></a></span>
 <span class="badge-npmdownloads"><a href="https://npmjs.org/package/pg" title="View this project on NPM"><img src="https://img.shields.io/npm/dm/pg.svg" alt="NPM downloads" /></a></span>
 
-Non-blocking PostgreSQL client for Node.js.  Pure JavaScript and optional native libpq bindings.
+Non-blocking PostgreSQL client for Node.js. Pure JavaScript and optional native libpq bindings.
 
 ## Install
 
@@ -14,30 +14,31 @@ $ npm install pg
 ```
 
 ---
-## :star: [Documentation](https://node-postgres.com) :star:
 
+## :star: [Documentation](https://node-postgres.com) :star:
 
 ### Features
 
-* Pure JavaScript client and native libpq bindings share _the same API_
-* Connection pooling
-* Extensible JS ↔ PostgreSQL data-type coercion
-* Supported PostgreSQL features
-  * Parameterized queries
-  * Named statements with query plan caching
-  * Async notifications with `LISTEN/NOTIFY`
-  * Bulk import & export with `COPY TO/COPY FROM`
+- Pure JavaScript client and native libpq bindings share _the same API_
+- Connection pooling
+- Extensible JS ↔ PostgreSQL data-type coercion
+- Supported PostgreSQL features
+  - Parameterized queries
+  - Named statements with query plan caching
+  - Async notifications with `LISTEN/NOTIFY`
+  - Bulk import & export with `COPY TO/COPY FROM`
 
 ### Extras
 
-node-postgres is by design pretty light on abstractions.  These are some handy modules we've been using over the years to complete the picture.
+node-postgres is by design pretty light on abstractions. These are some handy modules we've been using over the years to complete the picture.
 The entire list can be found on our [wiki](https://github.com/brianc/node-postgres/wiki/Extras).
 
 ## Support
 
-node-postgres is free software.  If you encounter a bug with the library please open an issue on the [GitHub repo](https://github.com/brianc/node-postgres). If you have questions unanswered by the documentation please open an issue pointing out how the documentation was unclear & I will do my best to make it better!
+node-postgres is free software. If you encounter a bug with the library please open an issue on the [GitHub repo](https://github.com/brianc/node-postgres). If you have questions unanswered by the documentation please open an issue pointing out how the documentation was unclear & I will do my best to make it better!
 
 When you open an issue please provide:
+
 - version of Node
 - version of Postgres
 - smallest possible snippet of code to reproduce the problem
@@ -49,10 +50,6 @@ You can also follow me [@briancarlson](https://twitter.com/briancarlson) if that
 node-postgres's continued development has been made possible in part by generous finanical support from [the community](https://github.com/brianc/node-postgres/blob/master/SPONSORS.md) and these featured sponsors:
 
 <div align="center">
-<a href="https://www.timescale.com" target="_blank">
-  <img height="80" src="https://node-postgres.com/timescale.svg" />
-</a>
-<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAABCAQAAAB0m0auAAAADElEQVR42mNkIBIAAABSAAI2VLqiAAAAAElFTkSuQmCC" />
 <a href="https://crate.io" target="_blank">
   <img height="80" src="https://node-postgres.com/crate-io.png" />
 </a>
@@ -60,19 +57,18 @@ node-postgres's continued development has been made possible in part by generous
 
 If you or your company are benefiting from node-postgres and would like to help keep the project financially sustainable [please consider supporting](https://github.com/sponsors/brianc) its development.
 
-
 ## Contributing
 
-__:heart: contributions!__
+**:heart: contributions!**
 
-I will __happily__ accept your pull request if it:
-- __has tests__
+I will **happily** accept your pull request if it:
+
+- **has tests**
 - looks reasonable
 - does not break backwards compatibility
 
 If your change involves breaking backwards compatibility please please point that out in the pull request & we can discuss & plan when and how to release it and what type of documentation or communicate it will require.
 
-
 ## Troubleshooting and FAQ
 
 The causes and solutions to common errors can be found among the [Frequently Asked Questions (FAQ)](https://github.com/brianc/node-postgres/wiki/FAQ)
@@ -81,21 +77,20 @@ The causes and solutions to common errors can be found among the [Frequently Ask
 
 Copyright (c) 2010-2020 Brian Carlson (brian.m.carlson@gmail.com)
 
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to deal
- in the Software without restriction, including without limitation the rights
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- THE SOFTWARE.
-
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

package/lib/client.js

@@ -18,9 +18,6 @@ var ConnectionParameters = require('./connection-parameters')
 var Query = require('./query')
 var defaults = require('./defaults')
 var Connection = require('./connection')
-if (process.env.PG_FAST_CONNECTION) {
-  Connection = require('./connection-fast')
-}
 
 var Client = function (config) {
   EventEmitter.call(this)
@@ -37,7 +34,7 @@ var Client = function (config) {
     configurable: true,
     enumerable: false,
     writable: true,
-    value: this.connectionParameters.password
+    value: this.connectionParameters.password,
   })
 
   this.replication = this.connectionParameters.replication
@@ -52,13 +49,15 @@ var Client = function (config) {
   this._connectionError = false
   this._queryable = true
 
-  this.connection = c.connection || new Connection({
-    stream: c.stream,
-    ssl: this.connectionParameters.ssl,
-    keepAlive: c.keepAlive || false,
-    keepAliveInitialDelayMillis: c.keepAliveInitialDelayMillis || 0,
-    encoding: this.connectionParameters.client_encoding || 'utf8'
-  })
+  this.connection =
+    c.connection ||
+    new Connection({
+      stream: c.stream,
+      ssl: this.connectionParameters.ssl,
+      keepAlive: c.keepAlive || false,
+      keepAliveInitialDelayMillis: c.keepAliveInitialDelayMillis || 0,
+      encoding: this.connectionParameters.client_encoding || 'utf8',
+    })
   this.queryQueue = []
   this.binary = c.binary || defaults.binary
   this.processID = null
@@ -127,9 +126,10 @@ Client.prototype._connect = function (callback) {
   function checkPgPass(cb) {
     return function (msg) {
       if (typeof self.password === 'function') {
-        self._Promise.resolve()
+        self._Promise
+          .resolve()
           .then(() => self.password())
-          .then(pass => {
+          .then((pass) => {
             if (pass !== undefined) {
               if (typeof pass !== 'string') {
                 con.emit('error', new TypeError('Password must be a string'))
@@ -140,7 +140,8 @@ Client.prototype._connect = function (callback) {
               self.connectionParameters.password = self.password = null
             }
             cb(msg)
-          }).catch(err => {
+          })
+          .catch((err) => {
             con.emit('error', err)
           })
       } else if (self.password !== null) {
@@ -157,22 +158,31 @@ Client.prototype._connect = function (callback) {
   }
 
   // password request handling
-  con.on('authenticationCleartextPassword', checkPgPass(function () {
-    con.password(self.password)
-  }))
+  con.on(
+    'authenticationCleartextPassword',
+    checkPgPass(function () {
+      con.password(self.password)
+    })
+  )
 
   // password request handling
-  con.on('authenticationMD5Password', checkPgPass(function (msg) {
-    con.password(utils.postgresMd5PasswordHash(self.user, self.password, msg.salt))
-  }))
+  con.on(
+    'authenticationMD5Password',
+    checkPgPass(function (msg) {
+      con.password(utils.postgresMd5PasswordHash(self.user, self.password, msg.salt))
+    })
+  )
 
   // password request handling (SASL)
   var saslSession
-  con.on('authenticationSASL', checkPgPass(function (msg) {
-    saslSession = sasl.startSession(msg.mechanisms)
+  con.on(
+    'authenticationSASL',
+    checkPgPass(function (msg) {
+      saslSession = sasl.startSession(msg.mechanisms)
 
-    con.sendSASLInitialResponseMessage(saslSession.mechanism, saslSession.response)
-  }))
+      con.sendSASLInitialResponseMessage(saslSession.mechanism, saslSession.response)
+    })
+  )
 
   // password request handling (SASL)
   con.on('authenticationSASLContinue', function (msg) {
@@ -259,9 +269,7 @@ Client.prototype._connect = function (callback) {
   })
 
   con.once('end', () => {
-    const error = this._ending
-      ? new Error('Connection terminated')
-      : new Error('Connection terminated unexpectedly')
+    const error = this._ending ? new Error('Connection terminated') : new Error('Connection terminated unexpectedly')
 
     clearTimeout(connectionTimeoutHandle)
     this._errorAllQueries(error)
@@ -367,7 +375,7 @@ Client.prototype.getStartupConf = function () {
 
   var data = {
     user: params.user,
-    database: params.database
+    database: params.database,
   }
 
   var appName = params.application_name || params.fallback_application_name
@@ -422,11 +430,11 @@ Client.prototype.escapeIdentifier = function (str) {
 // Ported from PostgreSQL 9.2.4 source code in src/interfaces/libpq/fe-exec.c
 Client.prototype.escapeLiteral = function (str) {
   var hasBackslash = false
-  var escaped = '\''
+  var escaped = "'"
 
   for (var i = 0; i < str.length; i++) {
     var c = str[i]
-    if (c === '\'') {
+    if (c === "'") {
       escaped += c + c
     } else if (c === '\\') {
       escaped += c + c
@@ -436,7 +444,7 @@ Client.prototype.escapeLiteral = function (str) {
     }
   }
 
-  escaped += '\''
+  escaped += "'"
 
   if (hasBackslash === true) {
     escaped = ' E' + escaped
@@ -488,7 +496,7 @@ Client.prototype.query = function (config, values, callback) {
     query = new Query(config, values, callback)
     if (!query.callback) {
       result = new this._Promise((resolve, reject) => {
-        query.callback = (err, res) => err ? reject(err) : resolve(res)
+        query.callback = (err, res) => (err ? reject(err) : resolve(res))
       })
     }
   }
@@ -507,7 +515,7 @@ Client.prototype.query = function (config, values, callback) {
 
       // we already returned an error,
       // just do nothing if query completes
-      query.callback = () => { }
+      query.callback = () => {}
 
       // Remove from queue
       var index = this.queryQueue.indexOf(query)
@@ -555,7 +563,7 @@ Client.prototype.end = function (cb) {
   this._ending = true
 
   // if we have never connected, then end is a noop, callback immediately
-  if (this.connection.stream.readyState === 'closed') {
+  if (!this.connection._connecting) {
     if (cb) {
       cb()
     } else {

package/lib/connection-parameters.js

@@ -22,12 +22,10 @@ var val = function (key, config, envVar) {
     envVar = process.env[envVar]
   }
 
-  return config[key] ||
-    envVar ||
-    defaults[key]
+  return config[key] || envVar || defaults[key]
 }
 
-var useSsl = function () {
+var readSSLConfigFromEnvironment = function () {
   switch (process.env.PGSSLMODE) {
     case 'disable':
       return false
@@ -36,6 +34,8 @@ var useSsl = function () {
     case 'verify-ca':
     case 'verify-full':
       return true
+    case 'no-verify':
+      return { rejectUnauthorized: false }
   }
   return defaults.ssl
 }
@@ -66,15 +66,22 @@ var ConnectionParameters = function (config) {
     configurable: true,
     enumerable: false,
     writable: true,
-    value: val('password', config)
+    value: val('password', config),
   })
 
   this.binary = val('binary', config)
-  this.ssl = typeof config.ssl === 'undefined' ? useSsl() : config.ssl
+
+  this.ssl = typeof config.ssl === 'undefined' ? readSSLConfigFromEnvironment() : config.ssl
+
+  // support passing in ssl=no-verify via connection string
+  if (this.ssl === 'no-verify') {
+    this.ssl = { rejectUnauthorized: false }
+  }
+
   this.client_encoding = val('client_encoding', config)
   this.replication = val('replication', config)
   // a domain socket begins with '/'
-  this.isDomainSocket = (!(this.host || '').indexOf('/'))
+  this.isDomainSocket = !(this.host || '').indexOf('/')
 
   this.application_name = val('application_name', config, 'PGAPPNAME')
   this.fallback_application_name = val('fallback_application_name', config, false)