Automatticgh-2374 make sort usable with count op

lib/query.js

@@ -1332,6 +1332,11 @@ Query.prototype.sort = function (arg) {
     nArg = arg;
   }
 
+  // workaround for gh-2374 when sort is called after count
+  // if previous operation is count, we ignore
+  if (this.op == 'count') {
+    delete this.op;
+  }
   return Query.base.sort.call(this, nArg);
 }
 

test/query.test.js

@@ -1492,5 +1492,14 @@ describe('Query', function(){
         done();
       });
     });
+
+    it('ignores count when passed to sort', function(done) {
+      var db = start();
+      var Product = db.model('Product', 'Product_setOptions_test');
+      Product.find().count({}).sort({ _id: 1 }).exec(function(error) {
+        assert.ifError(error);
+        done();
+      });
+    });
   });
 })