Skip to content
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 relation merging with skip_query_cache! #32645

Merged
merged 1 commit into from
Apr 19, 2018

Conversation

maneframe
Copy link
Contributor

Summary

Allow skip_query_cache to receive an argument, similar to other methods (e.g. distinct!)

Fixes an issue where ActiveRecord::Relation::Merger tries to send the value to the other relation when it's set https://github.com/rails/rails/blob/master/activerecord/lib/active_record/relation/merger.rb#L76

Fixes #32640

@rails-bot
Copy link

Thanks for the pull request, and welcome! The Rails team is excited to review your changes, and you should hear from @pixeltrix (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

This repository is being automatically checked for code quality issues using Code Climate. You can see results for this analysis in the PR status below. Newly introduced issues should be fixed before a Pull Request is considered ready to review.

Please see the contribution instructions for more information.

@rafaelfranca
Copy link
Member

See #32640 (comment)

@rafaelfranca rafaelfranca reopened this Apr 19, 2018
rafaelfranca added a commit that referenced this pull request Apr 19, 2018
Fix relation merging with skip_query_cache!
@rafaelfranca rafaelfranca merged commit 28ef2de into rails:master Apr 19, 2018
rafaelfranca added a commit that referenced this pull request Apr 19, 2018
Fix relation merging with skip_query_cache!
bogdanvlviv added a commit to bogdanvlviv/rails that referenced this pull request Apr 20, 2018
First argument to `assert_equal` should be expected value,
second - actual value.

Use `assert` in order to assert that `skip_query_cache_value` is truly
object since we rely on Ruby semantics.

Related to rails#32645
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants