Ticket #15124: t15124_r1.2.4_v1.diff

django/db/models/fields/__init__.py

@@ -495 +495 @@
     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):

tests/regressiontests/model_fields/tests.py

@@ -193 +193 @@
             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(django.test.TestCase):
     def test_choices_and_field_display(self):
         """

tests/regressiontests/model_inheritance_regress/tests.py

@@ -178 +178 @@
         """
         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)