rework time zone support to set DatabaseFeatures.supports_timezones = False

Author: timgraham

django_mongodb/base.py

@@ -120,7 +120,6 @@ def _connect(self):
         self.connection = MongoClient(
             host=settings_dict["HOST"] or None,
             port=int(settings_dict["PORT"] or 27017),
-            tz_aware=True,
             **options,
         )
         db_name = settings_dict["NAME"]

django_mongodb/features.py

@@ -7,6 +7,8 @@ class DatabaseFeatures(BaseDatabaseFeatures):
     supports_ignore_conflicts = False
     # Not implemented: https://github.com/mongodb-labs/django-mongodb/issues/8
     supports_json_field = False
+    # MongoDB stores datetimes in UTC.
+    supports_timezones = False
     # Not implemented: https://github.com/mongodb-labs/django-mongodb/issues/7
     supports_transactions = False
     uses_savepoints = False
@@ -214,8 +216,8 @@ class DatabaseFeatures(BaseDatabaseFeatures):
             "timezones.tests.LegacyDatabaseTests.test_cursor_execute_accepts_naive_datetime",
             "timezones.tests.LegacyDatabaseTests.test_cursor_execute_returns_naive_datetime",
             "timezones.tests.LegacyDatabaseTests.test_raw_sql",
-            "timezones.tests.NewDatabaseTests.test_cursor_execute_accepts_aware_datetime",
-            "timezones.tests.NewDatabaseTests.test_cursor_execute_returns_aware_datetime",
+            "timezones.tests.NewDatabaseTests.test_cursor_execute_accepts_naive_datetime",
+            "timezones.tests.NewDatabaseTests.test_cursor_execute_returns_naive_datetime",
             "timezones.tests.NewDatabaseTests.test_cursor_explicit_time_zone",
             "timezones.tests.NewDatabaseTests.test_raw_sql",
         },

django_mongodb/operations.py

@@ -17,14 +17,24 @@ def adapt_datefield_value(self, value):
         return datetime.datetime.combine(value, datetime.datetime.min.time())
 
     def adapt_datetimefield_value(self, value):
-        if not settings.USE_TZ and value is not None and timezone.is_naive(value):
-            value = timezone.make_aware(value)
+        if value is None:
+            return None
+        if timezone.is_aware(value):
+            if settings.USE_TZ:
+                value = timezone.make_naive(value, self.connection.timezone)
+            else:
+                raise ValueError(
+                    "MongoDB backend does not support timezone-aware "
+                    "datetimes when USE_TZ is False."
+                )
         return value
 
     def adapt_timefield_value(self, value):
         """Store TimeField as datetime."""
         if value is None:
             return None
+        if timezone.is_aware(value):
+            raise ValueError("MongoDB backend does not support timezone-aware times.")
         return datetime.datetime.combine(datetime.datetime.min.date(), value)
 
     def get_db_converters(self, expression):
@@ -33,7 +43,7 @@ def get_db_converters(self, expression):
         if internal_type == "DateField":
             converters.append(self.convert_datefield_value)
         elif internal_type == "DateTimeField":
-            if not settings.USE_TZ:
+            if settings.USE_TZ:
                 converters.append(self.convert_datetimefield_value)
         elif internal_type == "DecimalField":
             converters.append(self.convert_decimalfield_value)
@@ -50,8 +60,7 @@ def convert_datefield_value(self, value, expression, connection):
 
     def convert_datetimefield_value(self, value, expression, connection):
         if value is not None:
-            # Django expects naive datetimes when settings.USE_TZ is False.
-            value = timezone.make_naive(value)
+            value = timezone.make_aware(value, self.connection.timezone)
         return value
 
     def convert_decimalfield_value(self, value, expression, connection):