pg 8.3.2 → 8.4.2

package/lib/client.js

@@ -57,6 +57,15 @@ class Client extends EventEmitter {
     this.processID = null
     this.secretKey = null
     this.ssl = this.connectionParameters.ssl || false
+    // As with Password, make SSL->Key (the private key) non-enumerable.
+    // It won't show up in stack traces
+    // or if the client is console.logged
+    if (this.ssl && this.ssl.key) {
+      Object.defineProperty(this.ssl, 'key', {
+        enumerable: false,
+      })
+    }
+
     this._connectionTimeoutMillis = c.connectionTimeoutMillis || 0
   }
 
@@ -215,7 +224,7 @@ class Client extends EventEmitter {
     } else if (this.password !== null) {
       cb()
     } else {
-      pgPass(this.connectionParameters, function (pass) {
+      pgPass(this.connectionParameters, (pass) => {
         if (undefined !== pass) {
           this.connectionParameters.password = this.password = pass
         }

package/lib/connection-parameters.js

@@ -84,6 +84,11 @@ class ConnectionParameters {
     if (this.ssl === 'no-verify') {
       this.ssl = { rejectUnauthorized: false }
     }
+    if (this.ssl && this.ssl.key) {
+      Object.defineProperty(this.ssl, 'key', {
+        enumerable: false,
+      })
+    }
 
     this.client_encoding = val('client_encoding', config)
     this.replication = val('replication', config)

package/lib/native/client.js

@@ -3,16 +3,11 @@
 // eslint-disable-next-line
 var Native = require('pg-native')
 var TypeOverrides = require('../type-overrides')
-var semver = require('semver')
 var pkg = require('../../package.json')
-var assert = require('assert')
 var EventEmitter = require('events').EventEmitter
 var util = require('util')
 var ConnectionParameters = require('../connection-parameters')
 
-var msg = 'Version >= ' + pkg.minNativeVersion + ' of pg-native required.'
-assert(semver.gte(Native.version, pkg.minNativeVersion), msg)
-
 var NativeQuery = require('./query')
 
 var Client = (module.exports = function (config) {

package/lib/query.js

@@ -96,39 +96,28 @@ class Query extends EventEmitter {
     }
   }
 
-  handleCommandComplete(msg, con) {
+  handleCommandComplete(msg, connection) {
     this._checkForMultirow()
     this._result.addCommandComplete(msg)
     // need to sync after each command complete of a prepared statement
-    if (this.isPreparedStatement) {
-      con.sync()
+    // if we were using a row count which results in multiple calls to _getRows
+    if (this.rows) {
+      connection.sync()
     }
   }
 
   // if a named prepared statement is created with empty query text
   // the backend will send an emptyQuery message but *not* a command complete message
-  // execution on the connection will hang until the backend receives a sync message
-  handleEmptyQuery(con) {
-    if (this.isPreparedStatement) {
-      con.sync()
-    }
-  }
-
-  handleReadyForQuery(con) {
-    if (this._canceledDueToError) {
-      return this.handleError(this._canceledDueToError, con)
-    }
-    if (this.callback) {
-      this.callback(null, this._results)
+  // since we pipeline sync immediately after execute we don't need to do anything here
+  // unless we have rows specified, in which case we did not pipeline the intial sync call
+  handleEmptyQuery(connection) {
+    if (this.rows) {
+      connection.sync()
     }
-    this.emit('end', this._results)
   }
 
   handleError(err, connection) {
     // need to sync after error during a prepared statement
-    if (this.isPreparedStatement) {
-      connection.sync()
-    }
     if (this._canceledDueToError) {
       err = this._canceledDueToError
       this._canceledDueToError = false
@@ -141,6 +130,16 @@ class Query extends EventEmitter {
     this.emit('error', err)
   }
 
+  handleReadyForQuery(con) {
+    if (this._canceledDueToError) {
+      return this.handleError(this._canceledDueToError, con)
+    }
+    if (this.callback) {
+      this.callback(null, this._results)
+    }
+    this.emit('end', this._results)
+  }
+
   submit(connection) {
     if (typeof this.text !== 'string' && typeof this.name !== 'string') {
       return new Error('A query must have either text or a name. Supplying neither is unsupported.')
@@ -173,7 +172,14 @@ class Query extends EventEmitter {
       portal: this.portal,
       rows: rows,
     })
-    connection.flush()
+    // if we're not reading pages of rows send the sync command
+    // to indicate the pipeline is finished
+    if (!rows) {
+      connection.sync()
+    } else {
+      // otherwise flush the call out to read more rows
+      connection.flush()
+    }
   }
 
   // http://developer.postgresql.org/pgdocs/postgres/protocol-flow.html#PROTOCOL-FLOW-EXT-QUERY

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pg",
-  "version": "8.3.2",
+  "version": "8.4.2",
   "description": "PostgreSQL client - pure javascript & libpq with the same API",
   "keywords": [
     "database",
@@ -21,12 +21,11 @@
   "dependencies": {
     "buffer-writer": "2.0.0",
     "packet-reader": "1.0.0",
-    "pg-connection-string": "^2.3.0",
-    "pg-pool": "^3.2.1",
-    "pg-protocol": "^1.2.5",
+    "pg-connection-string": "^2.4.0",
+    "pg-pool": "^3.2.2",
+    "pg-protocol": "^1.3.0",
     "pg-types": "^2.1.0",
-    "pgpass": "1.x",
-    "semver": "4.3.2"
+    "pgpass": "1.x"
   },
   "devDependencies": {
     "async": "0.9.0",
@@ -34,7 +33,14 @@
     "co": "4.6.0",
     "pg-copy-streams": "0.3.0"
   },
-  "minNativeVersion": "2.0.0",
+  "peerDependencies": {
+    "pg-native": ">=2.0.0"
+  },
+  "peerDependenciesMeta": {
+    "pg-native": {
+      "optional": true
+    }
+  },
   "scripts": {
     "test": "make test-all"
   },
@@ -46,5 +52,5 @@
   "engines": {
     "node": ">= 8.0.0"
   },
-  "gitHead": "acfbafac82641ef909d9d6235d46d38378c67864"
+  "gitHead": "b6d69d5bc2eb7df4f4e04bc864b133b795c76a7f"
 }