@@ -109,7 +109,7 @@ module ActiveRecord # Returns +true+ if +self+ and +other_aggregation+ have the same +name+ attribute, +active_record+ attribute, # and +other_aggregation+ has an options hash assigned to it. def ==(other_aggregation) - name == other_aggregation.name && other_aggregation.options && active_record == other_aggregation.active_record + other_aggregation.kind_of?(self.class) && name == other_aggregation.name && other_aggregation.options && active_record == other_aggregation.active_record end def sanitized_conditions #:nodoc: activerecord/lib/active_record/reflection.rb @@ -166,6 +166,10 @@ class ReflectionTest < ActiveRecord::TestCase assert_equal 0, Firm.reflect_on_all_associations(:belongs_to).size end + def test_reflection_should_not_raise_error_when_compared_to_other_object + assert_nothing_raised { Firm.reflections[:clients] == Object.new } + end + private def assert_reflection(klass, association, options) assert reflection = klass.reflect_on_association(association) activerecord/test/cases/reflection_test.rb b3c9d53b348f586ed223ec5de9f525faee6f564d Ryan Bates ryan@railscasts.com http://github.com/rails/rails/commit/8f4d3957a6986fe450cfd9058bb92ae1d6e5e745 8f4d3957a6986fe450cfd9058bb92ae1d6e5e745 2008-08-16T12:21:36-07:00 2008-08-15T13:51:57-07:00 Don't raise exception when comparing ActiveRecord::Reflection. [#842 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> 1b7833a2d0594835f44646bc4ebc7e70a2cc219b Pratik Naik pratiknaik@gmail.com