Ticket #6822: has_many_after_update_callback_should_not_unnecessarily_load_association.diff

activerecord/test/associations/callbacks_test.rb

@@ -122 +122 @@
-                    "after_adding#{david.id}"], activerecord.developers_log
-    end
-  end
+  
+  def test_has_many_after_update_callback_does_not_unnecessarily_load_association
+    david = authors(:david)
+    david.posts.create
+    assert !david.posts.loaded?
+    david.save
+    assert !david.posts.loaded?
+  end
-end
-

activerecord/lib/active_record/associations.rb

@@ -958 +958 @@
-            if association.respond_to?(:loaded?)
-              if new_record?
-                association
+              elsif association.loaded?
+                association.select { |record| record.new_record? }
-              else
-association.select { |record| record.new_record? }
+[]
-              end.each do |record|
-                errors.add "#{association_name}" unless record.valid?
-              end
@@ -973 +975 @@
-            association = instance_variable_get("@#{association_name}")
-            
-            if association.respond_to?(:loaded?)
-
-
-
-
-
+
+
+
+
+
+
+
+
-              records_to_save.each { |record| association.send(:insert_record, record) }
-              association.send(:construct_sql)   # reconstruct the SQL queries now that we know the owner's id
-            end