catch errors when connecting to non default mysql server fails

lib/sequelize/Sequelize.js

@@ -167,39 +167,39 @@ Sequelize.prototype = {
   query: function(queryString, callback) {
     var fields = [],
         values = [],
-        self = this
-
-    require(__dirname + "/../nodejs-mysql-native/index").createTCPClient(this.config.host, this.config.port, function(err, connection) {
-      if(err) callback(null, null, { message: "Unable to establish a connection to " + [self.config.host, self.config.port].join(":") })
-      else {
-        connection.auto_prepare = true
-        connection
-          .auth(self.config.database, self.config.username, self.config.password)
-          .addListener("error", function(err) { callback(null, null, err) })
-          .addListener('authorized', function() {
-            if(!self.options.disableLogging)
-              Sequelize.Helper.log("Executing the query: " + queryString)
+        self   = this,
+        client = require(__dirname + "/../nodejs-mysql-native/index").createTCPClient(this.config.host, this.config.port)
+    
+    client.connection.on('error', function() {
+      callback(null, null, { message: "Unable to establish a connection to " + [self.config.host, self.config.port].join(":") })
+    })
+    
+    client.auto_prepare = true
+    client
+      .auth(self.config.database, self.config.username, self.config.password)
+      .on('error', function(err) { callback(null, null, err) })
+      .on('authorized', function() {
+        if(!self.options.disableLogging)
+          Sequelize.Helper.log("Executing the query: " + queryString)
 
-            connection
-              .query(queryString)
-              .on('row', function(r){ values.push(r) })
-              .on('field', function(f){ fields.push(f)})
-              .on('end', function(stats) {
-                if(callback) {
-                  var result = []
-                  values.forEach(function(valueArray) {
-                    var mapping = {}
-                    for(var i = 0; i < fields.length; i++)
-                      mapping[fields[i].name] = valueArray[i]
-                    result.push(mapping)
-                  })
-                  if(callback) callback(result, stats)
-                }
+        client
+          .query(queryString)
+          .on('row', function(r){ values.push(r) })
+          .on('field', function(f){ fields.push(f)})
+          .on('end', function(stats) {
+            if(callback) {
+              var result = []
+              values.forEach(function(valueArray) {
+                var mapping = {}
+                for(var i = 0; i < fields.length; i++)
+                  mapping[fields[i].name] = valueArray[i]
+                result.push(mapping)
               })
-            connection.close()
+              if(callback) callback(result, stats)
+            }
           })
-      }
-    })
+        client.close()
+      })
   }
 }