Ticket #8246: type_mismatch.patch

a/activerecord/lib/active_record/associations/association_proxy.rb

@@ -209 +209 @@
-        end
-
-        def raise_on_type_mismatch(record)
-
-klass} expected, got #{record.class}
+ || record.is_a?(eval(@reflection.class_name))
+class_name} (class id=#{@reflection.klass.object_id}) expected, got #{record.class} (class id=#{record.class.object_id})
-          end
-        end
-

/dev/null

@@ +1 @@
+require "cases/helper"
+require 'models/owner'
+require 'models/pet'
+
+class ReloadModelsTest < ActiveRecord::TestCase
+  def setup
+  end
+
+  def teardown
+  end
+
+  def test_has_one_with_reload
+    # Reload the class Owner, simulating auto-reloading of model classes in a
+    # development environment. Note that meanwhile the class Pet is not 
+    # reloaded, simulating a class that is present in a plugin.
+    Object.class_eval { remove_const :Owner }
+    Kernel.load(File.expand_path(File.join(File.dirname(__FILE__), "../models/owner.rb")))
+
+    pet = Pet.find_by_name('parrot')
+    pet.owner = Owner.find_by_name('ashley')
+    # After reload this assignment failed with the error message: 
+    #   ActiveRecord::AssociationTypeMismatch: Owner expected, got Owner
+    # See also http://dev.rubyonrails.org/ticket/8246
+
+    assert_equal pet.owner, Owner.find_by_name('ashley')
+  end
+
+end