Merge branch 'connection_test_fix' of https://github.com/andyburke/sequelize int…

…o andyburke-connection_test_fix

lib/dialects/mysql/connector-manager.js

@@ -89,7 +89,7 @@ module.exports = (function() {
       var cleanup = function () {
       var cleanup = function () {
         var retryCt = 0
         var retryCt = 0
         // make sure to let client finish before calling destroy
         // make sure to let client finish before calling destroy
-        if (self && !self.hasNoConnections) {
+        if (self && self.hasQueuedItems) {
           return
           return
         }
         }
         // needed to prevent mysql connection leak
         // needed to prevent mysql connection leak
@@ -184,8 +184,13 @@ module.exports = (function() {
     queueItem.query.run(queueItem.sql, queueItem.client)
     queueItem.query.run(queueItem.sql, queueItem.client)
   }
   }
 
 
+  ConnectorManager.prototype.__defineGetter__('hasQueuedItems', function() {
+    return (this.queue.length > 0) || (this.activeQueue.length > 0) || (this.client && this.client._queue && (this.client._queue.length > 0))
+  })
+
+  // legacy
   ConnectorManager.prototype.__defineGetter__('hasNoConnections', function() {
   ConnectorManager.prototype.__defineGetter__('hasNoConnections', function() {
-    return (this.queue.length == 0) && (this.activeQueue.length == 0) && (this.client == null || (this.client._queue && (this.client._queue.length == 0)))
+    return !this.hasQueuedItems
   })
   })
 
 
   ConnectorManager.prototype.__defineGetter__('isConnected', function() {
   ConnectorManager.prototype.__defineGetter__('isConnected', function() {
@@ -197,7 +202,7 @@ module.exports = (function() {
 
 
     this.disconnectTimeoutId && clearTimeout(this.disconnectTimeoutId)
     this.disconnectTimeoutId && clearTimeout(this.disconnectTimeoutId)
     this.disconnectTimeoutId = setTimeout(function() {
     this.disconnectTimeoutId = setTimeout(function() {
-      self.isConnected && self.hasNoConnections && self.disconnect()
+      self.isConnected && !self.hasQueuedItems && self.disconnect()
     }, 100)
     }, 100)
   }
   }