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

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) {

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.json

@@ -1,6 +1,6 @@
 {
   "name": "pg",
-  "version": "6.0.4",
+  "version": "6.1.0",
   "description": "PostgreSQL client - pure javascript & libpq with the same API",
   "keywords": [
     "postgres",

test/integration/client/end-callback-tests.js

@@ -0,0 +1,6 @@
+var helper = require('./test-helper')
+
+var client = helper.client(assert.success(function() {
+  client.end(assert.success(function() {
+  }))
+}))

test/integration/test-helper.js

@@ -7,9 +7,9 @@ if(helper.args.native) {
 }
 
 //creates a client from cli parameters
-helper.client = function() {
+helper.client = function(cb) {
   var client = new Client(helper.config);
-  client.connect();
+  client.connect(cb);
   return client;
 };