Allow passing nil to rewhere method #48120
Merged
Conversation
This file contains hidden or 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
byroot
requested changes
May 4, 2023
| @@ -944,6 +944,8 @@ def where!(opts, *rest) # :nodoc: | |||
| # This is short-hand for <tt>unscope(where: conditions.keys).where(conditions)</tt>. | |||
| # Note that unlike reorder, we're only unscoping the named conditions -- not the entire where statement. | |||
| def rewhere(conditions) | |||
| return spawn.unscope(:where) if conditions.nil? | |||
There was a problem hiding this comment.
unscope calls spawn already.
Suggested change
| return spawn.unscope(:where) if conditions.nil? | |
| return unscope(:where) if conditions.nil? |
There was a problem hiding this comment.
@byroot
thank you for your review 🙇♀️
I fixed it.
a5-stable
force-pushed
the
rewhere-with-nil
branch
from
82afe58 to
0924095
Compare
|
Thank you for your review, I've integrated the proposed modifications. return spawn.unscope(:where) if conditions.nil?
↓
return unscope(:where) if conditions.nil? |
byroot
approved these changes
May 4, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Motivation / Background
This Pull Request has been created because [REPLACE ME]
Detail
This change allows nil to be passed as a parameter to the rewhere method in ActiveRecord, instead of raising an error.
before
after
Additional information
Currently, reorder(nil) is allowed to remove the current ordering, while rewhere(nil) raises an error. This change modifies the implementation of rewhere to allow nil to be passed as a parameter, bringing it in line with reorder.
Checklist
Before submitting the PR make sure the following are checked:
[Fix #issue-number]