Merge remote branch 'upstream/master'

Conflicts:
	lib/query.js
	lib/types.js
	test/unit/client/query-tests.js
	test/unit/client/typed-query-results-tests.js

Author: AlexanderS

.gitignore

@@ -1,6 +1,5 @@
-/.emacs-project
+node_modules/
 *.swp
 *.log
 .lock-wscript
 build/
-/todo.org

README.md

@@ -1,21 +1,16 @@
 #node-postgres
 
-Non-blocking PostgreSQL client for node.js.  Pure JavaScript and native libpq bindings.
+Non-blocking PostgreSQL client for node.js.  Pure JavaScript and native libpq bindings.  Active development,  well tested, and production use.
 
 ## Installation
 
     npm install pg
+    
+### notice
+node-postgres compiles native bindings when you install.  The native bindings do not _currently_ compile with node v0.5.x.  I'm working on support for v0.5.x.  In the mean time if you get a compilation failure during installation you have still successfully installed the module; however, you cannot use the native bindings -- only the pure javascript bindings.
 
 ## Examples
 
-All examples will work with the pure javascript bindings (currently default) or the libpq native (c/c++) bindings (currently in beta)
-
-To use native libpq bindings replace `require('pg')` with `require('pg').native`.
-
-The two share the same interface so __no other code changes should be required__.  If you find yourself having to change code other than the require statement when switching from `pg` to `pg.native`, please report an issue.
-
-node-postgres supports both an 'event emitter' style API and a 'callback' style.  The callback style is more concise and generally preferred, but the evented API can come in handy.  They can be mixed and matched.  The only events which do __not__ fire when callbacks are supplied are the `error` events, as they are to be handled by the callback function.
-
 ### Simple, using built-in client pool
 
     var pg = require('pg'); 
@@ -73,9 +68,19 @@ node-postgres supports both an 'event emitter' style API and a 'callback' style.
       client.end();
     });
 
+### Example notes
+
+node-postgres supports both an 'event emitter' style API and a 'callback' style.  The callback style is more concise and generally preferred, but the evented API can come in handy.  They can be mixed and matched.  The only events which do __not__ fire when callbacks are supplied are the `error` events, as they are to be handled by the callback function.
+
+All examples will work with the pure javascript bindings (currently default) or the libpq native (c/c++) bindings (currently in beta)
+
+To use native libpq bindings replace `require('pg')` with `require('pg').native`.
+
+The two share the same interface so __no other code changes should be required__.  If you find yourself having to change code other than the require statement when switching from `pg` to `pg.native`, please report an issue.
+
 ### Info
 
-* a pure javascript client and native libpq bindings with _the same api_
+* pure javascript client and native libpq bindings share _the same api_
 * _heavily_ tested
   * the same suite of 200+ integration tests passed by both javascript & libpq bindings
   * benchmark & long-running memory leak tests performed before releases
@@ -84,7 +89,7 @@ node-postgres supports both an 'event emitter' style API and a 'callback' style.
     * Linux, OS X
     * node 2.x & 4.x
 * row-by-row result streaming
-* optional, built-in connection pooling
+* built-in (optional) connection pooling
 * responsive project maintainer
 * supported PostgreSQL features
   * parameterized queries
@@ -94,9 +99,7 @@ node-postgres supports both an 'event emitter' style API and a 'callback' style.
 * query queue
 * active development
 * fast
-* No dependencies (other than PostgreSQL)
-* No monkey patching
-* Tried to mirror the node-mysql api as much as possible for future multi-database-supported ORM implementation ease
+* close mirror of the node-mysql api for future multi-database-supported ORM implementation ease
 
 ### Contributors
 
@@ -109,15 +112,23 @@ Many thanks to the following:
 * [JulianBirch](https://github.com/JulianBirch)
 * [ef4](https://github.com/ef4)
 * [napa3um](https://github.com/napa3um)
+* [drdaeman](https://github.com/drdaeman)
+* [booo](https://github.com/booo)
+* [neonstalwart](https://github.com/neonstalwart)
+* [homme](https://github.com/homme)
+* [bdunavant](https://github.com/bdunavant)
+* [tokumine](https://github.com/tokumine)
 
 ## Documentation
 
-Still a work in progress, I am trying to flesh out the wiki...
+Documentation is a work in progress primarily taking place on the github WIKI
 
 ### [Documentation](https://github.com/brianc/node-postgres/wiki)
 
 ### __PLEASE__ check out the WIKI
 
+If you have a question, post it to the FAQ section of the WIKI so everyone can read the answer
+
 ## Production Use
 * [bayt.com](http://bayt.com)
 

lib/client-pool.js

@@ -1,6 +1,6 @@
-var sys = require('sys');
 var crypto = require('crypto');
 var EventEmitter = require('events').EventEmitter;
+var util = require('util');
 
 var Query = require(__dirname + '/query');
 var utils = require(__dirname + '/utils');
@@ -17,19 +17,18 @@ var Client = function(config) {
   this.database = config.database || defaults.database;
   this.port = config.port || defaults.port;
   this.host = config.host || defaults.host;
-  this.queryQueue = [];
   this.connection = config.connection || new Connection({stream: config.stream});
   this.queryQueue = [];
   this.password = config.password || defaults.password;
   this.encoding = 'utf8';
   var self = this;
 };
 
-sys.inherits(Client, EventEmitter);
+util.inherits(Client, EventEmitter);
 
 var p = Client.prototype;
 
-p.connect = function() {
+p.connect = function(callback) {
   var self = this;
   var con = this.connection;
   if(this.host && this.host.indexOf('/') === 0) {
@@ -85,11 +84,17 @@ p.connect = function() {
       }
     });
 
-    self.emit('connect');
+    if (!callback) {
+      self.emit('connect');
+    } else {
+      callback(null,self);
+      //remove callback for proper error handling after the connect event
+      callback = null;
+    }
 
     con.on('notification', function(msg) {
       self.emit('notification', msg);
-    })
+    });
 
   });
 
@@ -104,7 +109,11 @@ p.connect = function() {
 
   con.on('error', function(error) {
     if(!self.activeQuery) {
-      self.emit('error', error);
+      if(!callback) {
+        self.emit('error', error);
+      } else {
+        callback(error);
+      }
     } else {
       //need to sync after error during a prepared statement
       if(self.activeQuery.isPreparedStatement) {
@@ -117,7 +126,7 @@ p.connect = function() {
 
   con.on('notice', function(msg) {
     self.emit('notice', msg);
-  })
+  });
 
 };
 
@@ -130,7 +139,7 @@ p._pulseQueryQueue = function() {
       this.activeQuery.submit(this.connection);
     } else if(this.hasExecuted) {
       this.activeQuery = null;
-      this.emit('drain')
+      this._drainPaused > 0 ? this._drainPaused++ : this.emit('drain')
     }
   }
 };
@@ -155,6 +164,19 @@ p.query = function(config, values, callback) {
   return query;
 };
 
+//prevents client from otherwise emitting 'drain' event until 'resumeDrain' is called
+p.pauseDrain = function() {
+  this._drainPaused = 1;
+};
+
+//resume raising 'drain' event
+p.resumeDrain = function() {
+  if(this._drainPaused > 1) {
+    this.emit('drain');
+  }
+  this._drainPaused = 0;
+};
+
 p.end = function() {
   this.connection.end();
 };

lib/client.js

@@ -1,7 +1,7 @@
-var sys = require('sys');
 var net = require('net');
 var crypto = require('crypto');
 var EventEmitter = require('events').EventEmitter;
+var util = require('util');
 
 var utils = require(__dirname + '/utils');
 var Writer = require(__dirname + '/writer');
@@ -19,7 +19,7 @@ var Connection = function(config) {
   this.writer = new Writer();
 };
 
-sys.inherits(Connection, EventEmitter);
+util.inherits(Connection, EventEmitter);
 
 var p = Connection.prototype;
 
@@ -86,11 +86,6 @@ p._send = function(code, more) {
   }
 }
 
-var termBuffer = new Buffer([0x58, 0, 0, 0, 4]);
-p.end = function() {
-  var wrote = this.stream.write(termBuffer);
-};
-
 p.query = function(text) {
   //0x51 = Q
   this.stream.write(this.writer.addCString(text).flush(0x51));
@@ -138,7 +133,7 @@ p.bind = function(config, more) {
     .addInt16(len); //number of parameters
   for(var i = 0; i < len; i++) {
     var val = values[i];
-    if(val === null) {
+    if(val === null || typeof val === "undefined") {
       buffer.addInt32(-1);
     } else {
       val = val.toString();
@@ -326,7 +321,7 @@ p.parseR = function(msg) {
       return msg;
     }
   }
-  throw new Error("Unknown authenticatinOk message type" + sys.inspect(msg));
+  throw new Error("Unknown authenticatinOk message type" + util.inspect(msg));
 };
 
 p.parseS = function(msg) {
@@ -387,16 +382,30 @@ p.parseD = function(msg) {
 };
 
 //parses error
-p.parseE = function(msg) {
+p.parseE = function(input) {
   var fields = {};
+  var msg, item;
   var fieldType = this.readString(1);
   while(fieldType != '\0') {
     fields[fieldType] = this.parseCString();
     fieldType = this.readString(1);
   }
+  if (input.name === 'error') {
+    // the msg is an Error instance
+    msg = new Error(fields.M);
+    for (item in input) {
+      // copy input properties to the error
+      if (input.hasOwnProperty(item)) {
+        msg[item] = input[item];
+      }
+    }
+  } else {
+    // the msg is an object literal
+    msg = input;
+    msg.message = fields.M;
+  }
   msg.severity = fields.S;
   msg.code = fields.C;
-  msg.message = fields.M;
   msg.detail = fields.D;
   msg.hint = fields.H;
   msg.position = fields.P;

lib/connection.js

@@ -12,5 +12,7 @@ module.exports = {
   rows: 0,
   //number of connections to use in connection pool
   //0 will disable connection pooling
-  poolSize: 10
+  poolSize: 10,
+  //duration of node-pool timeout
+  poolIdleTimeout: 30000
 }