Ticket #9590: char-text-field-null-value-save-null.patch

django/db/models/fields/__init__.py

@@ -414 +414 @@
 
     def formfield(self, **kwargs):
         defaults = {'max_length': self.max_length}
+        if self.null:
+            defaults['empty_value'] = None
         defaults.update(kwargs)
         return super(CharField, self).formfield(**defaults)
 
@@ -785 +787 @@
 
     def formfield(self, **kwargs):
         defaults = {'widget': forms.Textarea}
+        if self.null:
+            defaults['empty_value'] = None
         defaults.update(kwargs)
         return super(TextField, self).formfield(**defaults)
 

django/forms/fields.py

@@ -139 +139 @@
         'min_length': _(u'Ensure this value has at least %(min)d characters (it has %(length)d).'),
     }
 
-    def __init__(self, max_length=None, min_length=None, *args, **kwargs):
+    def __init__(self, max_length=None, min_length=None, empty_value=u'', *args, **kwargs):
         self.max_length, self.min_length = max_length, min_length
+        self.empty_value = empty_value
         super(CharField, self).__init__(*args, **kwargs)
 
     def clean(self, value):
         "Validates max_length and min_length. Returns a Unicode object."
         super(CharField, self).clean(value)
         if value in EMPTY_VALUES:
-            return u''
+            return self.empty_value
         value = smart_unicode(value)
         value_length = len(value)
         if self.max_length is not None and value_length > self.max_length:

tests/modeltests/model_forms/models.py

@@ -168 +168 @@
     def __unicode__(self):
         return self.key
 
+class NullCharField(models.Model):
+    testfield = models.CharField(max_length=20, blank=True, null=True)
+    testfield2 = models.TextField(null=True, blank=True)
+    def __unicode__(self):
+        return unicode(self.testfield)
+
 __test__ = {'API_TESTS': """
 >>> from django import forms
 >>> from django.forms.models import ModelForm, model_to_dict
@@ -1277 +1283 @@
 >>> form.errors
 {'__all__': [u'Explicit pk with this Key and Desc already exists.'], 'key': [u'Explicit pk with this Key already exists.'], 'desc': [u'Explicit pk with this Desc already exists.']}
 
+# Ensure that char field with blank=True, null=True will be inserted as NULL not as ''
+>>> class NullCharFieldForm(ModelForm):
+...     class Meta:
+...         model = NullCharField
+...         fields = ('testfield', 'testfield2',)
+>>> form = NullCharFieldForm({'testfield': '', 'testfield2': ''})
+>>> form.is_valid()
+True
+>>> obj = form.save()
+>>> obj.testfield is None
+True
+>>> obj.testfield2 is None
+True
+>>> obj = NullCharField.objects.all()[0]
+>>> obj.testfield is None
+True
+>>> obj.testfield2 is None
+True
+
 # Choices on CharField and IntegerField
 >>> class ArticleForm(ModelForm):
 ...     class Meta: