Respect to_field property of ForeignKey relations

rest_framework/relations.py

@@ -303,7 +303,14 @@ def __init__(self, slug_field=None, **kwargs):
 
     def to_internal_value(self, data):
         try:
-            return self.get_queryset().get(**{self.slug_field: data})
+            # Some tests do not have the full QuerySet API
+            # But we optimize SlugRelatedFields by only loading what we need
+            qs = self.get_queryset()
+            if hasattr(qs, 'only'):
+                return self.get_queryset().only(self.slug_field).get(**{self.slug_field: data})
+            else:
+                return self.get_queryset().get(**{self.slug_field: data})
+
         except ObjectDoesNotExist:
             self.fail('does_not_exist', slug_name=self.slug_field, value=smart_text(data))
         except (TypeError, ValueError):

rest_framework/serializers.py

@@ -727,6 +727,7 @@ class ModelSerializer(Serializer):
         models.URLField: URLField,
     })
     _related_class = PrimaryKeyRelatedField
+    _related_to_field_class = SlugRelatedField
 
     def create(self, validated_data):
         """
@@ -1002,8 +1003,18 @@ def get_fields(self):
                     field_cls = self._get_nested_class(depth, relation_info)
                     kwargs = get_nested_relation_kwargs(relation_info)
                 else:
-                    field_cls = self._related_class
                     kwargs = get_relation_kwargs(field_name, relation_info)
+                    to_field = kwargs.get('to_field', False)
+                    kwargs.pop('to_field', None)
+                    # it seems that some tests/django initializers are setting
+                    # to_field where it is totally unnecessary
+                    if to_field and to_field != 'id':
+                        # using the slug field for now
+                        kwargs.pop('to_field', None)
+                        kwargs['slug_field'] = to_field
+                        field_cls = self._related_to_field_class
+                    else:
+                        field_cls = self._related_class
                     # `view_name` is only valid for hyperlinked relationships.
                     if not issubclass(field_cls, HyperlinkedRelatedField):
                         kwargs.pop('view_name', None)

rest_framework/utils/field_mapping.py

@@ -194,7 +194,7 @@ def get_relation_kwargs(field_name, relation_info):
     """
     Creates a default instance of a flat relational field.
     """
-    model_field, related_model, to_many, has_through_model = relation_info
+    model_field, related_model, to_many, to_field, has_through_model = relation_info
     kwargs = {
         'queryset': related_model._default_manager,
         'view_name': get_detail_view_name(related_model)
@@ -203,6 +203,9 @@ def get_relation_kwargs(field_name, relation_info):
     if to_many:
         kwargs['many'] = True
 
+    if to_field:
+        kwargs['to_field'] = to_field
+
     if has_through_model:
         kwargs['read_only'] = True
         kwargs.pop('queryset', None)

rest_framework/utils/model_meta.py

@@ -26,6 +26,7 @@
     'model_field',
     'related',
     'to_many',
+    'to_field',
     'has_through_model'
 ])
 
@@ -96,10 +97,18 @@ def _get_forward_relationships(opts):
     """
     forward_relations = OrderedDict()
     for field in [field for field in opts.fields if field.serialize and field.rel]:
+        # For < django 1.6
+        if hasattr(field, 'to_fields'):
+            to_field = field.to_fields[0] if len(field.to_fields) else None
+        else:
+            to_field = None
+
         forward_relations[field.name] = RelationInfo(
             model_field=field,
             related=_resolve_model(field.rel.to),
             to_many=False,
+            # to_fields is an array but django lets you only set one to_field
+            to_field=to_field,
             has_through_model=False
         )
 
@@ -109,6 +118,8 @@ def _get_forward_relationships(opts):
             model_field=field,
             related=_resolve_model(field.rel.to),
             to_many=True,
+            # manytomany do not have to_fields
+            to_field=None,
             has_through_model=(
                 not field.rel.through._meta.auto_created
             )
@@ -124,10 +135,17 @@ def _get_reverse_relationships(opts):
     reverse_relations = OrderedDict()
     for relation in opts.get_all_related_objects():
         accessor_name = relation.get_accessor_name()
+        # For < django 1.6
+        if hasattr(relation.field, 'to_fields'):
+            to_field = relation.field.to_fields[0] if len(relation.field.to_fields) else None
+        else:
+            to_field = None
+
         reverse_relations[accessor_name] = RelationInfo(
             model_field=None,
             related=relation.model,
             to_many=relation.field.rel.multiple,
+            to_field=to_field,
             has_through_model=False
         )
 
@@ -138,6 +156,8 @@ def _get_reverse_relationships(opts):
             model_field=None,
             related=relation.model,
             to_many=True,
+            # manytomany do not have to_fields
+            to_field=None,
             has_through_model=(
                 (getattr(relation.field.rel, 'through', None) is not None)
                 and not relation.field.rel.through._meta.auto_created