Skip to content

Avoid query explosion for related fields where I can user pk_only_opt… #374

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
mblayman merged 15 commits into from
Jan 9, 2018
Merged

Avoid query explosion for related fields where I can user pk_only_opt… #374

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
bc8e8e5
Fix factory boy dependency
Sep 20, 2017
b772a15
fix factory-boy version in setup.py and requirements-development.txt
Sep 20, 2017
08ce590
Fix setup.py factory boy dependency
Sep 20, 2017
bd5acdf
Avoid query explosion for related fields where I can user pk_only_opt…
Oct 9, 2017
89ba1d7
Fix autoPrefetchMixin for ReverseOneToOneDescriptor
Oct 9, 2017
f2511a3
Merge branch 'fix_factory_boy_bug' into fix-337-query-explosion
Oct 9, 2017
ede297e
Fix code style
Oct 9, 2017
b2df841
Avoid query objects in ModelSerializer to_representation method
Oct 11, 2017
c568086
Merge develop
Oct 11, 2017
1fd0040
Fix code queality error
Oct 11, 2017
45ea41a
Fix problem that makes None related objects not being renderer
Nov 8, 2017
4c2ee9c
Fix problem that makes None related objects not being renderer
Nov 8, 2017
3b108b4
_readable_field property is missing in drf<3.2
Nov 8, 2017
fa1ffad
Merge branch 'develop' into fix-337-query-explosion
santiavenda2 Dec 7, 2017
08d652d
Merge branch 'master' into fix-337-query-explosion
santiavenda2 Dec 26, 2017
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
Merge branch 'master' into fix-337-query-explosion
  • Loading branch information
@santiavenda2
santiavenda2 authored Dec 26, 2017
commit 08d652d58cb4838a006b7ea84aeb89971f33b06d
9 changes: 1 addition & 8 deletions rest_framework_json_api/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,14 +85,7 @@ def get_queryset(self, *args, **kwargs):
if level == levels[-1]:
included_model = field
else:
if django.VERSION < (1, 9):
model_field = field.related
else:
# Fix for ReverseOneToOneDescriptor
if issubclass(field_class, ReverseOneToOneDescriptor):
model_field = field.related.field
else:
model_field = field.field
model_field = field.field

if is_forward_relation:
level_model = model_field.related_model
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.