Skip to content

Commit

Permalink
fix(query): don't throw uncaught error if query filter too big
Browse files Browse the repository at this point in the history
Fix #5812
  • Loading branch information
vkarpov15 committed Nov 19, 2017
1 parent 743c42c commit 80731fd
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 10 deletions.
15 changes: 9 additions & 6 deletions lib/query.js
Original file line number Diff line number Diff line change
Expand Up @@ -1271,7 +1271,7 @@ Query.prototype._find = function(callback) {
this._fields = this._castFields(this._fields);

var fields = this._fieldsForExec();
var options = this._mongooseOptions;
var mongooseOptions = this._mongooseOptions;
var _this = this;
var userProvidedFields = _this._userProvidedFields || {};

Expand All @@ -1284,23 +1284,26 @@ Query.prototype._find = function(callback) {
return callback(null, docs);
}

if (!options.populate) {
return !!options.lean === true
if (!mongooseOptions.populate) {
return !!mongooseOptions.lean === true
? callback(null, docs)
: completeMany(_this.model, docs, fields, userProvidedFields, null, callback);
}

var pop = helpers.preparePopulationOptionsMQ(_this, options);
var pop = helpers.preparePopulationOptionsMQ(_this, mongooseOptions);
pop.__noPromise = true;
_this.model.populate(docs, pop, function(err, docs) {
if (err) return callback(err);
return !!options.lean === true
return !!mongooseOptions.lean === true
? callback(null, docs)
: completeMany(_this.model, docs, fields, userProvidedFields, pop, callback);
});
};

return Query.base.find.call(this, {}, cb);
var options = this._optionsForExec();
options.fields = this._fieldsForExec();
var filter = this._conditions;
return this._collection.find(filter, options, cb);
};

/**
Expand Down
6 changes: 3 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"mongodb": "2.2.33",
"mpath": "0.3.0",
"mpromise": "0.5.5",
"mquery": "2.3.2",
"mquery": "2.3.3",
"ms": "2.0.0",
"muri": "1.3.0",
"regexp-clone": "0.0.1",
Expand Down

0 comments on commit 80731fd

Please sign in to comment.