From c51f9fdc78d1732d6c08a6411ca9d2536aa86d6e Mon Sep 17 00:00:00 2001 From: Rick Olson Date: Wed, 5 Jul 2006 14:22:24 +0000 Subject: revert ActiveRecord equality change. Closes #5596 git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4554 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- activerecord/lib/active_record/base.rb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'activerecord/lib/active_record/base.rb') diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb index fba17bd917..812f30c773 100755 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -1646,9 +1646,8 @@ module ActiveRecord #:nodoc: def ==(comparison_object) comparison_object.equal?(self) || (comparison_object.instance_of?(self.class) && - ((!comparison_object.new_record? && comparison_object.id == id) || - (comparison_object.new_record? && comparison_object.attributes == attributes)) - ) + comparison_object.id == id && + !comparison_object.new_record?) end # Delegates to == -- cgit v1.2.3