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.

Sign up for GitHub

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

Jump to bottom

allow reorder to affect eager loading correctly #4216

Merged
merged 1 commit into from Dec 29, 2011
Merged

allow reorder to affect eager loading correctly #4216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion activerecord/lib/active_record/relation/finder_methods.rb
View file
Open in desktop
Expand Up @@ -249,7 +249,7 @@ def apply_join_dependency(relation, join_dependency)
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
Expand Down
10 changes: 10 additions & 0 deletions activerecord/test/cases/associations/has_many_associations_test.rb
View file
Open in desktop
Expand Up @@ -57,6 +57,16 @@ def test_should_count_distinct_results
end
end

class HasManyAssociationsTestForReorderWithJoinDependency < ActiveRecord::TestCase
fixtures :authors, :posts, :comments

def test_should_generate_valid_sql
author = authors(:david)
# this can fail on adapters which require ORDER BY expressions to be included in the SELECT expression
# if the reorder clauses are not correctly handled
assert author.posts_with_comments_sorted_by_comment_id.where('comments.id > 0').reorder('posts.comments_count DESC', 'posts.taggings_count DESC').last
end
end


class HasManyAssociationsTest < ActiveRecord::TestCase
Expand Down