diff options
| author | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2007-10-15 00:29:55 +0000 |
|---|---|---|
| committer | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2007-10-15 00:29:55 +0000 |
| commit | 05ebc901fef3e8982db320d269357bf9096f3ead (patch) | |
| tree | 974ca2b8cf2bf451b85562c7564da2d6eea08290 /django | |
| parent | 201c15dcb62543ea66ff66858be088340ed50221 (diff) | |
queryset-refactor: Fixed a couple of typos that were messing up extra(select=...).
git-svn-id: http://code.djangoproject.com/svn/django/branches/queryset-refactor@6512 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django')
| -rw-r--r-- | django/db/models/query.py | 2 | ||||
| -rw-r--r-- | django/db/models/sql/query.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/django/db/models/query.py b/django/db/models/query.py index 25febd6d88..b2ed0d36a7 100644 --- a/django/db/models/query.py +++ b/django/db/models/query.py @@ -96,7 +96,7 @@ class _QuerySet(object): else: obj = self.model(*row[:index_end]) for i, k in enumerate(extra_select): - setattr(obj, k[0], row[index_end + i]) + setattr(obj, k, row[index_end + i]) yield obj def count(self): diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py index 5d96ec8020..3c0e342c86 100644 --- a/django/db/models/sql/query.py +++ b/django/db/models/sql/query.py @@ -342,7 +342,7 @@ class Query(object): """ qn = self.quote_name_unless_alias result = [] - if self.select or self.extra_select: + if self.select: for col in self.select: if isinstance(col, (list, tuple)): result.append('%s.%s' % (qn(col[0]), qn(col[1]))) |