query callback fired only once regardless of number of commandComplete messages recieved from backend

This commit is contained in:
Brian Carlson 2011-01-18 22:23:03 -06:00
parent 41add49925
commit 227d1a8749

View File

@ -56,15 +56,6 @@ p.submit = function(connection) {
}
};
var onCommandComplete = function() {
self.callback(null, {rows: rows});
rows = [];
}
if(self.callback) {
connection.on('commandComplete', onCommandComplete)
}
var onError = function(err) {
//remove all listeners
connection.removeListener('rowDescription', handleDatarow);
@ -73,7 +64,6 @@ p.submit = function(connection) {
connection.removeListener('readyForQuery', onReadyForQuery);
if(self.callback) {
self.callback(err);
connection.removeListener('commandComplete', onCommandComplete);
} else {
self.emit('error', err);
}
@ -87,7 +77,8 @@ p.submit = function(connection) {
connection.removeListener('readyForQuery', onReadyForQuery);
connection.removeListener('error', onError);
if(self.callback) {
connection.removeListener('commandComplete', onCommandComplete);
self.callback(null, {rows: rows});
rows = [];
}
self.emit('end');
};
@ -179,8 +170,8 @@ var dateParser = function(isoDate) {
var end = splitTime[2];
var seconds = /(\d{2})/.exec(end);
seconds = (seconds ? seconds[1] : 0);
seconds = parseInt(seconds,10);
var mili = /\.(\d{1,})/.exec(end+"000");
seconds = parseInt(seconds,10);
var mili = /\.(\d{1,})/.exec(end+"000");
mili = mili ? mili[1].slice(0,3) : 0;
var tZone = /([Z|+\-])(\d{2})?(\d{2})?/.exec(end);
//minutes to adjust for timezone