summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Kelly <ian.g.kelly@gmail.com>2008-03-17 19:31:42 +0000
committerIan Kelly <ian.g.kelly@gmail.com>2008-03-17 19:31:42 +0000
commit4f5f8735e31267d07f8f4e4854bd16149f3de833 (patch)
tree392c07bd0668fe0c91c25680d5af7252fc11b2f9
parent3c504b0f5c059b406e8b838659e39ad3247753e5 (diff)
Fixed #6666: Corrected a bind param formatting issue when performing 'year' lookups on DateFields using Oracle.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7274 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/db/models/fields/__init__.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/django/db/models/fields/__init__.py b/django/db/models/fields/__init__.py
index 4a47997ae9..088d375e57 100644
--- a/django/db/models/fields/__init__.py
+++ b/django/db/models/fields/__init__.py
@@ -230,9 +230,14 @@ class Field(object):
raise ValueError("The __year lookup type requires an integer argument")
if settings.DATABASE_ENGINE == 'sqlite3':
first = '%s-01-01'
+ second = '%s-12-31 23:59:59.999999'
+ elif settings.DATABASE_ENGINE == 'oracle' and self.get_internal_type() == 'DateField':
+ first = '%s-01-01'
+ second = '%s-12-31'
else:
first = '%s-01-01 00:00:00'
- return [first % value, '%s-12-31 23:59:59.999999' % value]
+ second = '%s-12-31 23:59:59.999999'
+ return [first % value, second % value]
raise TypeError("Field has invalid lookup: %s" % lookup_type)
def has_default(self):