Permalink
Browse files

Add efficient #include? to AssociationCollection (for has_many/has_ma…

…ny :through/habtm). [stopdropandrew]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9200 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 4e07037 commit e223216e9ac496d4dad53c7ada1406e9e15fbb55 @technoweenie technoweenie committed Apr 1, 2008
View
@@ -1,5 +1,7 @@
*SVN*
+* Add efficient #include? to AssociationCollection (for has_many/has_many :through/habtm). [stopdropandrew]
+
* PostgreSQL: create_ and drop_database support. #9042 [ez, pedz, nicksieger]
* Ensure that validates_uniqueness_of works with with_scope. Closes #9235. [nik.wakelin, cavalle]
@@ -159,6 +159,11 @@ def replace(other_array)
end
end
+ def include?(record)
+ return false unless record.is_a?(@reflection.klass)
+ return @target.include?(record) if loaded?
+ exists?(record)
+ end
protected
def method_missing(method, *args)
@@ -1,6 +1,6 @@
module ActiveRecord
module Associations
- class HasManyThroughAssociation < AssociationProxy #:nodoc:
+ class HasManyThroughAssociation < AssociationCollection #:nodoc:
def initialize(owner, reflection)
super
reflection.check_validity!
@@ -639,7 +639,37 @@ def test_belongs_to_shared_parent
assert_equal comments.first.post, comments[1].post
end
end
+
+ def test_has_many_through_include_uses_array_include_after_loaded
+ david = authors(:david)
+ category = david.categories.first
+
+ assert_no_queries do
+ assert david.categories.loaded?
+ assert david.categories.include?(category)
+ end
+ end
+
+ def test_has_many_through_include_checks_if_record_exists_if_target_not_loaded
+ david = authors(:david)
+ category = david.categories.first
+
+ david.reload
+ assert ! david.categories.loaded?
+ assert_queries(1) do
+ assert david.categories.include?(category)
+ end
+ assert ! david.categories.loaded?
+ end
+ def test_has_many_through_include_returns_false_for_non_matching_record_to_verify_scoping
+ david = authors(:david)
+ category = Category.create!(:name => 'Not Associated')
+
+ assert ! david.categories.loaded?
+ assert ! david.categories.include?(category)
+ end
+
private
# create dynamic Post models to allow different dependency options
def find_post_with_dependency(post_id, association, association_name, dependency)
@@ -1330,6 +1330,36 @@ def test_has_many_through_respects_hash_conditions
assert_equal authors(:david).hello_post_comments, authors(:david).hello_post_comments_with_hash_conditions
end
+ def test_include_uses_array_include_after_loaded
+ firm = companies(:first_firm)
+ client = firm.clients.first
+
+ assert_no_queries do
+ assert firm.clients.loaded?
+ assert firm.clients.include?(client)
+ end
+ end
+
+ def test_include_checks_if_record_exists_if_target_not_loaded
+ firm = companies(:first_firm)
+ client = firm.clients.first
+
+ firm.reload
+ assert ! firm.clients.loaded?
+ assert_queries(1) do
+ assert firm.clients.include?(client)
+ end
+ assert ! firm.clients.loaded?
+ end
+
+ def test_include_returns_false_for_non_matching_record_to_verify_scoping
+ firm = companies(:first_firm)
+ client = Client.create!(:name => 'Not Associated')
+
+ assert ! firm.clients.loaded?
+ assert ! firm.clients.include?(client)
+ end
+
end
class BelongsToAssociationsTest < ActiveRecord::TestCase
@@ -2046,6 +2076,36 @@ def test_find_in_association
assert_equal developers(:david), active_record.developers.find(developers(:david).id), "Ruby find"
end
+ def test_include_uses_array_include_after_loaded
+ project = projects(:active_record)
+ developer = project.developers.first
+
+ assert_no_queries do
+ assert project.developers.loaded?
+ assert project.developers.include?(developer)
+ end
+ end
+
+ def test_include_checks_if_record_exists_if_target_not_loaded
+ project = projects(:active_record)
+ developer = project.developers.first
+
+ project.reload
+ assert ! project.developers.loaded?
+ assert_queries(1) do
+ assert project.developers.include?(developer)
+ end
+ assert ! project.developers.loaded?
+ end
+
+ def test_include_returns_false_for_non_matching_record_to_verify_scoping
+ project = projects(:active_record)
+ developer = Developer.create :name => "Bryan", :salary => 50_000
+
+ assert ! project.developers.loaded?
+ assert ! project.developers.include?(developer)
+ end
+
def test_find_in_association_with_custom_finder_sql
assert_equal developers(:david), projects(:active_record).developers_with_finder_sql.find(developers(:david).id), "SQL find"

4 comments on commit e223216

Contributor

knzconnor replied Jul 24, 2008

So this check prevents one from doing stuff like overloading eql? and == for custom collection behavior.

Contributor

knzconnor replied Jul 24, 2008

I meant to comment here. See below.

Member

NZKoz replied Jul 25, 2008

Could you raise this on lighthouse / the core list. I assume it continues to work if the larget is loaded already?

Contributor

knzconnor replied Aug 7, 2008

Meh, perhaps my use case is a bit of an abuse/edge case, anyway? I think I’d shoot down my own ticket. I’ll see about clarifying and making one if you like though.

Please sign in to comment.