diff options
| author | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2007-12-19 13:06:45 +0000 |
|---|---|---|
| committer | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2007-12-19 13:06:45 +0000 |
| commit | 7292cc8d60f9e993c26755456468cfd4cd8eb03e (patch) | |
| tree | bbd9f6b9e8c256ac1c0b4c34b453833e8ac06872 /django/db/models/sql/query.py | |
| parent | 4dc766c9e1912dd0858c8ef80197fe2a3bb1ec92 (diff) | |
queryset-refactor: Reverted [6762] because it generates invalid SQL. It only worked accidentally with SQLite.
Refs #4002.
git-svn-id: http://code.djangoproject.com/svn/django/branches/queryset-refactor@6961 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/db/models/sql/query.py')
| -rw-r--r-- | django/db/models/sql/query.py | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py index 35dfbcb12f..2f7a08e4dd 100644 --- a/django/db/models/sql/query.py +++ b/django/db/models/sql/query.py @@ -723,16 +723,8 @@ class Query(object): opts = self.model._meta alias = self.join((None, opts.db_table, None, None)) - try: - field, target, unused, join_list = self.setup_joins(parts, opts, - alias, (connector == AND)) - except TypeError, e: - if len(parts) != 1 or parts[0] not in self.extra_select: - raise e - # Filtering on some alias from extra(select=...) - self.where.add([None, parts[0], None, lookup_type, value], - connector) - return + field, target, unused, join_list, = self.setup_joins(parts, opts, + alias, (connector == AND)) col = target.column alias = join_list[-1][-1] |