store date as datetime

Author: timgraham

django_mongodb/functions.py

@@ -48,5 +48,5 @@ def trunc(self, compiler, connection):
 
 
 def register_functions():
-    Extract.as_mql = extract
+    Extract.as_mql = Extract.as_mql_agg = extract
     TruncBase.as_mql_agg = trunc

django_mongodb/operations.py

@@ -5,11 +5,21 @@
 from django.conf import settings
 from django.db.backends.base.operations import BaseDatabaseOperations
 from django.utils import timezone
+from django.utils.regex_helper import _lazy_re_compile
 
 
 class DatabaseOperations(BaseDatabaseOperations):
     compiler_module = "django_mongodb.compiler"
 
+    def adapt_datefield_value(self, value):
+        """
+        Transform a date value to an object compatible with what is expected
+        by the backend driver for date columns.
+        """
+        if value is None:
+            return None
+        return datetime.datetime.combine(value, datetime.datetime.min.time())
+
     def adapt_datetimefield_value(self, value):
         if value is None:
             return None
@@ -30,6 +40,29 @@ def adapt_timefield_value(self, value):
             raise ValueError("MongoDB backend does not support timezone-aware times.")
         return str(value)
 
+    # EXTRACT format cannot be passed in parameters.
+    _extract_format_re = _lazy_re_compile(r"[A-Z_]+")
+
+    def date_extract_sql(self, lookup_type, sql, params):
+        if lookup_type == "week_day":
+            # For consistency across backends, we return Sunday=1, Saturday=7.
+            return f"EXTRACT(DOW FROM {sql}) + 1", params
+        elif lookup_type == "iso_week_day":
+            return f"EXTRACT(ISODOW FROM {sql})", params
+        elif lookup_type == "iso_year":
+            return f"EXTRACT(ISOYEAR FROM {sql})", params
+
+        lookup_type = lookup_type.upper()
+        if not self._extract_format_re.fullmatch(lookup_type):
+            raise ValueError(f"Invalid lookup type: {lookup_type!r}")
+        return f"EXTRACT({lookup_type} FROM {sql})", params
+
+    def datetime_extract_sql(self, lookup_type, sql, params, tzname):
+        if lookup_type == "second":
+            # Truncate fractional seconds.
+            return f"EXTRACT(SECOND FROM DATE_TRUNC(%s, {sql}))", ("second", *params)
+        return self.date_extract_sql(lookup_type, sql, params)
+
     def datetime_trunc_sql(self, lookup_type, sql, params, tzname):
         return f"DATE_TRUNC(%s, {sql})", (lookup_type, *params)
 
@@ -54,7 +87,7 @@ def get_db_converters(self, expression):
 
     def convert_datefield_value(self, value, expression, connection):
         if value is not None:
-            value = datetime.date.fromisoformat(value)
+            value = value.date()
         return value
 
     def convert_datetimefield_value(self, value, expression, connection):