From 851628107842a5bf84725247a42cae1ac90decf6 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Wed, 19 Nov 2014 14:40:30 +0000
Subject: Minor fix for #2092.

---
 rest_framework/serializers.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'rest_framework')

diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py
index 2e34dbe7..3189619e 100644
--- a/rest_framework/serializers.py
+++ b/rest_framework/serializers.py
@@ -736,12 +736,12 @@ class ModelSerializer(Serializer):
             ])
             unique_constraint_names -= set([None])
 
-            # Include each of the `unique_together` field names,
-            # so long as all the field names are included on the serializer.
-            for parent_class in [model] + list(model._meta.parents.keys()):
-                for unique_together_list in parent_class._meta.unique_together:
-                    if set(fields).issuperset(set(unique_together_list)):
-                        unique_constraint_names |= set(unique_together_list)
+        # Include each of the `unique_together` field names,
+        # so long as all the field names are included on the serializer.
+        for parent_class in [model] + list(model._meta.parents.keys()):
+            for unique_together_list in parent_class._meta.unique_together:
+                if set(fields).issuperset(set(unique_together_list)):
+                    unique_constraint_names |= set(unique_together_list)
 
         # Now we have all the field names that have uniqueness constraints
         # applied, we can add the extra 'required=...' or 'default=...'
-- 
cgit v1.2.3


From 40b1ea919b00bd8bf1f53f8eb8bf33a498b237b8 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Wed, 19 Nov 2014 14:51:49 +0000
Subject: Fix non-determanistic unique constraint mapping. Refs #2092.

---
 rest_framework/serializers.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'rest_framework')

diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py
index 3189619e..ce0d14d6 100644
--- a/rest_framework/serializers.py
+++ b/rest_framework/serializers.py
@@ -721,6 +721,7 @@ class ModelSerializer(Serializer):
         # arguments to deal with `unique_for` dates that are required to
         # be in the input data in order to validate it.
         hidden_fields = {}
+        unique_constraint_names = set()
 
         for model_field_name, field_name in model_field_mapping.items():
             try:
@@ -729,12 +730,13 @@ class ModelSerializer(Serializer):
                 continue
 
             # Include each of the `unique_for_*` field names.
-            unique_constraint_names = set([
+            unique_constraint_names |= set([
                 model_field.unique_for_date,
                 model_field.unique_for_month,
                 model_field.unique_for_year
             ])
-            unique_constraint_names -= set([None])
+
+        unique_constraint_names -= set([None])
 
         # Include each of the `unique_together` field names,
         # so long as all the field names are included on the serializer.
-- 
cgit v1.2.3


From bde725541359de1fef785801fc5dad98e70a8e2f Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Thu, 20 Nov 2014 09:30:49 +0000
Subject: Fix non-determanistic default bug. Closes #2099.

---
 rest_framework/serializers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'rest_framework')

diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py
index ce0d14d6..2d5c843e 100644
--- a/rest_framework/serializers.py
+++ b/rest_framework/serializers.py
@@ -757,7 +757,7 @@ class ModelSerializer(Serializer):
             elif getattr(unique_constraint_field, 'auto_now', None):
                 default = timezone.now
             elif unique_constraint_field.has_default():
-                default = model_field.default
+                default = unique_constraint_field.default
             else:
                 default = empty
 
-- 
cgit v1.2.3