pg 8.3.0 → 8.4.1

package/lib/query.js

@@ -1,11 +1,4 @@
 'use strict'
-/**
- * Copyright (c) 2010-2017 Brian Carlson (brian.m.carlson@gmail.com)
- * All rights reserved.
- *
- * This source code is licensed under the MIT license found in the
- * README.md file in the root directory of this source tree.
- */
 
 const { EventEmitter } = require('events')
 
@@ -103,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
@@ -148,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.')
@@ -176,30 +168,33 @@ class Query extends EventEmitter {
   }
 
   _getRows(connection, rows) {
-    connection.execute(
-      {
-        portal: this.portal,
-        rows: rows,
-      },
-      true
-    )
-    connection.flush()
+    connection.execute({
+      portal: this.portal,
+      rows: rows,
+    })
+    // 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
   prepare(connection) {
     // prepared statements need sync to be called after each command
     // complete or when an error is encountered
     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,
+      })
     }
 
     if (this.values) {
@@ -211,24 +206,17 @@ 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,
+    })
+
+    connection.describe({
+      type: 'P',
+      name: this.portal || '',
+    })
 
     this._getRows(connection, this.rows)
   }

package/lib/result.js

@@ -1,103 +1,98 @@
 'use strict'
-/**
- * Copyright (c) 2010-2017 Brian Carlson (brian.m.carlson@gmail.com)
- * All rights reserved.
- *
- * This source code is licensed under the MIT license found in the
- * README.md file in the root directory of this source tree.
- */
 
 var types = require('pg-types')
 
+var matchRegexp = /^([A-Za-z]+)(?: (\d+))?(?: (\d+))?/
+
 // result object returned from query
 // in the 'end' event and also
 // passed as second argument to provided callback
-var Result = function (rowMode, types) {
-  this.command = null
-  this.rowCount = null
-  this.oid = null
-  this.rows = []
-  this.fields = []
-  this._parsers = undefined
-  this._types = types
-  this.RowCtor = null
-  this.rowAsArray = rowMode === 'array'
-  if (this.rowAsArray) {
-    this.parseRow = this._parseRowAsArray
-  }
-}
-
-var matchRegexp = /^([A-Za-z]+)(?: (\d+))?(?: (\d+))?/
-
-// adds a command complete message
-Result.prototype.addCommandComplete = function (msg) {
-  var match
-  if (msg.text) {
-    // pure javascript
-    match = matchRegexp.exec(msg.text)
-  } else {
-    // native bindings
-    match = matchRegexp.exec(msg.command)
-  }
-  if (match) {
-    this.command = match[1]
-    if (match[3]) {
-      // COMMMAND OID ROWS
-      this.oid = parseInt(match[2], 10)
-      this.rowCount = parseInt(match[3], 10)
-    } else if (match[2]) {
-      // COMMAND ROWS
-      this.rowCount = parseInt(match[2], 10)
+class Result {
+  constructor(rowMode, types) {
+    this.command = null
+    this.rowCount = null
+    this.oid = null
+    this.rows = []
+    this.fields = []
+    this._parsers = undefined
+    this._types = types
+    this.RowCtor = null
+    this.rowAsArray = rowMode === 'array'
+    if (this.rowAsArray) {
+      this.parseRow = this._parseRowAsArray
     }
   }
-}
 
-Result.prototype._parseRowAsArray = function (rowData) {
-  var row = new Array(rowData.length)
-  for (var i = 0, len = rowData.length; i < len; i++) {
-    var rawValue = rowData[i]
-    if (rawValue !== null) {
-      row[i] = this._parsers[i](rawValue)
+  // adds a command complete message
+  addCommandComplete(msg) {
+    var match
+    if (msg.text) {
+      // pure javascript
+      match = matchRegexp.exec(msg.text)
     } else {
-      row[i] = null
+      // native bindings
+      match = matchRegexp.exec(msg.command)
+    }
+    if (match) {
+      this.command = match[1]
+      if (match[3]) {
+        // COMMMAND OID ROWS
+        this.oid = parseInt(match[2], 10)
+        this.rowCount = parseInt(match[3], 10)
+      } else if (match[2]) {
+        // COMMAND ROWS
+        this.rowCount = parseInt(match[2], 10)
+      }
     }
   }
-  return row
-}
 
-Result.prototype.parseRow = function (rowData) {
-  var row = {}
-  for (var i = 0, len = rowData.length; i < len; i++) {
-    var rawValue = rowData[i]
-    var field = this.fields[i].name
-    if (rawValue !== null) {
-      row[field] = this._parsers[i](rawValue)
-    } else {
-      row[field] = null
+  _parseRowAsArray(rowData) {
+    var row = new Array(rowData.length)
+    for (var i = 0, len = rowData.length; i < len; i++) {
+      var rawValue = rowData[i]
+      if (rawValue !== null) {
+        row[i] = this._parsers[i](rawValue)
+      } else {
+        row[i] = null
+      }
     }
+    return row
   }
-  return row
-}
 
-Result.prototype.addRow = function (row) {
-  this.rows.push(row)
-}
+  parseRow(rowData) {
+    var row = {}
+    for (var i = 0, len = rowData.length; i < len; i++) {
+      var rawValue = rowData[i]
+      var field = this.fields[i].name
+      if (rawValue !== null) {
+        row[field] = this._parsers[i](rawValue)
+      } else {
+        row[field] = null
+      }
+    }
+    return row
+  }
 
-Result.prototype.addFields = function (fieldDescriptions) {
-  // clears field definitions
-  // multiple query statements in 1 action can result in multiple sets
-  // of rowDescriptions...eg: 'select NOW(); select 1::int;'
-  // you need to reset the fields
-  this.fields = fieldDescriptions
-  if (this.fields.length) {
-    this._parsers = new Array(fieldDescriptions.length)
+  addRow(row) {
+    this.rows.push(row)
   }
-  for (var i = 0; i < fieldDescriptions.length; i++) {
-    var desc = fieldDescriptions[i]
-    if (this._types) {
-      this._parsers[i] = this._types.getTypeParser(desc.dataTypeID, desc.format || 'text')
-    } else {
-      this._parsers[i] = types.getTypeParser(desc.dataTypeID, desc.format || 'text')
+
+  addFields(fieldDescriptions) {
+    // clears field definitions
+    // multiple query statements in 1 action can result in multiple sets
+    // of rowDescriptions...eg: 'select NOW(); select 1::int;'
+    // you need to reset the fields
+    this.fields = fieldDescriptions
+    if (this.fields.length) {
+      this._parsers = new Array(fieldDescriptions.length)
+    }
+    for (var i = 0; i < fieldDescriptions.length; i++) {
+      var desc = fieldDescriptions[i]
+      if (this._types) {
+        this._parsers[i] = this._types.getTypeParser(desc.dataTypeID, desc.format || 'text')
+      } else {
+        this._parsers[i] = types.getTypeParser(desc.dataTypeID, desc.format || 'text')
+      }
     }
   }
 }

package/lib/type-overrides.js

@@ -1,11 +1,4 @@
 'use strict'
-/**
- * Copyright (c) 2010-2017 Brian Carlson (brian.m.carlson@gmail.com)
- * All rights reserved.
- *
- * This source code is licensed under the MIT license found in the
- * README.md file in the root directory of this source tree.
- */
 
 var types = require('pg-types')
 

package/lib/utils.js

@@ -1,11 +1,4 @@
 'use strict'
-/**
- * Copyright (c) 2010-2017 Brian Carlson (brian.m.carlson@gmail.com)
- * All rights reserved.
- *
- * This source code is licensed under the MIT license found in the
- * README.md file in the root directory of this source tree.
- */
 
 const crypto = require('crypto')
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pg",
-  "version": "8.3.0",
+  "version": "8.4.1",
   "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-connection-string": "^2.4.0",
     "pg-pool": "^3.2.1",
-    "pg-protocol": "^1.2.5",
+    "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"
   },
@@ -45,5 +51,6 @@
   "license": "MIT",
   "engines": {
     "node": ">= 8.0.0"
-  }
+  },
+  "gitHead": "36342c9a84b68123f666879a9f34ac319a44727a"
 }