Ticket #8101: 8101_boolean_fields_fix.diff

django/db/models/fields/__init__.py

@@ -505 +505 @@
     def get_db_prep_value(self, value):
         if value is None:
             return None
-        return bool(value)
+        return self.to_python(value)
 
     def get_manipulator_field_objs(self):
         return [oldforms.CheckboxField]
@@ -1015 +1015 @@
     def get_db_prep_value(self, value):
         if value is None:
             return None
-        return bool(value)
+        return self.to_python(value)
 
     def get_manipulator_field_objs(self):
         return [oldforms.NullBooleanField]

tests/regressiontests/model_fields/tests.py

@@ -5 +5 @@
 ... except ImportError:
 ...     from django.utils._decimal import Decimal
 
+# BooleanField
+
+>>> f = BooleanField()
+>>> f.to_python(True)
+True
+>>> f.to_python(False)
+False
+>>> f.to_python(u'1')
+True
+>>> f.to_python(u'0')
+False
+>>> f.to_python(None)
+Traceback (most recent call last):
+...
+ValidationError: [u'This value must be either True or False.']
+
+>>> f.get_db_prep_value(None)
+>>> f.get_db_prep_value(u'1')
+True
+>>> f.get_db_prep_value(u'0')
+False
+
+# NullBooleanField
+>>> f = NullBooleanField()
+>>> f.to_python(True)
+True
+>>> f.to_python(False)
+False
+>>> f.to_python(u'1')
+True
+>>> f.to_python(u'0')
+False
+>>> f.to_python(None)
+
+>>> f.get_db_prep_value(None)
+>>> f.get_db_prep_value(u'1')
+True
+>>> f.get_db_prep_value(u'0')
+False
+
 # DecimalField
 
 >>> f = DecimalField(max_digits=4, decimal_places=2)