mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-06-05 03:29:12 +00:00
Code Issues 32 Releases Wiki Activity

magic-removal: Fixed bug in parse_lookup introduced in 2150, and tidied up a bit

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@2236 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Luke Plant 2006-02-03 13:03:51 +00:00
parent 1308017f62
commit 5366beeb70
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -574,9 +574,7 @@ def parse_lookup(kwarg_items, opts):
tables, joins, where, params = [], SortedDict(), [], [] tables, joins, where, params = [], SortedDict(), [], []
for kwarg, value in kwarg_items: for kwarg, value in kwarg_items:
if value is None: if value is not None:
pass
else:
path = kwarg.split(LOOKUP_SEPARATOR) path = kwarg.split(LOOKUP_SEPARATOR)
# Extract the last elements of the kwarg. # Extract the last elements of the kwarg.
# The very-last is the clause (equals, like, etc). # The very-last is the clause (equals, like, etc).
@ -599,11 +597,11 @@ def parse_lookup(kwarg_items, opts):
if len(path) < 1: if len(path) < 1:
raise TypeError, "Cannot parse keyword query %r" % kwarg raise TypeError, "Cannot parse keyword query %r" % kwarg
tables2, joins2, where2, params2 = lookup_inner(path, clause, value, opts, opts.db_table, None) tables2, joins2, where2, params2 = lookup_inner(path, clause, value, opts, opts.db_table, None)
tables.extend(tables2) tables.extend(tables2)
joins.update(joins2) joins.update(joins2)
where.extend(where2) where.extend(where2)
params.extend(params2) params.extend(params2)
return tables, joins, where, params return tables, joins, where, params
class FieldFound(Exception): class FieldFound(Exception):