Skip to content

Hyperlinked PK optimization. #2242

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lovelydinosaur merged 4 commits into from
Dec 10, 2014
Merged

Hyperlinked PK optimization. #2242

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
720a37d
Hyperlinked PK optimization. Closes #1872.
lovelydinosaur Dec 9, 2014
ca7b1f6
Optimizations play nicely with select_related, prefetch_related
lovelydinosaur Dec 10, 2014
9d3810f
Drop get_iterable()
lovelydinosaur Dec 10, 2014
1e336ef
Move comment
lovelydinosaur Dec 10, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Drop get_iterable()
  • Loading branch information
@lovelydinosaur
lovelydinosaur committed Dec 10, 2014
commit 9d3810f313123ce48dea48f3c3f0f2cae5816bde
9 changes: 3 additions & 6 deletions rest_framework/relations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ def use_pk_only_optimization(self):
return False

def get_attribute(self, instance):
if self.use_pk_only_optimization():
if self.use_pk_only_optimization() and self.source_attrs:
try:
# Optimized case, return a mock object only containing the pk attribute.
instance = get_attribute(instance, self.source_attrs[:-1])
Expand All @@ -99,10 +99,6 @@ def get_attribute(self, instance):
# Standard case, return the object instance.
return get_attribute(instance, self.source_attrs)

def get_iterable(self, instance, source_attrs):
relationship = get_attribute(instance, source_attrs)
return relationship.all() if (hasattr(relationship, 'all')) else relationship

@property
def choices(self):
return dict([
Expand Down Expand Up @@ -349,7 +345,8 @@ def to_internal_value(self, data):
]

def get_attribute(self, instance):
return self.child_relation.get_iterable(instance, self.source_attrs)
relationship = get_attribute(instance, self.source_attrs)
return relationship.all() if (hasattr(relationship, 'all')) else relationship

def to_representation(self, iterable):
return [
Expand Down