Changeset 7692

Timestamp:

09/30/07 06:47:20 (2 years ago)

Author:

rick

Message:

Make size for has_many :through use counter cache if it exists. Closes #9734 [xaviershay]

Files:

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

trunk/activerecord/CHANGELOG

@@ -1 +1 @@
-*2.0.0 [Preview Release]* (September 29th, 2007) [Includes duplicates of changes from 1.14.2 - 1.15.3]
+
+* Make size for has_many :through use counter cache if it exists.  Closes #9734 [xaviershay]
-
-* Remove DB2 adapter since IBM chooses to maintain their own adapter instead.  [Jeremy Kemper]

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

@@ -101 +101 @@
-      # and you need to fetch that collection afterwards, it'll take one less SELECT query if you use length.
-      def size
-
+
+
+
-      end
-
@@ -259 +261 @@
-
-        alias_method :sql_conditions, :conditions
+
+        def has_cached_counter?
+          @owner.attribute_present?(cached_counter_attribute_name)
+        end
+
+        def cached_counter_attribute_name
+          "#{@reflection.name}_count"
+        end
-    end
-  end

trunk/activerecord/test/associations/join_model_test.rb

@@ -458 +458 @@
-  end
-
+  uses_mocha('has_many_through_collection_size_uses_counter_cache_if_it_exists') do
+    def test_has_many_through_collection_size_uses_counter_cache_if_it_exists
+      author = authors(:david)
+      author.stubs(:read_attribute).with('comments_count').returns(100)
+      assert_equal 100, author.comments.size
+      assert !author.comments.loaded?
+    end
+  end
+
-  def test_adding_junk_to_has_many_through_should_raise_type_mismatch
-    assert_raise(ActiveRecord::AssociationTypeMismatch) { posts(:thinking).tags << "Uhh what now?" }