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

Removed references to LOOKUP_SEPARATOR in django.db.models.query.lookup_inner 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@3325 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Adrian Holovaty 2006-07-11 03:29:12 +00:00
parent 9a0e56dbb5
commit 98597be786
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -774,7 +774,7 @@ def lookup_inner(path, lookup_type, value, opts, table, column):
# Does the name belong to a defined many-to-many field? # Does the name belong to a defined many-to-many field?
field = find_field(name, current_opts.many_to_many, False) field = find_field(name, current_opts.many_to_many, False)
if field: if field:
new_table = current_table + LOOKUP_SEPARATOR + name new_table = current_table + '__' + name
new_opts = field.rel.to._meta new_opts = field.rel.to._meta
new_column = new_opts.pk.column new_column = new_opts.pk.column
@ -791,7 +791,7 @@ def lookup_inner(path, lookup_type, value, opts, table, column):
# Does the name belong to a reverse defined many-to-many field? # Does the name belong to a reverse defined many-to-many field?
field = find_field(name, current_opts.get_all_related_many_to_many_objects(), True) field = find_field(name, current_opts.get_all_related_many_to_many_objects(), True)
if field: if field:
new_table = current_table + LOOKUP_SEPARATOR + name new_table = current_table + '__' + name
new_opts = field.opts new_opts = field.opts
new_column = new_opts.pk.column new_column = new_opts.pk.column
@ -808,7 +808,7 @@ def lookup_inner(path, lookup_type, value, opts, table, column):
# Does the name belong to a one-to-many field? # Does the name belong to a one-to-many field?
field = find_field(name, current_opts.get_all_related_objects(), True) field = find_field(name, current_opts.get_all_related_objects(), True)
if field: if field:
new_table = table + LOOKUP_SEPARATOR + name new_table = table + '__' + name
new_opts = field.opts new_opts = field.opts
new_column = field.field.column new_column = field.field.column
join_column = opts.pk.column join_column = opts.pk.column
@ -822,7 +822,7 @@ def lookup_inner(path, lookup_type, value, opts, table, column):
field = find_field(name, current_opts.fields, False) field = find_field(name, current_opts.fields, False)
if field: if field:
if field.rel: # One-to-One/Many-to-one field if field.rel: # One-to-One/Many-to-one field
new_table = current_table + LOOKUP_SEPARATOR + name new_table = current_table + '__' + name
new_opts = field.rel.to._meta new_opts = field.rel.to._meta
new_column = new_opts.pk.column new_column = new_opts.pk.column
join_column = field.column join_column = field.column