Merge pull request #17296 from sgrif/sg-booleans-should-make-sense

Add a deprecation warning for abiguous boolean values

2 files changed, 14 insertions, 5 deletions

diff --git a/activerecord/lib/active_record/type/boolean.rb b/activerecord/lib/active_record/type/boolean.rb
index 06dd17ed28..1311be3944 100644
--- a/activerecord/lib/active_record/type/boolean.rb
+++ b/activerecord/lib/active_record/type/boolean.rb
@@ -10,8 +10,15 @@ module ActiveRecord
       def cast_value(value)
         if value == ''
           nil
+        elsif ConnectionAdapters::Column::TRUE_VALUES.include?(value)
+          true
         else
-          ConnectionAdapters::Column::TRUE_VALUES.include?(value)
+          if !ConnectionAdapters::Column::FALSE_VALUES.include?(value)
+            ActiveSupport::Deprecation.warn(<<-EOM)
+              You attempted to assign a value which is not explicitly true or false to a boolean column. Currently this value casts to false. This will change to match Ruby's sematics, and will cast to true in Rails 5.0. If you would like to maintain the current behavior, you should explicitly handle the values you would like cast to false.
+            EOM
+          end
+          false
         end
       end
     end
diff --git a/activerecord/test/cases/types_test.rb b/activerecord/test/cases/types_test.rb
index db4f78d354..25e6549072 100644
--- a/activerecord/test/cases/types_test.rb
+++ b/activerecord/test/cases/types_test.rb
@@ -29,10 +29,12 @@ module ActiveRecord
         assert_equal false, type.type_cast_from_user('FALSE')
         assert_equal false, type.type_cast_from_user('off')
         assert_equal false, type.type_cast_from_user('OFF')
-        assert_equal false, type.type_cast_from_user(' ')
-        assert_equal false, type.type_cast_from_user("\u3000\r\n")
-        assert_equal false, type.type_cast_from_user("\u0000")
-        assert_equal false, type.type_cast_from_user('SOMETHING RANDOM')
+        assert_deprecated do
+          assert_equal false, type.type_cast_from_user(' ')
+          assert_equal false, type.type_cast_from_user("\u3000\r\n")
+          assert_equal false, type.type_cast_from_user("\u0000")
+          assert_equal false, type.type_cast_from_user('SOMETHING RANDOM')
+        end
       end
 
       def test_type_cast_integer