Merge branch 'master' of github.com:sequelize/sequelize

lib/dialects/postgres/connector-manager.js

@@ -72,8 +72,9 @@ module.exports = (function() {
     var emitter = new (require('events').EventEmitter)()
     var emitter = new (require('events').EventEmitter)()
 
 
     // in case database is slow to connect, prevent orphaning the client
     // in case database is slow to connect, prevent orphaning the client
-    if (this.isConnecting && !this.pooling) {
-      emitter.emit('success')
+    // TODO: We really need some sort of queue/flush/drain mechanism
+    if (this.isConnecting && !this.pooling && this.client === null) {
+      emitter.emit('success', null)
       return emitter
       return emitter
     }
     }
 
 
@@ -118,7 +119,7 @@ module.exports = (function() {
 
 
     if (this.pooling) {
     if (this.pooling) {
       // acquire client from pool
       // acquire client from pool
-      this.poolIdentifier = this.pg.pools.getOrCreate(this.sequelize.config)
+      this.poolIdentifier = this.pg.pools.getOrCreate(uri)
       this.poolIdentifier.connect(connectCallback)
       this.poolIdentifier.connect(connectCallback)
     } else {
     } else {
       if (!!this.client) {
       if (!!this.client) {