test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Removed field.field check in setup_joins()

This commit is contained in:
Anssi Kääriäinen 2015-02-26 15:44:41 +02:00 committed by Tim Graham
parent b68212f539
commit d43aa28f67
3 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
django/db/models/fields/related.py
View File

@ -1342,6 +1342,16 @@ class ForeignObjectRel(object):
def get_prep_lookup(self, lookup_name, value): def get_prep_lookup(self, lookup_name, value):
return self.field.get_prep_lookup(lookup_name, value) return self.field.get_prep_lookup(lookup_name, value)
@cached_property
def target_field(self):
target_fields = self.get_path_info().target_fields
if len(target_fields) > 1:
raise RuntimeError("Multicolumn relations do not have a single target_field.")
return target_fields[0]
def get_lookup(self, lookup_name):
return self.field.get_lookup(lookup_name)
def get_internal_type(self): def get_internal_type(self):
return self.field.get_internal_type() return self.field.get_internal_type()

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

@ -547,7 +547,7 @@ class SQLCompiler(object):
# If we get to this point and the field is a relation to another model, # If we get to this point and the field is a relation to another model,
# append the default ordering for that model unless the attribute name # append the default ordering for that model unless the attribute name
# of the field is specified. # of the field is specified.
if field.rel and path and opts.ordering and name != field.attname: if field.is_relation and path and opts.ordering and name != field.attname:
# Firstly, avoid infinite loops. # Firstly, avoid infinite loops.
if not already_seen: if not already_seen:
already_seen = set() already_seen = set()

14
django/db/models/sql/query.py
View File

@ -1038,7 +1038,7 @@ class Query(object):
""" """
Checks the type of object passed to query relations. Checks the type of object passed to query relations.
""" """
if field.rel: if field.is_relation:
# QuerySets implement is_compatible_query_object_type() to # QuerySets implement is_compatible_query_object_type() to
# determine compatibility with the given field. # determine compatibility with the given field.
if hasattr(value, 'is_compatible_query_object_type'): if hasattr(value, 'is_compatible_query_object_type'):
@ -1164,16 +1164,10 @@ class Query(object):
# No support for transforms for relational fields # No support for transforms for relational fields
assert len(lookups) == 1 assert len(lookups) == 1
lookup_class = field.get_lookup(lookups[0]) lookup_class = field.get_lookup(lookups[0])
# Undo the changes done in setup_joins() if hasattr(final_field, 'field') branch
# This hack is needed as long as the field.rel isn't like a real field.
if field.get_path_info()[-1].target_fields != sources:
target_field = field.rel
else:
target_field = field
if len(targets) == 1: if len(targets) == 1:
lhs = targets[0].get_col(alias, target_field) lhs = targets[0].get_col(alias, field)
else: else:
lhs = MultiColSource(alias, targets, sources, target_field) lhs = MultiColSource(alias, targets, sources, field)
condition = lookup_class(lhs, value) condition = lookup_class(lhs, value)
lookup_type = lookup_class.lookup_name lookup_type = lookup_class.lookup_name
else: else:
@ -1384,8 +1378,6 @@ class Query(object):
reuse = can_reuse if join.m2m else None reuse = can_reuse if join.m2m else None
alias = self.join(connection, reuse=reuse) alias = self.join(connection, reuse=reuse)
joins.append(alias) joins.append(alias)
if hasattr(final_field, 'field'):
final_field = final_field.field
return final_field, targets, opts, joins, path return final_field, targets, opts, joins, path
def trim_joins(self, targets, joins, path): def trim_joins(self, targets, joins, path):