Merge branch 'snowyu-master' into 'master'

Author: tushar-chauhan

lib/sqlite3db.js

@@ -901,19 +901,19 @@ SQLiteDB.prototype.toFilter = function (model, filter) {
 
   var pagination = getPagination(filter);
 
-  if (filter.order) {
-    var order = filter.order;
+  var order = filter.order;
+  if (order) {
     if (typeof order === 'string') {
       order = [order];
     }
     var orderBy = '';
-    filter.order = [];
+    var escapedOrder = [];
     for (var i = 0, n = order.length; i < n; i++) {
       var t = order[i].split(/[\s]+/);
       var field = t[0], dir = t[1];
-      filter.order.push(self.columnEscaped(model, field) + (dir ? ' ' + dir : ''));
+      escapedOrder.push(self.columnEscaped(model, field) + (dir ? ' ' + dir : ''));
     }
-    orderBy = ' ORDER BY ' + filter.order.join(',');
+    orderBy = ' ORDER BY ' + escapedOrder.join(',');
     if (pagination.length) {
       out = out + ' ' + orderBy + ' ' + pagination.join(' ');
     } else {

test/user_model.test.js

@@ -53,21 +53,22 @@ describe("SQLite Model creation test", function(){
       });
     }
 
+    var searchCond = {'order': 'id'};
     function testArrayContents(cb) {
       var namesSomething = [{name: 'John', some: 'object'}, {name: 'Doe', some: 'other object'}];
       var names = [];
       namesSomething.forEach(function(n) {
         names.push(n.name);
       });
-
-      User.find({
-        where: {
-          name: {inq: names}
-        }
-      }, function(err, foundUsers) {
+      searchCond.where = {name: {inq: names}};
+      console.log('find:')
+      User.find(searchCond, function(err, foundUsers) {
         expect(names[0]).to.be.equal('John');
         expect(names[1]).to.be.equal('Doe');
-        cb();
+        User.find(searchCond, function(err, foundUsers) {
+          expect(searchCond.order).to.be.equal('id');
+          cb();
+        });
       });
     }
   });