Ticket #6822: association_callbacks_fix.diff

test/associations_test.rb

@@ -72 +72 @@
-    end
-  end
-end
-
+
-class AssociationProxyTest < Test::Unit::TestCase
-  fixtures :authors, :posts, :categorizations, :categories, :developers, :projects, :developers_projects
-
+
-  def test_proxy_accessors
-    welcome = posts(:welcome)
-    assert_equal  welcome, welcome.author.proxy_owner
-    assert_equal  welcome.class.reflect_on_association(:author), welcome.author.proxy_reflection
-    welcome.author.class  # force load target
-    assert_equal  welcome.author, welcome.author.proxy_target
-
+
-    david = authors(:david)
-    assert_equal  david, david.posts.proxy_owner
-    assert_equal  david.class.reflect_on_association(:posts), david.posts.proxy_reflection
-    david.posts.first   # force load target
-    assert_equal  david.posts, david.posts.proxy_target
-
+
-    assert_equal  david, david.posts_with_extension.testing_proxy_owner
-    assert_equal  david.class.reflect_on_association(:posts_with_extension), david.posts_with_extension.testing_proxy_reflection
-    david.posts_with_extension.first   # force load target
@@ -98 +98 @@
-  def test_push_does_not_load_target
-    david = authors(:david)
-
+    david.posts << (post = Post.new(:title => "New on Edge", :body => "More cool stuff!"))
+    assert !david.posts.loaded?
+    assert david.posts.include?(post)
+  end
+
+  def test_push_has_many_through_does_not_load_target
+    david = authors(:david)
+
-    david.categories << categories(:technology)
-    assert !david.categories.loaded?
-    assert david.categories.include?(categories(:technology))
-  end
+  
+  def test_push_followed_by_save_does_not_load_target
+    david = authors(:david)
-
+    david.posts << (post = Post.new(:title => "New on Edge", :body => "More cool stuff!"))
+    assert !david.posts.loaded?
+    david.save
+    assert !david.posts.loaded?
+    assert david.posts.include?(post)
+  end
+
-  def test_push_does_not_lose_additions_to_new_record
-    josh = Author.new(:name => "Josh")
-    josh.posts << Post.new(:title => "New on Edge", :body => "More cool stuff!")
@@ -772 +790 @@
-    assert companies(:first_firm).save
-    assert_equal 3, companies(:first_firm).clients_of_firm(true).size
-  end
-
+
+
+
+
+
+
+
-  def test_build_without_loading_association
-    first_topic = topics(:first)
-    Reply.column_names
@@ -825 +849 @@
-    assert_equal 3, companies(:first_firm).clients_of_firm(true).size
-  end
-
+  def test_create_followed_by_save_does_not_load_target
+    new_client = companies(:first_firm).clients_of_firm.create("name" => "Another Client")
+    assert companies(:first_firm).save
+    assert !companies(:first_firm).clients_of_firm.loaded?
+  end
+
-  def test_find_or_initialize
-    the_client = companies(:first_firm).clients.find_or_initialize_by_name("Yet another client")
-    assert_equal companies(:first_firm).id, the_client.firm_id

lib/active_record/associations.rb

@@ -1066 +1066 @@
-            if association.respond_to?(:loaded?)
-              if new_record?
-                association
+              elsif association.loaded?
+                association.select { |record| record.new_record? }
-              else
-
+target.
-              end.each do |record|
-                errors.add "#{association_name}" unless record.valid?
-              end
@@ -1084 +1086 @@
-              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