Ticket #8713: 0001-Fix-regression-in-r7076-to-save-built-records-on-an.patch

a/activerecord/lib/active_record/associations.rb

@@ -986 +986 @@
-            if association.respond_to?(:loaded?)
-              if new_record?
-                association
-e
+if association.loaded?
-                association.select { |record| record.new_record? }
+              else
+                association.target.select { |record| record.new_record? }
-              end.each do |record|
-                errors.add "#{association_name}" unless record.valid?
-              end
@@ -1004 +1006 @@
-              association
-            elsif association.respond_to?(:loaded?) && association.loaded?
-              association.select { |record| record.new_record? }
+            elsif association.respond_to?(:loaded?) && !association.loaded?
+              association.target.select { |record| record.new_record? }
-            else
-              []
-            end
-
-            records_to_save.each { |record| association.send(:insert_record, record) } unless records_to_save.blank?
-
+
-            # reconstruct the SQL queries now that we know the owner's id
-            association.send(:construct_sql) if association.respond_to?(:construct_sql)
-          end_eval

a/activerecord/test/associations_test.rb

@@ -687 +687 @@
-    assert_equal 3, companies(:first_firm).clients_of_firm(true).size
-  end
-
+  def test_save_without_validations_after_build_without_loading_association
+    first_topic = topics(:first)
+    Reply.column_names
+
+    assert_equal 1, first_topic.replies.size
+    new_reply = nil
+
+    assert_no_queries do
+      new_reply = first_topic.replies.build(:title => "Not saved", :content => "Superstars")
+      assert new_reply.new_record?
+      assert_equal 2, first_topic.replies.size
+    end
+    assert first_topic.save(false)
+    assert !new_reply.new_record?
+    assert !first_topic.replies.loaded?
+
+    assert_equal 2, first_topic.replies.to_ary.size
+  end
+
-  def test_build_without_loading_association
-    first_topic = topics(:first)
-    Reply.column_names