p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Removed non-necessary code in Compiler._setup_joins()

This commit is contained in:
Anssi Kääriäinen 2013-11-06 21:32:29 +02:00
parent ba6c9fae45
commit ccbba98131
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
django/db/models/sql/compiler.py
View File

@ -452,8 +452,7 @@ class SQLCompiler(object):
def _setup_joins(self, pieces, opts, alias): def _setup_joins(self, pieces, opts, alias):
""" """
A helper method for get_ordering and get_distinct. This method will A helper method for get_ordering and get_distinct.
call query.setup_joins and handle refcounts.
Note that get_ordering and get_distinct must produce same target Note that get_ordering and get_distinct must produce same target
columns on same input, as the prefixes of get_ordering and get_distinct columns on same input, as the prefixes of get_ordering and get_distinct
@ -464,11 +463,6 @@ class SQLCompiler(object):
field, targets, opts, joins, path = self.query.setup_joins( field, targets, opts, joins, path = self.query.setup_joins(
pieces, opts, alias) pieces, opts, alias)
alias = joins[-1] alias = joins[-1]
if not field.rel:
# To avoid inadvertent trimming of a necessary alias, use the
# refcount to show that we are referencing a non-relation field on
# the model.
self.query.ref_alias(alias)
return field, targets, alias, joins, path, opts return field, targets, alias, joins, path, opts
def get_from_clause(self): def get_from_clause(self):