-
-
Notifications
You must be signed in to change notification settings - Fork 3.9k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix findByIdAndUpdate behavior with undefined id #11079
Merged
Merged
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
06a72e3
Added check for undefined id in findByIdAndUpdate
gramliu 54f268b
Added test for undefined id in findByIdAndUpdate
gramliu 8321be2
Added argument length check for findByIdAndUpdate undefined guard
gramliu 1a57f9d
Updated test to properly check that error is thrown
gramliu 34b0488
Update model.populate.test.js
vkarpov15 7b60e4d
Update model.populate.test.js
vkarpov15 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2621,6 +2621,10 @@ function _decorateUpdateWithVersionKey(update, options, versionKey) { | |
* A.findByIdAndUpdate() // returns Query | ||
* | ||
* ####Note: | ||
* | ||
* If id is undefined and update is specified, an error will be thrown. | ||
* | ||
* ####Note: | ||
* | ||
* All top level update keys which are not `atomic` operation names are treated as set operations: | ||
* | ||
|
@@ -2676,6 +2680,9 @@ Model.findByIdAndUpdate = function(id, update, options, callback) { | |
throw new TypeError(msg); | ||
} | ||
return this.findOneAndUpdate({ _id: id }, undefined); | ||
} else if (id === undefined) { | ||
const msg = 'Model.findByIdAndUpdate(): id cannot be undefined if update is specified.\n'; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Oh, I was just following the format of the preceding error messages. I went ahead and removed it |
||
throw new TypeError(msg); | ||
} | ||
|
||
// if a model is passed in instead of an id | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Our tests rely on
Model.findByIdAndUpdate()
with no arguments working, so can we make thiselse if (arguments.length > 0 && id === undefined)
?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you for bringing this up. I forgot to consider that. I went ahead and added this to the condition