diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2011-12-28 17:03:37 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2011-12-28 17:04:23 -0800 |
| commit | f423bdc10b52e2f131f3596833d3a37f9773d820 (patch) | |
| tree | 15af7b412d4c4fd57cc785729572a7d08d143b0e /activerecord/lib/active_record/relation | |
| parent | 80f2eeb138c4a7901b7b015a6f56445902a9f1ab (diff) | |
| download | rails-f423bdc10b52e2f131f3596833d3a37f9773d820.tar.gz rails-f423bdc10b52e2f131f3596833d3a37f9773d820.tar.bz2 rails-f423bdc10b52e2f131f3596833d3a37f9773d820.zip | |
Merge pull request #4216 from edgecase/master_fix_reorder_with_limited_ids
allow reorder to affect eager loading correctly
Diffstat (limited to 'activerecord/lib/active_record/relation')
| -rw-r--r-- | activerecord/lib/active_record/relation/finder_methods.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/relation/finder_methods.rb b/activerecord/lib/active_record/relation/finder_methods.rb index 3c8e0f2052..7fe50b93a1 100644 --- a/activerecord/lib/active_record/relation/finder_methods.rb +++ b/activerecord/lib/active_record/relation/finder_methods.rb @@ -249,7 +249,7 @@ module ActiveRecord end def construct_limited_ids_condition(relation) - orders = relation.order_values.map { |val| val.presence }.compact + orders = (relation.reorder_value || relation.order_values).map { |val| val.presence }.compact values = @klass.connection.distinct("#{@klass.connection.quote_table_name table_name}.#{primary_key}", orders) relation = relation.dup |