Ticket #15124: 15124ticket.v3.diff

django/contrib/flatpages/models.py

@@ -7 +7 @@
     url = models.CharField(_('URL'), max_length=100, db_index=True)
     title = models.CharField(_('title'), max_length=200)
     content = models.TextField(_('content'), blank=True)
-    enable_comments = models.BooleanField(_('enable comments'))
+    enable_comments = models.BooleanField(_('enable comments'), default=False)
     template_name = models.CharField(_('template name'), max_length=70, blank=True,
         help_text=_("Example: 'flatpages/contact_page.html'. If this isn't provided, the system will use 'flatpages/default.html'."))
-    registration_required = models.BooleanField(_('registration required'), help_text=_("If this is checked, only logged-in users will be able to view the page."))
+    registration_required = models.BooleanField(_('registration required'),
+        help_text=_("If this is checked, only logged-in users will be able to view the page."),
+        default=False)
     sites = models.ManyToManyField(Site)
 
     class Meta:

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/index.txt

@@ -81 +81 @@
 .. toctree::
    :maxdepth: 1
 
+   1.4-beta-1
    1.4-alpha-1
    1.3-beta-1
    1.3-alpha-1

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):
         """

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)