mirror of
				https://github.com/django/django.git
				synced 2025-10-31 09:41:08 +00:00 
			
		
		
		
	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
This commit is contained in:
		| @@ -329,15 +329,10 @@ class Query(object): | |||||||
|                 # Since 'self' matches everything, add an explicit "include |                 # Since 'self' matches everything, add an explicit "include | ||||||
|                 # everything" where-constraint so that connections between the |                 # everything" where-constraint so that connections between the | ||||||
|                 # where clauses won't exclude valid results. |                 # 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) |                 self.where.add(EverythingNode(), AND) | ||||||
|         elif self.where: |         elif self.where: | ||||||
|             # rhs has an empty where clause. Make it match everything (see |             # rhs has an empty where clause. | ||||||
|             # above for reasoning). |  | ||||||
|             w = self.where_class() |             w = self.where_class() | ||||||
|             alias = self.join((None, self.model._meta.db_table, None, None)) |  | ||||||
|             pk = self.model._meta.pk |  | ||||||
|             w.add(EverythingNode(), AND) |             w.add(EverythingNode(), AND) | ||||||
|         else: |         else: | ||||||
|             w = self.where_class() |             w = self.where_class() | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user