Skip to content

Commit 135cf70

Browse files
committed
Add support for QuerySet.dates() and datetimes()
This was blocked on support for QuerySet.distinct() which was added in e04056e..
1 parent b61982e commit 135cf70

File tree

5 files changed

+3
-88
lines changed

5 files changed

+3
-88
lines changed

django_mongodb_backend/compiler.py

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -331,15 +331,6 @@ def cursor_iter(self, cursor, chunk_size, columns):
331331

332332
def check_query(self):
333333
"""Check if the current query is supported by the database."""
334-
if self.query.distinct:
335-
# This is a heuristic to detect QuerySet.datetimes() and dates().
336-
# "datetimefield" and "datefield" are the names of the annotations
337-
# the methods use. A user could annotate with the same names which
338-
# would give an incorrect error message.
339-
if "datetimefield" in self.query.annotations:
340-
raise NotSupportedError("QuerySet.datetimes() is not supported on MongoDB.")
341-
if "datefield" in self.query.annotations:
342-
raise NotSupportedError("QuerySet.dates() is not supported on MongoDB.")
343334
if self.query.extra:
344335
if any(key.startswith("_prefetch_related_") for key in self.query.extra):
345336
raise NotSupportedError("QuerySet.prefetch_related() is not supported on MongoDB.")

django_mongodb_backend/features.py

Lines changed: 1 addition & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -275,81 +275,6 @@ def django_test_expected_failures(self):
275275
"update.tests.AdvancedTests.test_update_ordered_by_m2m_annotation",
276276
"update.tests.AdvancedTests.test_update_ordered_by_m2m_annotation_desc",
277277
},
278-
"QuerySet.dates() is not supported on MongoDB.": {
279-
"admin_changelist.tests.ChangeListTests.test_computed_list_display_localization",
280-
"admin_changelist.tests.ChangeListTests.test_object_tools_displayed_no_add_permission",
281-
"admin_views.tests.AdminViewBasicTest.test_change_list_sorting_override_model_admin",
282-
"admin_views.tests.AdminViewBasicTest.test_multiple_sort_same_field",
283-
"admin_views.tests.AdminViewListEditable.test_inheritance",
284-
"admin_views.tests.CSSTest.test_changelist_field_classes",
285-
"admin_views.tests.DateHierarchyTests",
286-
"aggregation.tests.AggregateTestCase.test_dates_with_aggregation",
287-
"annotations.tests.AliasTests.test_dates_alias",
288-
"aggregation_regress.tests.AggregationTests.test_more_more_more2",
289-
"backends.tests.DateQuotingTest.test_django_date_trunc",
290-
"dates.tests.DatesTests.test_dates_trunc_datetime_fields",
291-
"dates.tests.DatesTests.test_related_model_traverse",
292-
"generic_views.test_dates.ArchiveIndexViewTests.test_allow_empty_archive_view",
293-
"generic_views.test_dates.ArchiveIndexViewTests.test_archive_view",
294-
"generic_views.test_dates.ArchiveIndexViewTests.test_archive_view_by_month",
295-
"generic_views.test_dates.ArchiveIndexViewTests.test_archive_view_context_object_name",
296-
"generic_views.test_dates.ArchiveIndexViewTests.test_archive_view_custom_sorting",
297-
"generic_views.test_dates.ArchiveIndexViewTests.test_archive_view_custom_sorting_dec",
298-
"generic_views.test_dates.ArchiveIndexViewTests.test_archive_view_template",
299-
"generic_views.test_dates.ArchiveIndexViewTests.test_archive_view_template_suffix",
300-
"generic_views.test_dates.ArchiveIndexViewTests.test_date_list_order",
301-
"generic_views.test_dates.ArchiveIndexViewTests.test_no_duplicate_query",
302-
"generic_views.test_dates.ArchiveIndexViewTests.test_paginated_archive_view",
303-
"generic_views.test_dates.ArchiveIndexViewTests.test_paginated_archive_view_does_not_load_entire_table",
304-
"generic_views.test_dates.MonthArchiveViewTests.test_custom_month_format",
305-
"generic_views.test_dates.MonthArchiveViewTests.test_date_list_order",
306-
"generic_views.test_dates.MonthArchiveViewTests.test_month_view",
307-
"generic_views.test_dates.MonthArchiveViewTests.test_month_view_allow_empty",
308-
"generic_views.test_dates.MonthArchiveViewTests.test_month_view_allow_future",
309-
"generic_views.test_dates.MonthArchiveViewTests.test_month_view_get_month_from_request",
310-
"generic_views.test_dates.MonthArchiveViewTests.test_month_view_paginated",
311-
"generic_views.test_dates.MonthArchiveViewTests.test_previous_month_without_content",
312-
"generic_views.test_dates.YearArchiveViewTests.test_date_list_order",
313-
"generic_views.test_dates.YearArchiveViewTests.test_get_context_data_receives_extra_context",
314-
"generic_views.test_dates.YearArchiveViewTests.test_no_duplicate_query",
315-
"generic_views.test_dates.YearArchiveViewTests.test_year_view",
316-
"generic_views.test_dates.YearArchiveViewTests.test_year_view_allow_future",
317-
"generic_views.test_dates.YearArchiveViewTests.test_year_view_custom_sort_order",
318-
"generic_views.test_dates.YearArchiveViewTests.test_year_view_empty",
319-
"generic_views.test_dates.YearArchiveViewTests.test_year_view_make_object_list",
320-
"generic_views.test_dates.YearArchiveViewTests.test_year_view_paginated",
321-
"generic_views.test_dates.YearArchiveViewTests.test_year_view_two_custom_sort_orders",
322-
"many_to_one.tests.ManyToOneTests.test_select_related",
323-
"model_regress.tests.ModelTests.test_date_filter_null",
324-
"reserved_names.tests.ReservedNameTests.test_dates",
325-
"queryset_pickle.tests.PickleabilityTestCase.test_specialized_queryset",
326-
},
327-
"QuerySet.datetimes() is not supported on MongoDB.": {
328-
"admin_views.test_templatetags.DateHierarchyTests",
329-
"admin_views.test_templatetags.AdminTemplateTagsTest.test_override_change_list_template_tags",
330-
"admin_views.tests.AdminViewBasicTest.test_date_hierarchy_empty_queryset",
331-
"admin_views.tests.AdminViewBasicTest.test_date_hierarchy_local_date_differ_from_utc",
332-
"admin_views.tests.AdminViewBasicTest.test_date_hierarchy_timezone_dst",
333-
"annotations.tests.AliasTests.test_datetimes_alias",
334-
"datetimes.tests.DateTimesTests.test_21432",
335-
"datetimes.tests.DateTimesTests.test_datetimes_has_lazy_iterator",
336-
"datetimes.tests.DateTimesTests.test_datetimes_returns_available_dates_for_given_scope_and_given_field",
337-
"datetimes.tests.DateTimesTests.test_related_model_traverse",
338-
"generic_views.test_dates.ArchiveIndexViewTests.test_aware_datetime_archive_view",
339-
"generic_views.test_dates.ArchiveIndexViewTests.test_datetime_archive_view",
340-
"generic_views.test_dates.MonthArchiveViewTests.test_aware_datetime_month_view",
341-
"generic_views.test_dates.MonthArchiveViewTests.test_datetime_month_view",
342-
"generic_views.test_dates.YearArchiveViewTests.test_aware_datetime_year_view",
343-
"generic_views.test_dates.YearArchiveViewTests.test_datetime_year_view",
344-
"model_inheritance_regress.tests.ModelInheritanceTest.test_issue_7105",
345-
"queries.tests.Queries1Tests.test_ticket7155",
346-
"queries.tests.Queries1Tests.test_ticket7791",
347-
"queries.tests.Queries1Tests.test_tickets_6180_6203",
348-
"queries.tests.Queries1Tests.test_tickets_7087_12242",
349-
"timezones.tests.LegacyDatabaseTests.test_query_datetimes",
350-
"timezones.tests.NewDatabaseTests.test_query_datetimes",
351-
"timezones.tests.NewDatabaseTests.test_query_datetimes_in_other_timezone",
352-
},
353278
"QuerySet.extra() is not supported.": {
354279
"aggregation.tests.AggregateTestCase.test_exists_extra_where_with_aggregate",
355280
"annotations.tests.NonAggregateAnnotationTestCase.test_column_field_ordering",
@@ -369,6 +294,7 @@ def django_test_expected_failures(self):
369294
"queries.test_qs_combinators.QuerySetSetOperationTests.test_union_with_extra_and_values_list",
370295
"queries.tests.EscapingTests.test_ticket_7302",
371296
"queries.tests.Queries1Tests.test_tickets_1878_2939",
297+
"queries.tests.Queries1Tests.test_tickets_7087_12242",
372298
"queries.tests.Queries5Tests.test_extra_select_literal_percent_s",
373299
"queries.tests.Queries5Tests.test_ticket7256",
374300
"queries.tests.ValuesQuerysetTests.test_extra_multiple_select_params_values_order_by",

docs/source/ref/models/querysets.rst

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ All of Django's :doc:`QuerySet methods <django:ref/models/querysets>` are
99
supported, except:
1010

1111
- :meth:`bulk_update() <django.db.models.query.QuerySet.bulk_update>`
12-
- :meth:`dates() <django.db.models.query.QuerySet.dates>`
13-
- :meth:`datetimes() <django.db.models.query.QuerySet.datetimes>`
1412
- :meth:`extra() <django.db.models.query.QuerySet.extra>`
1513
- :meth:`prefetch_related() <django.db.models.query.QuerySet.prefetch_related>`
1614

docs/source/releases/5.2.x.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,5 @@ Bug fixes
1919
- Added support for a field's custom lookups and transforms in
2020
``EmbeddedModelField``, e.g. ``ArrayField``’s ``contains``,
2121
``contained__by``, ``len``, etc.
22+
23+
- Added support for ``QuerySet.dates()`` and ``datetimes()``.

docs/source/topics/known-issues.rst

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ Querying
3232
- The following ``QuerySet`` methods aren't supported:
3333

3434
- :meth:`bulk_update() <django.db.models.query.QuerySet.bulk_update>`
35-
- :meth:`dates() <django.db.models.query.QuerySet.dates>`
36-
- :meth:`datetimes() <django.db.models.query.QuerySet.datetimes>`
3735
- :meth:`extra() <django.db.models.query.QuerySet.extra>`
3836
- :meth:`prefetch_related() <django.db.models.query.QuerySet.prefetch_related>`
3937

0 commit comments

Comments
 (0)