Revert "coerce blank strings to nil values for boolean and integer fields"

This reverts commit aee14630d4dc0856e597794cc731fac68c2d2e34.

[#860 state:incomplete]

2 files changed, 6 insertions, 13 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
 
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb b/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
index 08b2c79389..31d6c7942c 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
@@ -138,11 +138,7 @@ module ActiveRecord
 
         # convert something to a boolean
         def value_to_boolean(value)
-          if value.blank?
-            nil
-          else
-            TRUE_VALUES.include?(value)
-          end
+          TRUE_VALUES.include?(value)
         end
 
         # convert something to a BigDecimal