extra_kwargs takes precedence over uniqueness kwargs (#4349)

tomchristie · web-flow · commit a9a097496ec8 · 2016-08-02T14:33:15.000+01:00
diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py
@@ -1324,9 +1324,8 @@ def get_uniqueness_extra_kwargs(self, field_names, declared_fields, extra_kwargs
         # Update `extra_kwargs` with any new options.
         for key, value in uniqueness_extra_kwargs.items():
             if key in extra_kwargs:
-                extra_kwargs[key].update(value)
-            else:
-                extra_kwargs[key] = value
+                value.update(extra_kwargs[key])
+            extra_kwargs[key] = value
 
         return extra_kwargs, hidden_fields
 
diff --git a/tests/test_model_serializer.py b/tests/test_model_serializer.py
@@ -976,3 +976,22 @@ class Meta:
         source = OneToOneSourceTestModel(target=target)
         serializer = ExampleSerializer(source)
         self.assertEqual(serializer.data, {'target': 1})
+
+
+class TestUniquenessOverride(TestCase):
+    def test_required_not_overwritten(self):
+        class TestModel(models.Model):
+            field_1 = models.IntegerField(null=True)
+            field_2 = models.IntegerField()
+
+            class Meta:
+                unique_together = (('field_1', 'field_2'),)
+
+        class TestSerializer(serializers.ModelSerializer):
+            class Meta:
+                model = TestModel
+                extra_kwargs = {'field_1': {'required': False}}
+
+        fields = TestSerializer().fields
+        self.assertFalse(fields['field_1'].required)
+        self.assertTrue(fields['field_2'].required)
