[Fix #50812] Don't duplicate selects, inner and outer joins when merging with STI #50886
+37
−4
Conversation
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
joshuay03
commented
Jan 26, 2024
| comments = Comment.select(:id, :post_id).merge(SpecialComment.select(:id, :post_id)) | ||
| assert_equal SpecialComment.pluck(:id).sort, comments.to_a.map(&:id).sort | ||
| assert_equal SpecialComment.pluck(:post_id).sort, comments.to_a.map(&:post_id).sort | ||
| assert_equal [:id, :post_id], comments.select_values |
joshuay03
commented
Jan 26, 2024
| def test_relation_merging_with_joins_and_sti | ||
| comments = Comment.joins(:post).merge(SpecialComment.joins(:post)) | ||
| assert_equal SpecialComment.count, comments.count | ||
| assert_equal [:post], comments.joins_values |
joshuay03
commented
Jan 26, 2024
| def test_relation_merging_with_left_outer_joins_and_sti | ||
| comments = Comment.left_outer_joins(:post).merge(SpecialComment.left_outer_joins(:post)) | ||
| assert_equal SpecialComment.count, comments.count | ||
| assert_equal [:post], comments.left_outer_joins_values |
joshuay03
commented
Jan 26, 2024
Comment on lines
+380
to
+386
| def base_class | ||
| self | ||
| end |
There was a problem hiding this comment.
This was necessary else this test now fails with:
joshuay03
force-pushed
the
fix-duplicate-select-inner-and-outer-join-on-merge
branch
2 times, most recently
from
40566c5
to
b2e4fad
Compare
joshuay03
changed the title
joshuay03
force-pushed
the
fix-duplicate-select-inner-and-outer-join-on-merge
branch
from
b2e4fad
to
7c46503
Compare
joshuay03
force-pushed
the
fix-duplicate-select-inner-and-outer-join-on-merge
branch
from
7c46503
to
d9946d2
Compare
joshuay03
force-pushed
the
fix-duplicate-select-inner-and-outer-join-on-merge
branch
2 times, most recently
from
c58d2a1
to
0b9cb38
Compare
joshuay03
force-pushed
the
fix-duplicate-select-inner-and-outer-join-on-merge
branch
from
0b9cb38
to
ebfbac6
Compare
… merging with STI
joshuay03
force-pushed
the
fix-duplicate-select-inner-and-outer-join-on-merge
branch
from
ebfbac6
to
dd7d2e1
Compare
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
Fixes #50812
Detail
This Pull Request changes
#merge_select_values,#merge_joinsand#merge_outer_joinsinActiveRecord::Relation::Mergerto unionise selects, inner and outer joins when the two sources of amergeare related via STI.Additional information
The only similar case left in
ActiveRecord::Relation::Mergeris when merging preloads.I don't think that is similar to these cases since the preload values are simply used to preload associations. I thought I would just mention it anyway.
Checklist
Before submitting the PR make sure the following are checked:
[Fix #issue-number]