Changeset 9200

Timestamp:

04/01/08 18:27:22 (3 months ago)

Author:

rick

Message:

Add efficient #include? to AssociationCollection (for has_many/has_many :through/habtm). [stopdropandrew]

Files:

• trunk/activerecord/CHANGELOG (modified) (1 diff)
• trunk/activerecord/lib/active_record/associations/association_collection.rb (modified) (1 diff)
• trunk/activerecord/lib/active_record/associations/has_many_through_association.rb (modified) (1 diff)
• trunk/activerecord/test/cases/associations_test.rb (modified) (2 diffs)
• trunk/activerecord/test/cases/associations/join_model_test.rb (modified) (1 diff)

trunk/activerecord/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Add efficient #include? to AssociationCollection (for has_many/has_many :through/habtm).  [stopdropandrew]
-
-* PostgreSQL: create_ and drop_database support.  #9042 [ez, pedz, nicksieger]

trunk/activerecord/lib/active_record/associations/association_collection.rb

@@ -160 +160 @@
-      end
-
+      def include?(record)
+        return false unless record.is_a?(@reflection.klass)
+        return @target.include?(record) if loaded?
+        exists?(record)
+      end
-
-      protected

trunk/activerecord/lib/active_record/associations/has_many_through_association.rb

@@ -1 +1 @@
-module ActiveRecord
-  module Associations
-Proxy
+Collection
-      def initialize(owner, reflection)
-        super

trunk/activerecord/test/cases/associations_test.rb

@@ -1331 +1331 @@
-  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
-
@@ -2047 +2077 @@
-  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"

trunk/activerecord/test/cases/associations/join_model_test.rb

@@ -640 +640 @@
-    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