summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Holovaty <adrian@holovaty.com>2006-07-11 03:29:12 +0000
committerAdrian Holovaty <adrian@holovaty.com>2006-07-11 03:29:12 +0000
commit98597be7865230909c25d765bdc667b6985d226a (patch)
tree7d9c7b0a9b07a6e586f84a23fbb3adc721aca1df
parent9a0e56dbb56bc1f995931aa500ed9f8338a6afb1 (diff)
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
-rw-r--r--django/db/models/query.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/django/db/models/query.py b/django/db/models/query.py
index e148a99ee8..70400be1e7 100644
--- a/django/db/models/query.py
+++ b/django/db/models/query.py
@@ -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?
field = find_field(name, current_opts.many_to_many, False)
if field:
- new_table = current_table + LOOKUP_SEPARATOR + name
+ new_table = current_table + '__' + name
new_opts = field.rel.to._meta
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?
field = find_field(name, current_opts.get_all_related_many_to_many_objects(), True)
if field:
- new_table = current_table + LOOKUP_SEPARATOR + name
+ new_table = current_table + '__' + name
new_opts = field.opts
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?
field = find_field(name, current_opts.get_all_related_objects(), True)
if field:
- new_table = table + LOOKUP_SEPARATOR + name
+ new_table = table + '__' + name
new_opts = field.opts
new_column = field.field.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)
if 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_column = new_opts.pk.column
join_column = field.column