Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
1. Change from each to each_value since we did not use key
2. drop assignment of value to sum in test
  • Loading branch information
vipulnsward committed Mar 18, 2013
1 parent 4e7292c commit aee5424
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
Expand Up @@ -35,7 +35,7 @@ def association_key
# record
def associated_records_by_owner
records = {}
super.each do |owner_key, rows|
super.each_value do |rows|
rows.map! { |row| records[row[klass.primary_key]] ||= klass.instantiate(row) }
end
end
Expand Down
4 changes: 2 additions & 2 deletions activerecord/test/cases/associations/eager_test.rb
Expand Up @@ -467,7 +467,7 @@ def test_eager_with_has_many_through
posts_with_comments = people(:michael).posts.merge(:includes => :comments, :order => 'posts.id').to_a
posts_with_author = people(:michael).posts.merge(:includes => :author, :order => 'posts.id').to_a
posts_with_comments_and_author = people(:michael).posts.merge(:includes => [ :comments, :author ], :order => 'posts.id').to_a
assert_equal 2, posts_with_comments.inject(0) { |sum, post| sum += post.comments.size }
assert_equal 2, posts_with_comments.inject(0) { |sum, post| sum + post.comments.size }
assert_equal authors(:david), assert_no_queries { posts_with_author.first.author }
assert_equal authors(:david), assert_no_queries { posts_with_comments_and_author.first.author }
end
Expand Down Expand Up @@ -523,7 +523,7 @@ def test_eager_with_has_many_through_join_model_ignores_default_includes
def test_eager_with_has_many_and_limit
posts = Post.all.merge!(:order => 'posts.id asc', :includes => [ :author, :comments ], :limit => 2).to_a
assert_equal 2, posts.size
assert_equal 3, posts.inject(0) { |sum, post| sum += post.comments.size }
assert_equal 3, posts.inject(0) { |sum, post| sum + post.comments.size }
end

def test_eager_with_has_many_and_limit_and_conditions
Expand Down

0 comments on commit aee5424

Please sign in to comment.