0.90-bugfixes: backport [2238]. Refs #1148

git-svn-id: http://code.djangoproject.com/svn/django/branches/0.90-bugfixes@4270 bcc190cf-cafb-0310-a4f2-bffc1f526a37

2 files changed, 3 insertions, 5 deletions

diff --git a/django/core/meta/__init__.py b/django/core/meta/__init__.py
index 328a2f449c..9b11b3a6cc 100644
--- a/django/core/meta/__init__.py
+++ b/django/core/meta/__init__.py
@@ -1126,9 +1126,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 ''))
diff --git a/django/core/meta/fields.py b/django/core/meta/fields.py
index 06403f0a31..68410d5630 100644
--- a/django/core/meta/fields.py
+++ b/django/core/meta/fields.py
@@ -157,12 +157,10 @@ class Field(object):
 
     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':