diff options
| author | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2008-03-15 01:59:06 +0000 |
|---|---|---|
| committer | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2008-03-15 01:59:06 +0000 |
| commit | a81813fb4aec2e25850780c3846ad9743bf460ed (patch) | |
| tree | 2d7918b0f47c46e864179ce8ad598b0cb860a3af /django/db/models/sql | |
| parent | 2f45deb72cf815cf78d5221a284918a5ef13e351 (diff) | |
queryset-refactor: Fixed the "in" lookup type when using tuples.
Accidentally broken in r7170. Fixed #6772.
git-svn-id: http://code.djangoproject.com/svn/django/branches/queryset-refactor@7244 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/db/models/sql')
| -rw-r--r-- | django/db/models/sql/where.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/django/db/models/sql/where.py b/django/db/models/sql/where.py index e1c0a88121..f0d2786a49 100644 --- a/django/db/models/sql/where.py +++ b/django/db/models/sql/where.py @@ -6,6 +6,7 @@ import datetime from django.utils import tree from django.db import connection from django.db.models.fields import Field +from django.db.models.query_utils import QueryWrapper from datastructures import EmptyResultSet, FullResultSet # Connection types @@ -110,8 +111,8 @@ class WhereNode(tree.Node): params = field.get_db_prep_lookup(lookup_type, value) else: params = Field().get_db_prep_lookup(lookup_type, value) - if isinstance(params, tuple): - extra, params = params + if isinstance(params, QueryWrapper): + extra, params = params.data else: extra = '' |