Skip to content

Commit

Permalink
Fixed #1148 -- Fixed off-by-one error for some databases in get_DATEF…
Browse files Browse the repository at this point in the history
…IELD_list() at the edge of a year. Thanks, Hugo

git-svn-id: http://code.djangoproject.com/svn/django/trunk@2338 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information
adrianholovaty committed Feb 18, 2006
1 parent 73ddfd8 commit 25b149a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
4 changes: 2 additions & 2 deletions django/core/meta/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -1343,9 +1343,9 @@ def _get_where_clause(lookup_type, table_prefix, field_name, value):
pass
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'):
elif lookup_type == 'range':
return '%s%s BETWEEN %%s AND %%s' % (table_prefix, field_name)
elif lookup_type in ('month', 'day'):
elif lookup_type in ('year', 'month', 'day'):
return "%s = %%s" % db.get_date_extract_sql(lookup_type, table_prefix + field_name)
elif lookup_type == 'isnull':
return "%s%s IS %sNULL" % (table_prefix, field_name, (not value and 'NOT ' or ''))
Expand Down
4 changes: 1 addition & 3 deletions django/core/meta/fields.py
Original file line number Diff line number Diff line change
Expand Up @@ -175,12 +175,10 @@ def get_db_prep_save(self, value):

def get_db_prep_lookup(self, lookup_type, value):
"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', 'year', 'month', 'day'):
return [value]
elif lookup_type in ('range', 'in'):
return value
elif lookup_type == 'year':
return ['%s-01-01' % value, '%s-12-31' % value]
elif lookup_type in ('contains', 'icontains'):
return ["%%%s%%" % prep_for_like_query(value)]
elif lookup_type == 'iexact':
Expand Down

0 comments on commit 25b149a

Please sign in to comment.