From 4bc0b7f8cd12a15e03b69d6a72879c251582489f Mon Sep 17 00:00:00 2001 From: Renan Castro Date: Tue, 8 Feb 2022 11:07:02 -0300 Subject: [PATCH 1/2] Remove throw on _id exclusion inside mongo collection finds - revert changed test --- packages/mongo/collection.js | 7 ------- packages/mongo/observe_changes_tests.js | 7 ++++--- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/packages/mongo/collection.js b/packages/mongo/collection.js index 0ec2698281..5e4ad21578 100644 --- a/packages/mongo/collection.js +++ b/packages/mongo/collection.js @@ -343,13 +343,6 @@ Object.assign(Mongo.Collection.prototype, { ) ); - const { projection } = newOptions; - - // this error: "Cannot do exclusion on field _id in inclusion projection" - // happens on MongoDB CLI but doesn't happen in the Node.js Driver for MongoDB 5.0+ - if (projection && projection._id != null && !projection._id) { - throw new Error(`Cannot do exclusion on field _id in inclusion projection, collectionName=${self._name}`); - } return { transform: self._transform, diff --git a/packages/mongo/observe_changes_tests.js b/packages/mongo/observe_changes_tests.js index 5dab99445a..7088229d65 100644 --- a/packages/mongo/observe_changes_tests.js +++ b/packages/mongo/observe_changes_tests.js @@ -48,9 +48,10 @@ _.each ([{added: 'added', forceOrdered: true}, handle.stop(); - test.throws(function () { - c.find({}, {fields: {noodles: 1, _id: false}}) - }, undefined, 'bad cursor excluding _id from projection'); + const badCursor = c.find({}, {fields: {noodles: 1, _id: false}}); + test.throws(function () { + badCursor.observeChanges(logger); + }); onComplete(); }); From 6c1550ab01104538cbf02f9a7e9317b5cc9431ba Mon Sep 17 00:00:00 2001 From: Renan Castro Date: Tue, 8 Feb 2022 12:54:43 -0300 Subject: [PATCH 2/2] Remove throw on _id exclusion inside mongo collection finds - Add changes to history.md and bump package version --- docs/history.md | 4 ++++ packages/mongo/package.js | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/docs/history.md b/docs/history.md index 044d790796..7dda99ec20 100644 --- a/docs/history.md +++ b/docs/history.md @@ -10,6 +10,10 @@ #### Independent Releases +* `mongo@1.14.3` at 2022-02-08 + - Remove throw on _id exclusion inside mongo collection finds. [PR](https://github.com/meteor/meteor/pull/11894). +* `mongo@1.14.2` at 2022-02-06 + - Fix flatten object issue when internal object value is an array on oplog converter. [PR](https://github.com/meteor/meteor/pull/11888). * `mongo@1.14.1` at 2022-02-04 - Fix flatten object issue when the object is empty on oplog converter. [PR](https://github.com/meteor/meteor/pull/11885), [Issue](https://github.com/meteor/meteor/issues/11884). diff --git a/packages/mongo/package.js b/packages/mongo/package.js index 3bc6b4e36e..c40d192ba9 100644 --- a/packages/mongo/package.js +++ b/packages/mongo/package.js @@ -9,7 +9,7 @@ Package.describe({ summary: "Adaptor for using MongoDB and Minimongo over DDP", - version: '1.14.2' + version: '1.14.3' }); Npm.depends({