diff options
| author | Justin Bronn <jbronn@gmail.com> | 2009-04-01 16:01:50 +0000 |
|---|---|---|
| committer | Justin Bronn <jbronn@gmail.com> | 2009-04-01 16:01:50 +0000 |
| commit | 03de1fe5f4269f9b8ad9f61ce7810e8a73d95b4f (patch) | |
| tree | 3ad4fe17479da000b8cf6f574a7a4089f0349659 /django/db/models/sql/query.py | |
| parent | f1c64816bbee4b8fc7477b8407c6999960776291 (diff) | |
Fixed #9871 -- Geometry objects are now returned in dictionaries and tuples returned by `values()` and `values_list()`, respectively; updated `GeoQuery` methods to be compatible with `defer()` and `only`; removed defunct `GeomSQL` class; and removed redundant logic from `Query.get_default_columns`.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10326 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/db/models/sql/query.py')
| -rw-r--r-- | django/db/models/sql/query.py | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py index 0583386000..ce732b1046 100644 --- a/django/db/models/sql/query.py +++ b/django/db/models/sql/query.py @@ -784,8 +784,6 @@ class BaseQuery(object): aliases.add(r) if with_aliases: col_aliases.add(field.column) - if as_pairs: - return result, aliases return result, aliases def get_from_clause(self): |