pg 6.0.5 → 6.1.0

package/CHANGELOG.md

@@ -4,6 +4,10 @@ For richer information consult the commit log on github with referenced pull req
 
 We do not include break-fix version release in this file.
 
+### v6.1.0
+
+- Add optional callback parameter to the pure JavaScript `client.end` method.  The native client already supported this.
+
 ### v6.0.0
 
 #### Breaking Changes

package/lib/client.js

@@ -336,8 +336,11 @@ Client.prototype.query = function(config, values, callback) {
   return query;
 };
 
-Client.prototype.end = function() {
+Client.prototype.end = function(cb) {
   this.connection.end();
+  if (cb) {
+    this.connection.once('end', cb);
+  }
 };
 
 Client.md5 = function(string) {

package/lib/connection.js

@@ -122,6 +122,9 @@ Connection.prototype.attachListeners = function(stream) {
       packet = self._reader.read();
     }
   });
+  stream.on('end', function() {
+    self.emit('end');
+  });
 };
 
 Connection.prototype.requestSsl = function() {

package/lib/result.js

@@ -7,7 +7,6 @@
  */
 
 var types = require('pg-types');
-var escape = require('js-string-escape');
 
 //result object returned from query
 //in the 'end' event and also
@@ -76,13 +75,13 @@ Result.prototype.addRow = function(row) {
 
 var inlineParser = function(fieldName, i) {
   return "\nthis['" +
-    // fields containing single quotes will break
-    // the evaluated javascript unless they are escaped
-    // see https://github.com/brianc/node-postgres/issues/507
-    // Addendum: However, we need to make sure to replace all
-    // occurences of apostrophes, not just the first one.
-    // See https://github.com/brianc/node-postgres/issues/934
-    escape(fieldName) +
+    //fields containing single quotes will break
+    //the evaluated javascript unless they are escaped
+    //see https://github.com/brianc/node-postgres/issues/507
+    //Addendum: However, we need to make sure to replace all
+    //occurences of apostrophes, not just the first one.
+    //See https://github.com/brianc/node-postgres/issues/934
+    fieldName.replace(/'/g, "\\'") +
     "'] = " +
     "rowData[" + i + "] == null ? null : parsers[" + i + "](rowData[" + i + "]);";
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pg",
-  "version": "6.0.5",
+  "version": "6.1.0",
   "description": "PostgreSQL client - pure javascript & libpq with the same API",
   "keywords": [
     "postgres",
@@ -19,7 +19,6 @@
   "main": "./lib",
   "dependencies": {
     "buffer-writer": "1.0.1",
-    "js-string-escape": "1.0.1",
     "packet-reader": "0.2.0",
     "pg-connection-string": "0.1.3",
     "pg-pool": "1.*",