pg 7.9.0 → 7.12.1

package/.eslintrc

@@ -1,6 +1,19 @@
 {
-  "extends": "standard",
+  "plugins": [
+    "node"
+  ],
+  "extends": [
+    "standard",
+    "eslint:recommended",
+    "plugin:node/recommended"
+  ],
+  "parserOptions": {
+    "ecmaVersion": 2017
+  },
+  "env": {
+    "node": true,
+    "es6": true
+  },
   "rules": {
-    "no-new-func": "off"
   }
 }

package/CHANGELOG.md

@@ -4,6 +4,18 @@ For richer information consult the commit log on github with referenced pull req
 
 We do not include break-fix version release in this file.
 
+### 7.12.0
+
+- Add support for [async password lookup](https://github.com/brianc/node-postgres/pull/1926).
+
+### 7.11.0
+
+- Add support for [connection_timeout](https://github.com/brianc/node-postgres/pull/1847/files#diff-5391bde944956870128be1136e7bc176R63) and [keepalives_idle](https://github.com/brianc/node-postgres/pull/1847).
+
+### 7.10.0
+
+- Add support for [per-query types](https://github.com/brianc/node-postgres/pull/1825).
+
 ### 7.9.0
 
 - Add support for [sasl/scram authentication](https://github.com/brianc/node-postgres/pull/1835).

package/Makefile

@@ -62,4 +62,6 @@ test-pool:
 
 lint:
 	@echo "***Starting lint***"
-	node_modules/.bin/eslint lib
+	node -e "process.exit(Number(process.versions.node.split('.')[0]) < 8 ? 0 : 1)" \
+	  && echo "***Skipping lint (node version too old)***" \
+	  || node_modules/.bin/eslint lib

package/SPONSORS.md

@@ -1,10 +1,13 @@
 node-postgres is made possible by the helpful contributors from the community well as the following generous supporters on [Patreon](https://www.patreon.com/node_postgres).
 
 # Leaders
+
 - [MadKudu](https://www.madkudu.com) - [@madkudu](https://twitter.com/madkudu)
 - [Third Iron](https://thirdiron.com/)
+- [Timescale](https://timescale.com)
 
 # Supporters
+
 - John Fawcett
 - Lalit Kapoor [@lalitkapoor](https://twitter.com/lalitkapoor)
 - Paul Frazee [@pfrazee](https://twitter.com/pfrazee)

package/lib/client.js

@@ -44,6 +44,7 @@ var Client = function (config) {
     stream: c.stream,
     ssl: this.connectionParameters.ssl,
     keepAlive: c.keepAlive || false,
+    keepAliveInitialDelayMillis: c.keepAliveInitialDelayMillis || 0,
     encoding: this.connectionParameters.client_encoding || 'utf8'
   })
   this.queryQueue = []
@@ -51,6 +52,7 @@ var Client = function (config) {
   this.processID = null
   this.secretKey = null
   this.ssl = this.connectionParameters.ssl || false
+  this._connectionTimeoutMillis = c.connectionTimeoutMillis || 0
 }
 
 util.inherits(Client, EventEmitter)
@@ -83,6 +85,14 @@ Client.prototype._connect = function (callback) {
   }
   this._connecting = true
 
+  var connectionTimeoutHandle
+  if (this._connectionTimeoutMillis > 0) {
+    connectionTimeoutHandle = setTimeout(() => {
+      con._ending = true
+      con.stream.destroy(new Error('timeout expired'))
+    }, this._connectionTimeoutMillis)
+  }
+
   if (this.host && this.host.indexOf('/') === 0) {
     con.connect(this.host + '/.s.PGSQL.' + this.port)
   } else {
@@ -104,7 +114,24 @@ Client.prototype._connect = function (callback) {
 
   function checkPgPass (cb) {
     return function (msg) {
-      if (self.password !== null) {
+      if (typeof self.password === 'function') {
+        self._Promise.resolve()
+          .then(() => self.password())
+          .then(pass => {
+            if (pass !== undefined) {
+              if (typeof pass !== 'string') {
+                con.emit('error', new TypeError('Password must be a string'))
+                return
+              }
+              self.connectionParameters.password = self.password = pass
+            } else {
+              self.connectionParameters.password = self.password = null
+            }
+            cb(msg)
+          }).catch(err => {
+            con.emit('error', err)
+          })
+      } else if (self.password !== null) {
         cb(msg)
       } else {
         pgPass(self.connectionParameters, function (pass) {
@@ -159,6 +186,7 @@ Client.prototype._connect = function (callback) {
       return
     }
     this._connectionError = true
+    clearTimeout(connectionTimeoutHandle)
     if (callback) {
       return callback(err)
     }
@@ -196,6 +224,7 @@ Client.prototype._connect = function (callback) {
     con.removeListener('errorMessage', connectingErrorHandler)
     con.on('error', connectedErrorHandler)
     con.on('errorMessage', connectedErrorMessageHandler)
+    clearTimeout(connectionTimeoutHandle)
 
     // process possible callback argument to Client#connect
     if (callback) {
@@ -280,11 +309,13 @@ Client.prototype._attachListeners = function (con) {
   })
 
   // delegate portalSuspended to active query
+  // eslint-disable-next-line no-unused-vars
   con.on('portalSuspended', function (msg) {
     self.activeQuery.handlePortalSuspended(con)
   })
 
-  // deletagate emptyQuery to active query
+  // delegate emptyQuery to active query
+  // eslint-disable-next-line no-unused-vars
   con.on('emptyQuery', function (msg) {
     self.activeQuery.handleEmptyQuery(con)
   })
@@ -297,12 +328,14 @@ Client.prototype._attachListeners = function (con) {
   // if a prepared statement has a name and properly parses
   // we track that its already been executed so we don't parse
   // it again on the same client
+  // eslint-disable-next-line no-unused-vars
   con.on('parseComplete', function (msg) {
     if (self.activeQuery.name) {
       con.parsedStatements[self.activeQuery.name] = self.activeQuery.text
     }
   })
 
+  // eslint-disable-next-line no-unused-vars
   con.on('copyInResponse', function (msg) {
     self.activeQuery.handleCopyInResponse(self.connection)
   })
@@ -478,8 +511,9 @@ Client.prototype.query = function (config, values, callback) {
   if (this.binary && !query.binary) {
     query.binary = true
   }
-  if (query._result) {
-    query._result._getTypeParser = this._types.getTypeParser.bind(this._types)
+
+  if (query._result && !query._result._types) {
+    query._result._types = this._types
   }
 
   if (!this._queryable) {

package/lib/connection-parameters.js

@@ -15,11 +15,11 @@ var parse = require('pg-connection-string').parse // parses a connection string
 
 var val = function (key, config, envVar) {
   if (envVar === undefined) {
-    envVar = process.env[ 'PG' + key.toUpperCase() ]
+    envVar = process.env['PG' + key.toUpperCase()]
   } else if (envVar === false) {
     // do nothing ... use false
   } else {
-    envVar = process.env[ envVar ]
+    envVar = process.env[envVar]
   }
 
   return config[key] ||
@@ -66,6 +66,22 @@ var ConnectionParameters = function (config) {
   this.fallback_application_name = val('fallback_application_name', config, false)
   this.statement_timeout = val('statement_timeout', config, false)
   this.query_timeout = val('query_timeout', config, false)
+
+  if (config.connectionTimeoutMillis === undefined) {
+    this.connect_timeout = process.env.PGCONNECT_TIMEOUT || 0
+  } else {
+    this.connect_timeout = Math.floor(config.connectionTimeoutMillis / 1000)
+  }
+
+  if (config.keepAlive === false) {
+    this.keepalives = 0
+  } else if (config.keepAlive === true) {
+    this.keepalives = 1
+  }
+
+  if (typeof config.keepAliveInitialDelayMillis === 'number') {
+    this.keepalives_idle = Math.floor(config.keepAliveInitialDelayMillis / 1000)
+  }
 }
 
 // Convert arg to a string, surround in single quotes, and escape single quotes and backslashes
@@ -75,7 +91,7 @@ var quoteParamValue = function (value) {
 
 var add = function (params, config, paramName) {
   var value = config[paramName]
-  if (value) {
+  if (value !== undefined && value !== null) {
     params.push(paramName + '=' + quoteParamValue(value))
   }
 }
@@ -87,8 +103,9 @@ ConnectionParameters.prototype.getLibpqConnectionString = function (cb) {
   add(params, this, 'port')
   add(params, this, 'application_name')
   add(params, this, 'fallback_application_name')
+  add(params, this, 'connect_timeout')
 
-  var ssl = typeof this.ssl === 'object' ? this.ssl : { sslmode: this.ssl }
+  var ssl = typeof this.ssl === 'object' ? this.ssl : this.ssl ? { sslmode: this.ssl } : {}
   add(params, ssl, 'sslmode')
   add(params, ssl, 'sslca')
   add(params, ssl, 'sslkey')

package/lib/connection.js

@@ -21,6 +21,7 @@ var Connection = function (config) {
   config = config || {}
   this.stream = config.stream || new net.Socket()
   this._keepAlive = config.keepAlive
+  this._keepAliveInitialDelayMillis = config.keepAliveInitialDelayMillis
   this.lastBuffer = false
   this.lastOffset = 0
   this.buffer = null
@@ -47,17 +48,17 @@ var Connection = function (config) {
 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')
   }
 
-  var self = this
-
   this.stream.on('connect', function () {
     if (self._keepAlive) {
-      self.stream.setKeepAlive(true)
+      self.stream.setKeepAlive(true, self._keepAliveInitialDelayMillis)
     }
     self.emit('connect')
   })
@@ -236,9 +237,11 @@ Connection.prototype.parse = function (query, more) {
   // normalize missing query names to allow for null
   query.name = query.name || ''
   if (query.name.length > 63) {
+    /* eslint-disable no-console */
     console.error('Warning! Postgres only supports 63 characters for query names.')
-    console.error('You supplied', query.name, '(', query.name.length, ')')
+    console.error('You supplied %s (%s)', query.name, query.name.length)
     console.error('This can cause conflicts and silent errors executing queries')
+    /* eslint-enable no-console */
   }
   // normalize null type array
   query.types = query.types || []
@@ -601,7 +604,7 @@ Connection.prototype.parseE = function (buffer, length) {
     msg = new Error(fields.M)
     for (item in input) {
       // copy input properties to the error
-      if (input.hasOwnProperty(item)) {
+      if (Object.prototype.hasOwnProperty.call(input, item)) {
         msg[item] = input[item]
       }
     }

package/lib/defaults.js

@@ -50,15 +50,23 @@ module.exports = {
   ssl: false,
 
   application_name: undefined,
+
   fallback_application_name: undefined,
 
   parseInputDatesAsUTC: false,
 
-  // max milliseconds any query using this connection will execute for before timing out in error. false=unlimited
+  // max milliseconds any query using this connection will execute for before timing out in error.
+  // false=unlimited
   statement_timeout: false,
 
-  // max miliseconds to wait for query to complete (client side)
-  query_timeout: false
+  // max milliseconds to wait for query to complete (client side)
+  query_timeout: false,
+
+  connect_timeout: 0,
+
+  keepalives: 1,
+
+  keepalives_idle: 0
 }
 
 var pgTypes = require('pg-types')

package/lib/index.js

@@ -49,7 +49,9 @@ if (typeof process.env.NODE_PG_FORCE_NATIVE !== 'undefined') {
       if (err.code !== 'MODULE_NOT_FOUND') {
         throw err
       }
+      /* eslint-disable no-console */
       console.error(err.message)
+      /* eslint-enable no-console */
     }
     module.exports.native = native
     return native

package/lib/native/client.js

@@ -7,6 +7,7 @@
  * README.md file in the root directory of this source tree.
  */
 
+// eslint-disable-next-line
 var Native = require('pg-native')
 var TypeOverrides = require('../type-overrides')
 var semver = require('semver')

package/lib/native/query.js

@@ -35,6 +35,7 @@ var NativeQuery = module.exports = function (config, values, callback) {
 util.inherits(NativeQuery, EventEmitter)
 
 var errorFieldMap = {
+  /* eslint-disable quote-props */
   'sqlState': 'code',
   'statementPosition': 'position',
   'messagePrimary': 'message',
@@ -130,9 +131,11 @@ NativeQuery.prototype.submit = function (client) {
   // named query
   if (this.name) {
     if (this.name.length > 63) {
+      /* eslint-disable no-console */
       console.error('Warning! Postgres only supports 63 characters for query names.')
-      console.error('You supplied', this.name, '(', this.name.length, ')')
+      console.error('You supplied %s (%s)', this.name, this.name.length)
       console.error('This can cause conflicts and silent errors executing queries')
+      /* eslint-enable no-console */
     }
     var values = (this.values || []).map(utils.prepareValue)
 

package/lib/query.js

@@ -194,7 +194,12 @@ Query.prototype.prepare = function (connection) {
   }
 
   if (self.values) {
-    self.values = self.values.map(utils.prepareValue)
+    try {
+      self.values = self.values.map(utils.prepareValue)
+    } catch (err) {
+      this.handleError(err, connection)
+      return
+    }
   }
 
   // http://developer.postgresql.org/pgdocs/postgres/protocol-flow.html#PROTOCOL-FLOW-EXT-QUERY
@@ -217,6 +222,7 @@ Query.prototype.handleCopyInResponse = function (connection) {
   connection.sendCopyFail('No source stream defined')
 }
 
+// eslint-disable-next-line no-unused-vars
 Query.prototype.handleCopyData = function (msg, connection) {
   // noop
 }

package/lib/result.js

@@ -12,13 +12,14 @@ var types = require('pg-types')
 // result object returned from query
 // in the 'end' event and also
 // passed as second argument to provided callback
-var Result = function (rowMode) {
+var Result = function (rowMode, types) {
   this.command = null
   this.rowCount = null
   this.oid = null
   this.rows = []
   this.fields = []
   this._parsers = []
+  this._types = types
   this.RowCtor = null
   this.rowAsArray = rowMode === 'array'
   if (this.rowAsArray) {
@@ -94,11 +95,9 @@ Result.prototype.addFields = function (fieldDescriptions) {
   for (var i = 0; i < fieldDescriptions.length; i++) {
     var desc = fieldDescriptions[i]
     this.fields.push(desc)
-    var parser = this._getTypeParser(desc.dataTypeID, desc.format || 'text')
+    var parser = (this._types || types).getTypeParser(desc.dataTypeID, desc.format || 'text')
     this._parsers.push(parser)
   }
 }
 
-Result.prototype._getTypeParser = types.getTypeParser
-
 module.exports = Result

package/lib/sasl.js

@@ -1,3 +1,4 @@
+'use strict'
 const crypto = require('crypto')
 
 function startSession (mechanisms) {

package/lib/utils.js

@@ -97,7 +97,12 @@ function pad (number, digits) {
 
 function dateToString (date) {
   var offset = -date.getTimezoneOffset()
-  var ret = pad(date.getFullYear(), 4) + '-' +
+
+  var year = date.getFullYear()
+  var isBCYear = year < 1
+  if (isBCYear) year = Math.abs(year) + 1 // negative years are 1 off their BC representation
+
+  var ret = pad(year, 4) + '-' +
     pad(date.getMonth() + 1, 2) + '-' +
     pad(date.getDate(), 2) + 'T' +
     pad(date.getHours(), 2) + ':' +
@@ -110,11 +115,17 @@ function dateToString (date) {
     offset *= -1
   } else { ret += '+' }
 
-  return ret + pad(Math.floor(offset / 60), 2) + ':' + pad(offset % 60, 2)
+  ret += pad(Math.floor(offset / 60), 2) + ':' + pad(offset % 60, 2)
+  if (isBCYear) ret += ' BC'
+  return ret
 }
 
 function dateToStringUTC (date) {
-  var ret = pad(date.getUTCFullYear(), 4) + '-' +
+  var year = date.getUTCFullYear()
+  var isBCYear = year < 1
+  if (isBCYear) year = Math.abs(year) + 1 // negative years are 1 off their BC representation
+
+  var ret = pad(year, 4) + '-' +
     pad(date.getUTCMonth() + 1, 2) + '-' +
     pad(date.getUTCDate(), 2) + 'T' +
     pad(date.getUTCHours(), 2) + ':' +
@@ -122,7 +133,9 @@ function dateToStringUTC (date) {
     pad(date.getUTCSeconds(), 2) + '.' +
     pad(date.getUTCMilliseconds(), 3)
 
-  return ret + '+00:00'
+  ret += '+00:00'
+  if (isBCYear) ret += ' BC'
+  return ret
 }
 
 function normalizeQueryConfig (config, values, callback) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pg",
-  "version": "7.9.0",
+  "version": "7.12.1",
   "description": "PostgreSQL client - pure javascript & libpq with the same API",
   "keywords": [
     "database",
@@ -23,7 +23,7 @@
     "packet-reader": "1.0.0",
     "pg-connection-string": "0.1.3",
     "pg-pool": "^2.0.4",
-    "pg-types": "~2.0.0",
+    "pg-types": "^2.1.0",
     "pgpass": "1.x",
     "semver": "4.3.2"
   },
@@ -31,12 +31,12 @@
     "async": "0.9.0",
     "bluebird": "3.5.2",
     "co": "4.6.0",
-    "eslint": "^4.19.1",
-    "eslint-config-standard": "^11.0.0",
-    "eslint-plugin-import": "^2.14.0",
-    "eslint-plugin-node": "^6.0.1",
-    "eslint-plugin-promise": "^4.0.1",
-    "eslint-plugin-standard": "^3.1.0",
+    "eslint": "^6.0.1",
+    "eslint-config-standard": "^13.0.1",
+    "eslint-plugin-import": "^2.18.1",
+    "eslint-plugin-node": "^9.1.0",
+    "eslint-plugin-promise": "^4.2.1",
+    "eslint-plugin-standard": "^4.0.0",
     "pg-copy-streams": "0.3.0"
   },
   "minNativeVersion": "2.0.0",