Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed #5563: `BooleanField(null=True)` now raises a validation warnin…

…g telling users to use `NullBooleanField` instead. Thanks, SamBull.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@10456 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit de9185094491bc4864a8864126d175035df5d6f0 1 parent c0ad626
@jacobian jacobian authored
View
2  django/core/management/validation.py
@@ -51,6 +51,8 @@ def get_validation_errors(outfile, app=None):
from PIL import Image
except ImportError:
e.add(opts, '"%s": To use ImageFields, you need to install the Python Imaging Library. Get it at http://www.pythonware.com/products/pil/ .' % f.name)
+ if isinstance(f, models.BooleanField) and getattr(f, 'null', False):
+ e.add(opts, '"%s": BooleanFields do not accept null values. Use a NullBooleanField instead.' % f.name)
if f.choices:
if isinstance(f.choices, basestring) or not is_iterable(f.choices):
e.add(opts, '"%s": "choices" should be iterable (e.g., a tuple or list).' % f.name)
View
2  tests/modeltests/invalid_models/models.py
@@ -14,6 +14,7 @@ class FieldErrors(models.Model):
choices2 = models.CharField(max_length=10, choices=[(1,2,3),(1,2,3)])
index = models.CharField(max_length=10, db_index='bad')
field_ = models.CharField(max_length=10)
+ nullbool = models.BooleanField(null=True)
class Target(models.Model):
tgt_safe = models.CharField(max_length=10)
@@ -190,6 +191,7 @@ class UniqueM2M(models.Model):
invalid_models.fielderrors: "choices2": "choices" should be a sequence of two-tuples.
invalid_models.fielderrors: "index": "db_index" should be either None, True or False.
invalid_models.fielderrors: "field_": Field names cannot end with underscores, because this would lead to ambiguous queryset filters.
+invalid_models.fielderrors: "nullbool": BooleanFields do not accept null values. Use a NullBooleanField instead.
invalid_models.clash1: Accessor for field 'foreign' clashes with field 'Target.clash1_set'. Add a related_name argument to the definition for 'foreign'.
invalid_models.clash1: Accessor for field 'foreign' clashes with related m2m field 'Target.clash1_set'. Add a related_name argument to the definition for 'foreign'.
invalid_models.clash1: Reverse query name for field 'foreign' clashes with field 'Target.clash1'. Add a related_name argument to the definition for 'foreign'.
View
4 tests/regressiontests/serializers_regress/models.py
@@ -11,10 +11,10 @@
from django.contrib.localflavor.us.models import USStateField, PhoneNumberField
# The following classes are for testing basic data
-# marshalling, including NULL values.
+# marshalling, including NULL values, where allowed.
class BooleanData(models.Model):
- data = models.BooleanField(null=True)
+ data = models.BooleanField()
class CharData(models.Model):
data = models.CharField(max_length=30, null=True)
Please sign in to comment.
Something went wrong with that request. Please try again.