don't apply invalid ordering when preloading hmt associations. #9391
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
|
/cc @carlosantoniodasilva @rafaelfranca @jonleighton as discussed, this patch is based on selectively adding the order wether we are preloading or not. |
| @@ -47,12 +47,12 @@ def through_scope | |||
| through_scope.where! reflection.foreign_type => options[:source_type] | |||
| else | |||
| unless reflection_scope.where_values.empty? | |||
| through_scope.includes_values = reflection_scope.values[:includes] || options[:source] | |||
| through_scope.includes_values = Array(reflection_scope.values[:includes] || options[:source]) | |||
There was a problem hiding this comment.
Why do we need this Array call?
There was a problem hiding this comment.
include_values must be an array. Otherwise the call to #eager_loading? will blow up.
|
Seems good. Needs a rebase |
closes rails#8663. When preloading a hmt association there two possible scenarios: 1.) preload with 2 queries: first hm association, then hmt with id IN () 2.) preload with join: hmt association is loaded with a join on the hm association The bug was happening in scenario 1.) with a normal order clause on the hmt association. The ordering was also applied when loading the hm association, which resulted in the error. This patch only applies the ordering the the hm-relation if we are performing a join (2). Otherwise the order will only appear in the second query (1).
|
@rafaelfranca rebased. |
rafaelfranca
added a commit
that referenced
this pull request
Feb 24, 2013
…ludes don't apply invalid ordering when preloading hmt associations.
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.
closes #8663.
When preloading a hmt association there two possible scenarios:
1.) preload with 2 queries: first hm association, then hmt with id IN ()
2.) preload with join: hmt association is loaded with a join on the hm association
The bug was happening in scenario 1.) with a normal order clause on the hmt association.
The ordering was also applied when loading the hm association, which resulted in the error.
This patch only applies the ordering the the hm-relation if we are performing a join (2).
Otherwise the order will only appear in the second query (1).