mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-06 18:59:13 +00:00
Code Issues 32 Releases Wiki Activity

Use the correct column in custom column handling.

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/branches/queryset-refactor@6119 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Malcolm Tredinnick 2007-09-13 03:17:46 +00:00
parent a7d01ec9b4
commit bb77006ade
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -506,7 +506,7 @@ class Query(object):
raise TypeError("Joins on field %r not permitted." raise TypeError("Joins on field %r not permitted."
% name) % name)
name = target_col or name col = target_col or target_field.column
if target_field is opts.pk and last: if target_field is opts.pk and last:
# An optimization: if the final join is against a primary key, # An optimization: if the final join is against a primary key,
@ -516,7 +516,7 @@ class Query(object):
self.unref_alias(alias) self.unref_alias(alias)
join = self.alias_map[last[-1]][ALIAS_JOIN] join = self.alias_map[last[-1]][ALIAS_JOIN]
alias = join[LHS_ALIAS] alias = join[LHS_ALIAS]
name = join[LHS_JOIN_COL] col = join[LHS_JOIN_COL]
if (lookup_type == 'isnull' and value is True): if (lookup_type == 'isnull' and value is True):
# If the comparison is against NULL, we need to use a left outer # If the comparison is against NULL, we need to use a left outer
@ -525,7 +525,7 @@ class Query(object):
# efficient at the database level. # efficient at the database level.
self.alias_map[joins[0]][ALIAS_JOIN][JOIN_TYPE] = self.LOUTER self.alias_map[joins[0]][ALIAS_JOIN][JOIN_TYPE] = self.LOUTER
self.where.add([alias, name, orig_field, lookup_type, value], self.where.add([alias, col, orig_field, lookup_type, value],
connection) connection)
if negate: if negate:
self.alias_map[last[0]][ALIAS_JOIN][JOIN_TYPE] = self.LOUTER self.alias_map[last[0]][ALIAS_JOIN][JOIN_TYPE] = self.LOUTER