aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/base.rb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2008-08-21 21:34:17 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2008-08-21 21:34:37 -0700
commita5eb297424f68583636b762686726bc0c84703c0 (patch)
tree50a4f35009f4c53f6898105666ab6eed6d361828 /activerecord/lib/active_record/base.rb
parente6a66cbd056f177f7e60341799aa95791fcfa19d (diff)
downloadrails-a5eb297424f68583636b762686726bc0c84703c0.tar.gz
rails-a5eb297424f68583636b762686726bc0c84703c0.tar.bz2
rails-a5eb297424f68583636b762686726bc0c84703c0.zip
Revert "coerce blank strings to nil values for boolean and integer fields"
This reverts commit aee14630d4dc0856e597794cc731fac68c2d2e34. [#860 state:incomplete]
Diffstat (limited to 'activerecord/lib/active_record/base.rb')
-rw-r--r--activerecord/lib/active_record/base.rb13
1 files changed, 5 insertions, 8 deletions
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
index f4f07aa740..15c6bc1b4a 100644
--- a/activerecord/lib/active_record/base.rb
+++ b/activerecord/lib/active_record/base.rb
@@ -2572,14 +2572,11 @@ module ActiveRecord #:nodoc:
end
def convert_number_column_value(value)
- if value == false
- 0
- elsif value == true
- 1
- elsif value.is_a?(String) && value.blank?
- nil
- else
- value
+ case value
+ when FalseClass; 0
+ when TrueClass; 1
+ when ''; nil
+ else value
end
end