diff options
author | David Heinemeier Hansson <david@loudthinking.com> | 2006-05-21 19:17:37 +0000 |
---|---|---|
committer | David Heinemeier Hansson <david@loudthinking.com> | 2006-05-21 19:17:37 +0000 |
commit | 66586bc168f358e3385416def6eb30ad1242ffe6 (patch) | |
tree | 5123f76617348e2f3ad908945586f426650b097b | |
parent | 59c8c63ecd751136c5ed6d2e3c04a54af2025eb0 (diff) | |
download | rails-66586bc168f358e3385416def6eb30ad1242ffe6.tar.gz rails-66586bc168f358e3385416def6eb30ad1242ffe6.tar.bz2 rails-66586bc168f358e3385416def6eb30ad1242ffe6.zip |
Fixed that has_many collections shouldn't load the entire association to do build or create [DHH]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4354 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
-rw-r--r-- | activerecord/CHANGELOG | 2 | ||||
-rw-r--r-- | activerecord/lib/active_record/associations/association_collection.rb | 9 | ||||
-rw-r--r-- | activerecord/lib/active_record/associations/has_many_association.rb | 29 | ||||
-rwxr-xr-x | activerecord/test/associations_test.rb | 29 |
4 files changed, 66 insertions, 3 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG index 06d9db76fb..044d6e3205 100644 --- a/activerecord/CHANGELOG +++ b/activerecord/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Fixed that has_many collections shouldn't load the entire association to do build or create [DHH] + * Added :allow_nil option for aggregations #5091 [ian.w.white@gmail.com] * Fix Oracle boolean support and tests. Closes #5139. [schoenm@earthlink.net] diff --git a/activerecord/lib/active_record/associations/association_collection.rb b/activerecord/lib/active_record/associations/association_collection.rb index 428152eea0..9c27411a3e 100644 --- a/activerecord/lib/active_record/associations/association_collection.rb +++ b/activerecord/lib/active_record/associations/association_collection.rb @@ -95,7 +95,14 @@ module ActiveRecord # 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 - if loaded? && !@reflection.options[:uniq] then @target.size else count_records end + if loaded? && !@reflection.options[:uniq] + @target.size + elsif !loaded? && !@reflection.options[:uniq] && @target.is_a?(Array) + unsaved_records = Array(@target.detect { |r| r.new_record? }).size + unsaved_records + count_records + else + count_records + end end # Returns the size of the collection by loading it and calling size on the array. If you want to use this method to check diff --git a/activerecord/lib/active_record/associations/has_many_association.rb b/activerecord/lib/active_record/associations/has_many_association.rb index 912e0aa390..6a2089c7b8 100644 --- a/activerecord/lib/active_record/associations/has_many_association.rb +++ b/activerecord/lib/active_record/associations/has_many_association.rb @@ -10,10 +10,16 @@ module ActiveRecord if attributes.is_a?(Array) attributes.collect { |attr| build(attr) } else - load_target record = @reflection.klass.new(attributes) set_belongs_to_association_for(record) - @target << record + + if loaded? + @target << record + else + @target ||= [] + @target << record + end + record end end @@ -107,6 +113,25 @@ module ActiveRecord end end + def load_target + if !@owner.new_record? || foreign_key_present + begin + if !loaded? + if @target.is_a?(Array) && @target.any? + @target = find_target + @target + else + @target = find_target + end + end + rescue ActiveRecord::RecordNotFound + reset + end + end + + loaded if target + target + end + def count_records count = if has_cached_counter? @owner.send(:read_attribute, cached_counter_attribute_name) diff --git a/activerecord/test/associations_test.rb b/activerecord/test/associations_test.rb index 6076b10446..f3e210bf77 100755 --- a/activerecord/test/associations_test.rb +++ b/activerecord/test/associations_test.rb @@ -512,6 +512,35 @@ class HasManyAssociationsTest < Test::Unit::TestCase assert_equal 3, companies(:first_firm).clients_of_firm(true).size end + def test_build_without_loading_association + first_topic = Topic.find(:first) + Reply.column_names + + assert_equal 1, first_topic.replies.length + + assert_no_queries do + first_topic.replies.build(:title => "Not saved", :content => "Superstars") + assert_equal 2, first_topic.replies.size + end + + assert_equal 2, first_topic.replies.to_ary.size + end + + def test_create_without_loading_association + first_firm = companies(:first_firm) + Firm.column_names + Client.column_names + + assert_equal 1, first_firm.clients_of_firm.size + first_firm.clients_of_firm.reset + + assert_queries(1) do + first_firm.clients_of_firm.create(:name => "Superstars") + end + + assert_equal 2, first_firm.clients_of_firm.size + end + def test_invalid_build new_client = companies(:first_firm).clients_of_firm.build assert new_client.new_record? |