aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/core.rb
diff options
context:
space:
mode:
authorGodfrey Chan <godfreykfc@gmail.com>2014-03-29 04:27:23 -0700
committerGodfrey Chan <godfreykfc@gmail.com>2014-03-29 04:34:20 -0700
commit945dd254ae4a79705c2c05a683fc37a8c98c8aeb (patch)
treecd99f279cdd67180122db5ba20851cb4e2b9ba7f /activerecord/lib/active_record/core.rb
parent86c53d510cf31b792a7e96a44535e64b3983d17a (diff)
downloadrails-945dd254ae4a79705c2c05a683fc37a8c98c8aeb.tar.gz
rails-945dd254ae4a79705c2c05a683fc37a8c98c8aeb.tar.bz2
rails-945dd254ae4a79705c2c05a683fc37a8c98c8aeb.zip
Ensure we are returning either `true` or `false` for `#==`
460eb83d cused `ActiveRecord::Base#==` to sometimes return `nil` in some cases, this ensures we always return a boolean value. Also fixed a similar problem in AR reflections.
Diffstat (limited to 'activerecord/lib/active_record/core.rb')
-rw-r--r--activerecord/lib/active_record/core.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/core.rb b/activerecord/lib/active_record/core.rb
index d9aaf8597f..4e53f66005 100644
--- a/activerecord/lib/active_record/core.rb
+++ b/activerecord/lib/active_record/core.rb
@@ -299,7 +299,7 @@ module ActiveRecord
def ==(comparison_object)
super ||
comparison_object.instance_of?(self.class) &&
- id &&
+ !id.nil? &&
comparison_object.id == id
end
alias :eql? :==