Ticket #6141: fix.diff

django/db/models/fields/__init__.py

@@ -209 +209 @@
-
-    def get_db_prep_lookup(self, lookup_type, value):
-        "Returns field's value prepared for database lookup."
-
+year', '
-            return [value]
-        elif lookup_type in ('range', 'in'):
-            return value
@@ -223 +223 @@
-            return ["%%%s" % prep_for_like_query(value)]
-        elif lookup_type == 'isnull':
-            return []
-        elif lookup_type == 'year':
-            try:
-                value = int(value)
-            except ValueError:
-                raise ValueError("The __year lookup type requires an integer argument")
-            return ['%s-01-01 00:00:00' % value, '%s-12-31 23:59:59.999999' % value]
-        raise TypeError("Field has invalid lookup: %s" % lookup_type)
-
-    def has_default(self):

django/db/models/query.py

@@ -807 +807 @@
-            return '%s IN (%s)' % (field_sql, in_string)
-        else:
-            raise EmptyResultSet
-in ('range', 'year')
+== 'range'
-        return '%s BETWEEN %%s AND %%s' % field_sql
-
+year', '
-        return "%s = %%s" % connection.ops.date_extract_sql(lookup_type, field_sql)
-    elif lookup_type == 'isnull':
-        return "%s IS %sNULL" % (field_sql, (not value and 'NOT ' or ''))