0
@@ -1,5 +1,7 @@
0
 *SVN*
0
 
0
+* Ensure HABTM#create and HABTM#build do not load entire association. [Pratik]
0
+
0
 * Improve documentation. [Xavier Noria, Jack Danger Canty, leethal]
0
 
0
 * Tweak ActiveRecord::Base#to_json to include a root value in the returned hash: {"post": {"title": ...}} [rick]

0
@@ -166,6 +166,25 @@ module ActiveRecord
0
       end
0
 
0
       protected
0
+        def load_target
0
+          if !@owner.new_record? || foreign_key_present
0
+            begin
0
+              if !loaded?
0
+                if @target.is_a?(Array) && @target.any?
0
+                  @target = find_target + @target.find_all {|t| t.new_record? }
0
+                else
0
+                  @target = find_target
0
+                end
0
+              end
0
+            rescue ActiveRecord::RecordNotFound
0
+              reset
0
+            end
0
+          end
0
+
0
+          loaded if target
0
+          target
0
+        end
0
+        
0
         def method_missing(method, *args)
0
           if @target.respond_to?(method) || (!@reflection.klass.respond_to?(method) && Class.respond_to?(method))
0
             if block_given?

0
@@ -7,7 +7,6 @@ module ActiveRecord
0
       end
0
 
0
       def build(attributes = {})
0
-        load_target
0
         build_record(attributes)
0
       end
0
 
0
@@ -154,7 +153,6 @@ module ActiveRecord
0
           if attributes.is_a?(Array)
0
             attributes.collect { |attr| create(attr) }
0
           else
0
-            load_target
0
             build_record(attributes, &block)
0
           end
0
         end

0
@@ -68,25 +68,6 @@ module ActiveRecord
0
       end
0
 
0
       protected
0
-        def load_target
0
-          if !@owner.new_record? || foreign_key_present
0
-            begin
0
-              if !loaded?
0
-                if @target.is_a?(Array) && @target.any?
0
-                  @target = (find_target + @target).uniq
0
-                else
0
-                  @target = find_target
0
-                end
0
-              end
0
-            rescue ActiveRecord::RecordNotFound
0
-              reset
0
-            end
0
-          end
0
-
0
-          loaded if target
0
-          target
0
-        end
0
-
0
         def count_records
0
           count = if has_cached_counter?
0
             @owner.send(:read_attribute, cached_counter_attribute_name)

0
@@ -872,21 +872,25 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
0
   end
0
 
0
   def test_build
0
-    new_client = companies(:first_firm).clients_of_firm.build("name" => "Another Client")
0
+    company = companies(:first_firm)
0
+    new_client = assert_no_queries { company.clients_of_firm.build("name" => "Another Client") }
0
+    assert !company.clients_of_firm.loaded?
0
+    
0
     assert_equal "Another Client", new_client.name
0
     assert new_client.new_record?
0
-    assert_equal new_client, companies(:first_firm).clients_of_firm.last
0
-    assert companies(:first_firm).save
0
+    assert_equal new_client, company.clients_of_firm.last
0
+    assert_queries(2) { assert company.save }
0
     assert !new_client.new_record?
0
-    assert_equal 2, companies(:first_firm).clients_of_firm(true).size
0
+    assert_equal 2, company.clients_of_firm(true).size
0
   end
0
 
0
   def test_build_many
0
-    new_clients = companies(:first_firm).clients_of_firm.build([{"name" => "Another Client"}, {"name" => "Another Client II"}])
0
+    company = companies(:first_firm)
0
+    new_clients = assert_no_queries { company.clients_of_firm.build([{"name" => "Another Client"}, {"name" => "Another Client II"}]) }
0
+    
0
     assert_equal 2, new_clients.size
0
-
0
-    assert companies(:first_firm).save
0
-    assert_equal 3, companies(:first_firm).clients_of_firm(true).size
0
+    assert_queries(3) { assert company.save }
0
+    assert_equal 3, company.clients_of_firm(true).size
0
   end
0
 
0
   def test_build_followed_by_save_does_not_load_target
0
@@ -1908,8 +1912,12 @@ class HasAndBelongsToManyAssociationsTest < ActiveRecord::TestCase
0
 
0
   def test_build
0
     devel = Developer.find(1)
0
-    proj = devel.projects.build("name" => "Projekt")
0
+    proj = assert_no_queries { devel.projects.build("name" => "Projekt") }
0
+    assert !devel.projects.loaded?
0
+    
0
     assert_equal devel.projects.last, proj
0
+    assert devel.projects.loaded?
0
+    
0
     assert proj.new_record?
0
     devel.save
0
     assert !proj.new_record?
0
@@ -1933,7 +1941,11 @@ class HasAndBelongsToManyAssociationsTest < ActiveRecord::TestCase
0
   def test_create
0
     devel = Developer.find(1)
0
     proj = devel.projects.create("name" => "Projekt")
0
+    assert !devel.projects.loaded?
0
+    
0
     assert_equal devel.projects.last, proj
0
+    assert devel.projects.loaded?
0
+    
0
     assert !proj.new_record?
0
     assert_equal Developer.find(1).projects.sort_by(&:id).last, proj  # prove join table is updated
0
   end
0
@@ -1964,10 +1976,12 @@ class HasAndBelongsToManyAssociationsTest < ActiveRecord::TestCase
0
   end
0
 
0
   def test_uniq_after_the_fact
0
-    developers(:jamis).projects << projects(:active_record)
0
-    developers(:jamis).projects << projects(:active_record)
0
-    assert_equal 3, developers(:jamis).projects.size
0
-    assert_equal 1, developers(:jamis).projects.uniq.size
0
+    dev = developers(:jamis)
0
+    dev.projects << projects(:active_record)
0
+    dev.projects << projects(:active_record)
0
+    
0
+    assert_equal 3, dev.projects.size
0
+    assert_equal 1, dev.projects.uniq.size
0
   end
0
 
0
   def test_uniq_before_the_fact