Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Make size for has_many :through use counter cache if it exists. Closes

…#9734 [xaviershay]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7692 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit 30a652ad41428b922b1ed637f491776f1f1dff13 1 parent e5a60fb
@technoweenie technoweenie authored
View
2  activerecord/CHANGELOG
@@ -1,5 +1,7 @@
*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]
* Extract Oracle, SQLServer, and Sybase adapters into gems. [Jeremy Kemper]
View
12 activerecord/lib/active_record/associations/has_many_through_association.rb
@@ -100,7 +100,9 @@ def create!(attrs = nil)
# calling collection.size if it has. If it's more likely than not that the collection does have a size larger than zero
# and you need to fetch that collection afterwards, it'll take one less SELECT query if you use length.
def size
- loaded? ? @target.size : count
+ return @owner.send(:read_attribute, cached_counter_attribute_name) if has_cached_counter?
+ return @target.size if loaded?
+ return count
end
# Calculate sum using SQL, not Enumerable
@@ -258,6 +260,14 @@ def conditions
end
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
end
View
9 activerecord/test/associations/join_model_test.rb
@@ -457,6 +457,15 @@ def test_has_many_through_collection_size_doesnt_load_target_if_not_loaded
assert !author.comments.loaded?
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?" }
end
Please sign in to comment.
Something went wrong with that request. Please try again.