From ae488942bbd55ffbf8cb9f1eb753dce89f1957a0 Mon Sep 17 00:00:00 2001
From: Raymond Feng <raymond@strongloop.com>
Date: Thu, 5 Dec 2013 16:08:32 -0800
Subject: [PATCH] Fix the orderBy

---
 lib/mysql.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/lib/mysql.js b/lib/mysql.js
index 3400e53..1fe3d1b 100644
--- a/lib/mysql.js
+++ b/lib/mysql.js
@@ -31,9 +31,7 @@ exports.initialize = function initializeDataSource(dataSource, callback) {
     s.supportBigNumbers = (s.supportBigNumbers || false);
     s.timezone = (s.timezone || 'local');
 
-    if(isNaN(s.connectionLimit)) {
-        s.connectionLimit = s.connectionLimit;
-    } else {
+    if(!isNaN(s.connectionLimit)) {
         s.connectionLimit = 10;
     }
 
@@ -473,7 +471,7 @@ MySQL.prototype.all = function all(model, filter, callback) {
     if (!filter.order) {
         var idNames = this.idNames(model);
         if (idNames && idNames.length) {
-            filter.order = idNames.join(' ');
+            filter.order = idNames;
         }
     }