Ticket #9039: unqieu-validate-nulls.2.diff

django/forms/models.py

@@ -246 +246 @@
             lookup_kwargs = {}
             for field_name in unique_check:
                 lookup_kwargs[field_name] = self.cleaned_data[field_name]
-            
+                # If the field can be null, we need to exclude null values from 
+                # the query, since in SQL NULL != NULL
+                if self.instance._meta.get_field_by_name(field_name)[0].null:
+                    lookup_kwargs["%s__isnull" % field_name] = False
             qs = self.instance.__class__._default_manager.filter(**lookup_kwargs)
-
+            
             # Exclude the current object from the query if we are editing an 
             # instance (as opposed to creating a new one)
             if self.instance.pk is not None:

tests/modeltests/model_forms/models.py

@@ -144 +144 @@
 
    def __unicode__(self):
       return self.name
+
+class Patient(models.Model):
+    special_id = models.IntegerField(blank=True, null=True, unique=True)
       
 __test__ = {'API_TESTS': """
 >>> from django import forms
@@ -1251 +1254 @@
 >>> core = form.save()
 >>> core.parent
 <Inventory: Pear>
+
+>>> class PatientForm(ModelForm):
+...     class Meta:
+...        model = Patient
+>>> form = PatientForm({})
+>>> form.save()
+<Patient: Patient object>
+>>> form = PatientForm({})
+>>> form.save()
+<Patient: Patient object>
 """}