Ticket #15124: 15124.v2.patch

tests/regressiontests/model_fields/tests.py

@@ -211 +211 @@
             select={'string_length': 'LENGTH(string)'})[0]
         self.assertFalse(isinstance(b5.pk, bool))
 
+    def test_null_default(self):
+        # http://code.djangoproject.com/ticket/15124
+        from django.db import IntegrityError
+        b = BooleanModel()
+        self.assertEqual(b.bfield, None)
+        self.assertRaises(IntegrityError, b.save)
+
+
 class ChoicesTests(test.TestCase):
     def test_choices_and_field_display(self):
         """

django/db/models/fields/__init__.py

@@ -553 +553 @@
     description = _("Boolean (Either True or False)")
     def __init__(self, *args, **kwargs):
         kwargs['blank'] = True
-        if 'default' not in kwargs and not kwargs.get('null'):
-            kwargs['default'] = False
         Field.__init__(self, *args, **kwargs)
 
     def get_internal_type(self):

docs/releases/1.4.txt

@@ -1142 +1142 @@
 This attribute was confusingly named ``HttpRequest.raw_post_data``, but it
 actually provided the body of the HTTP request. It's been renamed to
 ``HttpRequest.body``, and ``HttpRequest.raw_post_data`` has been deprecated.
+
+``BooleanField`` set to None when default value not specified
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+In previous versions of Django, a model's ``BooleanField`` would get ``False``
+value when no default was provided. Now ``None`` value is used.
+ No newline at end of file

tests/regressiontests/model_inheritance_regress/tests.py

@@ -180 +180 @@
         """
         Regression test for #6755
         """
-        r = Restaurant(serves_pizza=False)
+        r = Restaurant(serves_pizza=False, serves_hot_dogs=False)
         r.save()
         self.assertEqual(r.id, r.place_ptr_id)
         orig_id = r.id
-        r = Restaurant(place_ptr_id=orig_id, serves_pizza=True)
+        r = Restaurant(place_ptr_id=orig_id, serves_pizza=True, serves_hot_dogs=False)
         r.save()
         self.assertEqual(r.id, orig_id)
         self.assertEqual(r.id, r.place_ptr_id)