diff options
Diffstat (limited to 'activerecord/lib')
-rwxr-xr-x | activerecord/lib/active_record/base.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb index f11fca69f4..e0bce194b2 100755 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -1169,7 +1169,10 @@ module ActiveRecord #:nodoc: # Returns true if the +comparison_object+ is the same object, or is of the same type and has the same id. def ==(comparison_object) - comparison_object.equal?(self) or (comparison_object.instance_of?(self.class) and comparison_object.id == id) + comparison_object.equal?(self) || + (comparison_object.instance_of?(self.class) && + comparison_object.id == id && + !comparison_object.new_record?) end # Delegates to == |