aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
authorRyan Bates <ryan@railscasts.com>2008-08-15 13:51:57 -0700
committerPratik Naik <pratiknaik@gmail.com>2008-08-16 20:21:36 +0100
commit8f4d3957a6986fe450cfd9058bb92ae1d6e5e745 (patch)
tree1b7833a2d0594835f44646bc4ebc7e70a2cc219b /activerecord/lib
parentb3c9d53b348f586ed223ec5de9f525faee6f564d (diff)
downloadrails-8f4d3957a6986fe450cfd9058bb92ae1d6e5e745.tar.gz
rails-8f4d3957a6986fe450cfd9058bb92ae1d6e5e745.tar.bz2
rails-8f4d3957a6986fe450cfd9058bb92ae1d6e5e745.zip
Don't raise exception when comparing ActiveRecord::Reflection. [#842 state:resolved]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
Diffstat (limited to 'activerecord/lib')
-rw-r--r--activerecord/lib/active_record/reflection.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/reflection.rb b/activerecord/lib/active_record/reflection.rb
index 3f74c03714..935b1939d8 100644
--- a/activerecord/lib/active_record/reflection.rb
+++ b/activerecord/lib/active_record/reflection.rb
@@ -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: