Merge pull request #80 from andrzejpolis/master

Fixed ignored connection errors for mysql alpha 2.0 driver
joeferner · Jul 18, 2013 · c6bdce1 · c6bdce1
2 parents ce018cb + 9dbb59a
commit c6bdce1
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/lib/drivers/mysql.js b/lib/drivers/mysql.js
@@ -96,16 +96,20 @@ var MySqlDriver = Driver.extend({
       var db;
       if (typeof(mysql.createConnection) === 'undefined') {
         db = new mysql.createClient(opts);
+        conn = new MySqlConnection(this, db, true, opts);
+        callback(null, conn);
       } else {
         db = new mysql.createConnection(opts);
+        var _this = this;
         db.connect(function(err) {
           if (err) {
-            console.log(err);
+            callback(err);
+          } else {
+            conn = new MySqlConnection(_this, db, true, opts);
+            callback(null, conn);
           }
         });
       }
-      conn = new MySqlConnection(this, db, true, opts);
-      callback(null, conn);
     }
   },