Skip to content
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

Jump to bottom

Fix get_selected_fields for Django 1.8 #80

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix get_selected_fields for Django 1.8 #80

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 9 additions & 1 deletion djangotoolbox/db/basecompiler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,21 @@ class EmptyResultSet(Exception):
else:
from django.db.models.sql.constants import LOOKUP_SEP

if django.VERSION >= (1, 6):
if django.VERSION >= (1, 8):
def get_selected_fields(query):
if query.select:
return [info.target for info in query.select]
else:
return query.model._meta.fields

elif django.VERSION >= (1, 6):
def get_selected_fields(query):
if query.select:
return [info.field for info in (query.select +
query.related_select_cols)]
else:
return query.model._meta.fields

else:
def get_selected_fields(query):
if query.select_fields:
Expand Down