Ticket #12560: 12560.diff

django/db/models/base.py

@@ -696 +696 @@
             for field_name in unique_check:
                 f = self._meta.get_field(field_name)
                 lookup_value = getattr(self, f.attname)
-                if f.null and lookup_value is None:
+                if lookup_value is None:
                     # no value, skip the lookup
                     continue
                 if f.primary_key and not getattr(self, '_adding', False):

tests/modeltests/validation/test_unique.py

@@ -42 +42 @@
         settings.DEBUG = self._old_debug
         super(PerformUniqueChecksTest, self).tearDown()
 
-    def test_primary_key_unique_check_performed_when_adding(self):
+    def test_primary_key_unique_check_not_performed_when_adding_and_pk_not_specified(self):
         """Regression test for #12132"""
         l = len(connection.queries)
         mtv = ModelToValidate(number=10, name='Some Name')
         setattr(mtv, '_adding', True)
         mtv.full_validate()
+        self.assertEqual(l, len(connection.queries))
+
+    def test_primary_key_unique_check_performed_when_adding_and_pk_specified(self):
+        """Regression test for #12132"""
+        l = len(connection.queries)
+        mtv = ModelToValidate(number=10, name='Some Name', id=123)
+        setattr(mtv, '_adding', True)
+        mtv.full_validate()
         self.assertEqual(l+1, len(connection.queries))
 
     def test_primary_key_unique_check_not_performed_when_not_adding(self):