1
0
mirror of https://github.com/django/django.git synced 2025-06-05 11:39:13 +00:00

Fixed #166 -- Added an 'in' lookup type to the database API

git-svn-id: http://code.djangoproject.com/svn/django/trunk@318 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Adrian Holovaty 2005-07-26 16:53:58 +00:00
parent 63009faa14
commit 284948b9cf
2 changed files with 6 additions and 2 deletions

View File

@ -1020,7 +1020,9 @@ def _get_where_clause(lookup_type, table_prefix, field_name, value):
return '%s%s %s %%s' % (table_prefix, field_name, db.OPERATOR_MAPPING[lookup_type]) return '%s%s %s %%s' % (table_prefix, field_name, db.OPERATOR_MAPPING[lookup_type])
except KeyError: except KeyError:
pass pass
if lookup_type in ('range', 'year'): if lookup_type == 'in':
return '%s%s IN (%s)' % (table_prefix, field_name, ','.join(['%s' for v in value]))
elif lookup_type in ('range', 'year'):
return '%s%s BETWEEN %%s AND %%s' % (table_prefix, field_name) return '%s%s BETWEEN %%s AND %%s' % (table_prefix, field_name)
elif lookup_type in ('month', 'day'): elif lookup_type in ('month', 'day'):
return "%s = %%s" % db.get_date_extract_sql(lookup_type, table_prefix + field_name) return "%s = %%s" % db.get_date_extract_sql(lookup_type, table_prefix + field_name)
@ -1635,7 +1637,7 @@ class Field(object):
"Returns field's value prepared for database lookup." "Returns field's value prepared for database lookup."
if lookup_type in ('exact', 'gt', 'gte', 'lt', 'lte', 'ne', 'month', 'day'): if lookup_type in ('exact', 'gt', 'gte', 'lt', 'lte', 'ne', 'month', 'day'):
return [value] return [value]
elif lookup_type == 'range': elif lookup_type in ('range', 'in'):
return value return value
elif lookup_type == 'year': elif lookup_type == 'year':
return ['%s-01-01' % value, '%s-12-31' % value] return ['%s-01-01' % value, '%s-12-31' % value]

View File

@ -67,6 +67,8 @@ The DB API supports the following lookup types:
lt Less than. lt Less than.
lte Less than or equal to. lte Less than or equal to.
ne Not equal to. ne Not equal to.
in In a given list: ``polls.get_list(id__in=[1, 3, 4])`` returns
a list of polls whose IDs are either 1, 3 or 4.
startswith Case-sensitive starts-with: startswith Case-sensitive starts-with:
``polls.get_list(question_startswith="Would")``. (PostgreSQL ``polls.get_list(question_startswith="Would")``. (PostgreSQL
only. MySQL doesn't support case-sensitive LIKE statements; only. MySQL doesn't support case-sensitive LIKE statements;