Skip to content
Browse files

Optimize <association>_ids for hm:t with belongs_to source

  • Loading branch information...
1 parent c863388 commit 373b053dc8b99dac1abc3879a17a2bf8c30302b5 @lifo lifo committed
View
9 activerecord/lib/active_record/associations.rb
@@ -1273,9 +1273,16 @@ def collection_reader_method(reflection, association_proxy_class)
if send(reflection.name).loaded? || reflection.options[:finder_sql]
send(reflection.name).map(&:id)
else
- send(reflection.name).all(:select => "#{reflection.quoted_table_name}.#{reflection.klass.primary_key}").map(&:id)
+ if reflection.through_reflection && reflection.source_reflection.belongs_to?
+ through = reflection.through_reflection
+ primary_key = reflection.source_reflection.primary_key_name
+ send(through.name).all(:select => "DISTINCT #{through.quoted_table_name}.#{primary_key}").map(&:"#{primary_key}")
+ else
+ send(reflection.name).all(:select => "#{reflection.quoted_table_name}.#{reflection.klass.primary_key}").map(&:id)
+ end
end
end
+
end
def collection_accessor_methods(reflection, association_proxy_class, writer = true)
View
8 activerecord/test/cases/associations/has_many_through_associations_test.rb
@@ -243,8 +243,12 @@ def test_inner_join_with_quoted_table_name
assert_equal 2, people(:michael).jobs.size
end
- def test_get_ids
- assert_equal [posts(:welcome).id, posts(:authorless).id].sort, people(:michael).post_ids.sort
+ def test_get_ids_for_belongs_to_source
+ assert_sql(/DISTINCT/) { assert_equal [posts(:welcome).id, posts(:authorless).id].sort, people(:michael).post_ids.sort }
+ end
+
+ def test_get_ids_for_has_many_source
+ assert_equal [comments(:eager_other_comment1).id], authors(:mary).comment_ids
end
def test_get_ids_for_loaded_associations

0 comments on commit 373b053

Please sign in to comment.
Something went wrong with that request. Please try again.