Skip to content

Commit

Permalink
fix(cursor): allow find middleware to modify query cursor options
Browse files Browse the repository at this point in the history
Fix #13453
Backports #13435
  • Loading branch information
vkarpov15 committed Jun 4, 2023
1 parent 7a90868 commit 5552107
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 0 deletions.
1 change: 1 addition & 0 deletions lib/cursor/QueryCursor.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ function QueryCursor(query, options) {
// Max out the number of documents we'll populate in parallel at 5000.
this.options._populateBatchSize = Math.min(this.options.batchSize, 5000);
}
Object.assign(this.options, query._optionsForExec());
model.collection.find(query._conditions, this.options, (err, cursor) => {
if (err != null) {
_this._markError(err);
Expand Down
24 changes: 24 additions & 0 deletions test/query.cursor.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -844,6 +844,30 @@ describe('QueryCursor', function() {
const docs = await Example.find().sort('foo');
assert.deepStrictEqual(docs.map(d => d.foo), ['example1', 'example2']);
});

it('should allow middleware to run before applying _optionsForExec() gh-13417', async function() {
const testSchema = new Schema({
a: Number,
b: Number,
c: Number
});
testSchema.pre('find', function() {
this.select('-c');
});
const Test = db.model('gh13417', testSchema);
await Test.create([{ a: 1, b: 1, c: 1 }, { a: 2, b: 2, c: 2 }]);
const cursorMiddleSelect = [];
let r;
const cursor = Test.find().select('-b').sort({ a: 1 }).cursor();
// eslint-disable-next-line no-cond-assign
while (r = await cursor.next()) {
cursorMiddleSelect.push(r);
}
assert.equal(typeof cursorMiddleSelect[0].b, 'undefined');
assert.equal(typeof cursorMiddleSelect[1].b, 'undefined');
assert.equal(typeof cursorMiddleSelect[0].c, 'undefined');
assert.equal(typeof cursorMiddleSelect[1].c, 'undefined');
});
});

async function delay(ms) {
Expand Down

0 comments on commit 5552107

Please sign in to comment.