summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2008-02-27 00:43:40 +0000
committerMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2008-02-27 00:43:40 +0000
commitfc4c0f7b39ab62ec4da2aebf179f2ae06d49b312 (patch)
tree877e4ab5643737ff779f7eab210a5600f4728b83
parent3691613093a5fbf450fbd98ad33c851f49d32257 (diff)
queryset-refactor: Removed some unused code left over from an earlier attempt.
git-svn-id: http://code.djangoproject.com/svn/django/branches/queryset-refactor@7162 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/db/models/sql/query.py7
1 files changed, 1 insertions, 6 deletions
diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py
index 3fa4550299..c9a0fc7f1f 100644
--- a/django/db/models/sql/query.py
+++ b/django/db/models/sql/query.py
@@ -329,15 +329,10 @@ class Query(object):
# Since 'self' matches everything, add an explicit "include
# everything" where-constraint so that connections between the
# where clauses won't exclude valid results.
- alias = self.join((None, self.model._meta.db_table, None, None))
- pk = self.model._meta.pk
self.where.add(EverythingNode(), AND)
elif self.where:
- # rhs has an empty where clause. Make it match everything (see
- # above for reasoning).
+ # rhs has an empty where clause.
w = self.where_class()
- alias = self.join((None, self.model._meta.db_table, None, None))
- pk = self.model._meta.pk
w.add(EverythingNode(), AND)
else:
w = self.where_class()