Avoid overwriting association conditions with default scope in Rails 3 #560
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
| if default_conditions.any? | ||
| reflection.options[:conditions] = default_conditions | ||
| return if reflection.instance_variable_get(:@_ransack_applied_default_conditions) | ||
| assoc_scope = join_association.active_record.where(reflection.options[:conditions]) |
|
Found issues: it doesn't handle conditions on aliased table names, and I think we can avoid altering the conditions on the original association reflection (this is held by the parent class globally so it's best not to mutate anything on it). I will resubmit with some improvements. |
When joining ransackable associations in Rails 3, preserve both: * association default_scope * association conditions Combining the stashed JoinAssociation with a separate string join for the "AND" conditions looks like a hack, but there is no cleaner way to extract the default_scope conditions with correct table aliases and merge them back into the association since ActiveRecord rebuilds its own join parts when generating the query.
avit
force-pushed
the
association-conditions-rails3
branch
from
1be6ff2 to
9f778e8
Compare
jonatack
added a commit
that referenced
this pull request
Jul 12, 2015
Avoid overwriting association conditions with default scope in Rails 3
|
Thanks @avit! |
|
Could you update the change log with your fix? |
jonatack
added a commit
that referenced
this pull request
Jul 18, 2015
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.
This is a fix on top of my previous pull request #426 where I fixed one bug but potentially introduced another. 🙊
When a model with default scope was associated with conditions (
has_many :x, conditions: ...), the default scope would overwrite the association conditions. This patch ensures that both sources of conditions are applied.