summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaren Tracey <kmtracey@gmail.com>2009-01-15 15:11:28 +0000
committerKaren Tracey <kmtracey@gmail.com>2009-01-15 15:11:28 +0000
commit91e25f9ef8a00dcc4af83329ac2f07a08be9a2b6 (patch)
treee126886d53206cc5ebe238bfd318e0ab900cfe93
parent14d15093bcf2b37b76d9dda7edc680ba3dc4d49e (diff)
Fixed #10033: In the Oracle backend, restored code lost in the aggregation merge that ensured a datetime object is returned for fields known to be datetimes, even when the time part is all zero.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9747 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/db/backends/oracle/query.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/django/db/backends/oracle/query.py b/django/db/backends/oracle/query.py
index ad9cd47d19..8563420d7f 100644
--- a/django/db/backends/oracle/query.py
+++ b/django/db/backends/oracle/query.py
@@ -87,7 +87,9 @@ def query_class(QueryClass, Database):
value = datetime.datetime(value.year, value.month,
value.day, value.hour, value.minute, value.second,
value.fsecond)
- if field and field.get_internal_type() == 'DateField':
+ if field and field.get_internal_type() == 'DateTimeField':
+ pass
+ elif field and field.get_internal_type() == 'DateField':
value = value.date()
elif field and field.get_internal_type() == 'TimeField' or (value.year == 1900 and value.month == value.day == 1):
value = value.time()