Dedicated Model for testing disableDefaultSort

Author: HugoPoi

lib/mongodb.js

@@ -942,13 +942,15 @@ MongoDB.prototype.buildSort = function(model, order, options) {
 
   var modelClass = this._models[model];
 
-  var disableDefaultSort = this.settings.disableDefaultSort;
+  var disableDefaultSort = false;
+  if (this.settings.hasOwnProperty('disableDefaultSort')) {
+    disableDefaultSort = this.settings.disableDefaultSort;
+  }
+  if (modelClass.settings.hasOwnProperty('disableDefaultSort')) {
+    disableDefaultSort = modelClass.settings.disableDefaultSort;
+  }
   if (options && options.hasOwnProperty('disableDefaultSort')) {
-    disableDefaultSort = options.disableDefaultSort === true;
-  } else if (disableDefaultSort !== false && modelClass.settings.hasOwnProperty('disableDefaultSort')) {
-    disableDefaultSort = modelClass.settings.disableDefaultSort === true;
-  } else if (disableDefaultSort === true) {
-    disableDefaultSort = true;
+    disableDefaultSort = options.disableDefaultSort;
   }
 
   if (!order && !disableDefaultSort) {

test/mongodb.test.js

@@ -26,7 +26,8 @@ var Superhero,
   Category,
   UserWithRenamedColumns,
   PostWithStringIdAndRenamedColumns,
-  Employee;
+  Employee,
+  PostWithDisableDefaultSort;
 
 describe('lazyConnect', function() {
   it('should skip connect phase (lazyConnect = true)', function(done) {
@@ -273,6 +274,18 @@ describe('mongodb connector', function() {
       }
     );
 
+    PostWithDisableDefaultSort = db.define(
+      'PostWithDisableDefaultSort',
+      {
+        id: {type: String, id: true},
+        title: {type: String, length: 255, index: true},
+        content: {type: String},
+      },
+      {
+        disableDefaultSort: true,
+      }
+    );
+
     User.hasMany(Post);
     Post.belongsTo(User);
   });
@@ -285,7 +298,9 @@ describe('mongodb connector', function() {
           PostWithNumberId.destroyAll(function() {
             PostWithNumberUnderscoreId.destroyAll(function() {
               PostWithStringId.destroyAll(function() {
-                done();
+                PostWithDisableDefaultSort.destroyAll(function() {
+                  done();
+                });
               });
             });
           });
@@ -2492,21 +2507,19 @@ describe('mongodb connector', function() {
 
   it('find should not order by id if the order is not set for the query filter and settings.disableDefaultSort is true',
     function(done) {
-      PostWithStringId.settings.disableDefaultSort = true;
-
-      PostWithStringId.create({ id: '2', title: 'c', content: 'CCC' }, function(err, post) {
-        PostWithStringId.create({ id: '1', title: 'd', content: 'DDD' }, function(err, post) {
-          PostWithStringId.find({}, function(err, posts) {
+      PostWithDisableDefaultSort.create({id: '2', title: 'c', content: 'CCC'}, function(err, post) {
+        PostWithDisableDefaultSort.create({id: '1', title: 'd', content: 'DDD'}, function(err, post) {
+          PostWithDisableDefaultSort.find({}, function(err, posts) {
             should.not.exist(err);
             posts.length.should.be.equal(2);
             posts[0].id.should.be.equal('2');
 
-            PostWithStringId.find({ limit: 1, offset: 0 }, function(err, posts) {
+            PostWithDisableDefaultSort.find({limit: 1, offset: 0}, function(err, posts) {
               should.not.exist(err);
               posts.length.should.be.equal(1);
               posts[0].id.should.be.equal('2');
 
-              PostWithStringId.find({ limit: 1, offset: 1 }, function(err, posts) {
+              PostWithDisableDefaultSort.find({limit: 1, offset: 1}, function(err, posts) {
                 should.not.exist(err);
                 posts.length.should.be.equal(1);
                 posts[0].id.should.be.equal('1');