Fix polymorphic belongs_to to correctly use parent's query_constraints#50321
Merged
eileencodes merged 1 commit intorails:mainfrom Dec 11, 2023
Merged
Conversation
eileencodes
reviewed
Dec 11, 2023
| if primary_key = options[:primary_key] | ||
| @association_primary_key ||= -primary_key.to_s | ||
| elsif !polymorphic? && ((klass || self.klass).has_query_constraints? || options[:query_constraints]) | ||
| elsif (klass || self.klass).has_query_constraints? || options[:query_constraints] |
Member
There was a problem hiding this comment.
Hrm, I originally added the !polymorphic? check because klass can't always be computed on those associations, but this seems to be working fine based on the tests.
eileencodes
added a commit
that referenced
this pull request
Dec 11, 2023
…ith-query_constraints Fix polymorphic `belongs_to` to correctly use parent's `query_constraints`
Member
|
Thanks @fatkodima - I backported this to 7-1-stable in 59e72b0 |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Fixes #50315.
For polymorphic association with query constraints, we get incorrect value for primary key (specifically,
"id"in the referenced issue) hererails/activerecord/lib/active_record/reflection.rb
Lines 870 to 882 in 5c4a7a7
which then incorrectly matches with foreign key (specifically,
["tenant_id", "commentable_id"]in the referenced issue) hererails/activerecord/lib/active_record/associations/association_scope.rb
Lines 58 to 63 in 5c4a7a7
With this change,
association_primary_keynow correctly returns["tenant_id", "id"].