summaryrefslogtreecommitdiff
path: root/django/db/backends/mysql/operations.py
diff options
context:
space:
mode:
authorSergey Fedoseev <fedoseev.sergey@gmail.com>2017-12-08 19:53:27 +0500
committerTim Graham <timograham@gmail.com>2017-12-08 09:53:27 -0500
commitc5a2f48bed44e024fa9cf9512ad948af9bcbad96 (patch)
tree364f56a916d7c0ba0738f7c04909b49fad662442 /django/db/backends/mysql/operations.py
parent23a27f2c03afddba7076d7f491fe8391c2931e3e (diff)
downloaddjango-c5a2f48bed44e024fa9cf9512ad948af9bcbad96.tar.gz
Improved performance of loading DateTimeField on Oracle and MySQL.
Diffstat (limited to 'django/db/backends/mysql/operations.py')
-rw-r--r--django/db/backends/mysql/operations.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/django/db/backends/mysql/operations.py b/django/db/backends/mysql/operations.py
index 474cd8d467..fff72e056c 100644
--- a/django/db/backends/mysql/operations.py
+++ b/django/db/backends/mysql/operations.py
@@ -219,7 +219,8 @@ class DatabaseOperations(BaseDatabaseOperations):
elif internal_type in ['BooleanField', 'NullBooleanField']:
converters.append(self.convert_booleanfield_value)
elif internal_type == 'DateTimeField':
- converters.append(self.convert_datetimefield_value)
+ if settings.USE_TZ:
+ converters.append(self.convert_datetimefield_value)
elif internal_type == 'UUIDField':
converters.append(self.convert_uuidfield_value)
return converters
@@ -236,8 +237,7 @@ class DatabaseOperations(BaseDatabaseOperations):
def convert_datetimefield_value(self, value, expression, connection):
if value is not None:
- if settings.USE_TZ:
- value = timezone.make_aware(value, self.connection.timezone)
+ value = timezone.make_aware(value, self.connection.timezone)
return value
def convert_uuidfield_value(self, value, expression, connection):