Merge pull request #892 from durango/devdep

Cleaned up the postgres connector-manager/query code, updated node-postg...

lib/dialects/postgres/connector-manager.js

@@ -19,9 +19,9 @@ module.exports = (function() {
 
 
     // set pooling parameters if specified
     // set pooling parameters if specified
     if (this.pooling) {
     if (this.pooling) {
-      this.pg.defaults.poolSize           = this.config.pool.maxConnections
-      this.pg.defaults.poolIdleTimeout    = this.config.pool.maxIdleTime
-      this.pg.defaults.reapIntervalMillis = this.config.pool.reapInterval || 1000
+      this.pg.defaults.poolSize           = this.config.pool.maxConnections || 10
+      this.pg.defaults.poolIdleTimeout    = this.config.pool.maxIdleTime    || 30000
+      this.pg.defaults.reapIntervalMillis = this.config.pool.reapInterval   || 1000
     }
     }
 
 
     this.disconnectTimeoutId = null
     this.disconnectTimeoutId = null
@@ -142,7 +142,9 @@ module.exports = (function() {
     }
     }
 
 
     if (this.client) {
     if (this.client) {
-      this.client.end.bind(this.client)
+      // Closes a client correctly even if we have backed up queries
+      // https://github.com/brianc/node-postgres/pull/346
+      this.client.on('drain', this.client.end.bind(this.client))
     }
     }
 
 
     this.isConnecting = false
     this.isConnecting = false

lib/dialects/postgres/query.js

@@ -20,34 +20,34 @@ module.exports = (function() {
 
 
   Query.prototype.run = function(sql) {
   Query.prototype.run = function(sql) {
     this.sql = sql
     this.sql = sql
+
     var self = this
     var self = this
+      , receivedError = false
+      , query         = this.client.query(sql)
+      , rows          = []
 
 
     if (this.options.logging !== false) {
     if (this.options.logging !== false) {
       this.options.logging('Executing: ' + this.sql)
       this.options.logging('Executing: ' + this.sql)
     }
     }
 
 
-      var receivedError = false
-        , query         = this.client.query(sql)
-        , rows          = []
-
     query.on('row', function(row) {
     query.on('row', function(row) {
       rows.push(row)
       rows.push(row)
     })
     })
 
 
     query.on('error', function(err) {
     query.on('error', function(err) {
       receivedError = true
       receivedError = true
-      this.emit('error', err, this.callee)
-    }.bind(this))
+      self.emit('error', err, self.callee)
+    })
 
 
     query.on('end', function() {
     query.on('end', function() {
-      this.emit('sql', this.sql)
+      self.emit('sql', self.sql)
 
 
       if (receivedError) {
       if (receivedError) {
         return
         return
       }
       }
 
 
-      onSuccess.call(this, rows, sql)
-    }.bind(this))
+      onSuccess.call(self, rows, sql)
+    })
 
 
     return this
     return this
   }
   }

package.json

@@ -51,7 +51,7 @@
   "devDependencies": {
   "devDependencies": {
     "sqlite3": "~2.1.12",
     "sqlite3": "~2.1.12",
     "mysql": "~2.0.0-alpha8",
     "mysql": "~2.0.0-alpha8",
-    "pg": "~2.3.1",
+    "pg": "~2.6.0",
     "watchr": "~2.4.3",
     "watchr": "~2.4.3",
     "yuidocjs": "~0.3.36",
     "yuidocjs": "~0.3.36",
     "chai": "~1.7.2",
     "chai": "~1.7.2",