p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed #33224 -- Removed DatabaseFeatures.supports_mixed_date_datetime_comparisons.

This commit is contained in:
Hasan Ramezani 2021-10-27 17:13:40 +02:00 committed by Mariusz Felisiak
parent 9e6d631697
commit c069ee0b9d
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
django/db/backends/base/features.py
View File

@ -112,9 +112,6 @@ class BaseDatabaseFeatures:
# deferred # deferred
can_defer_constraint_checks = False can_defer_constraint_checks = False
# date_interval_sql can properly handle mixed Date/DateTime fields and timedeltas
supports_mixed_date_datetime_comparisons = True
# Does the backend support tablespaces? Default to False because it isn't # Does the backend support tablespaces? Default to False because it isn't
# in the SQL standard. # in the SQL standard.
supports_tablespaces = False supports_tablespaces = False

6
django/db/backends/sqlite3/features.py
View File

@ -18,7 +18,6 @@ class DatabaseFeatures(BaseDatabaseFeatures):
supports_unspecified_pk = True supports_unspecified_pk = True
supports_timezones = False supports_timezones = False
max_query_params = 999 max_query_params = 999
supports_mixed_date_datetime_comparisons = False
supports_transactions = True supports_transactions = True
atomic_transactions = False atomic_transactions = False
can_rollback_ddl = True can_rollback_ddl = True
@ -50,6 +49,11 @@ class DatabaseFeatures(BaseDatabaseFeatures):
'cs': 'binary', 'cs': 'binary',
'non_default': 'nocase', 'non_default': 'nocase',
} }
django_test_expected_failures = {
# The django_format_dtdelta() function doesn't properly handle mixed
# Date/DateTime fields and timedeltas.
'expressions.tests.FTimeDeltaTests.test_mixed_comparisons1',
}
@cached_property @cached_property
def django_test_skips(self): def django_test_skips(self):

1
tests/expressions/tests.py
View File

@ -1473,7 +1473,6 @@ class FTimeDeltaTests(TestCase):
test_set = [e.name for e in Experiment.objects.filter(completed__lte=F('assigned') + days)] test_set = [e.name for e in Experiment.objects.filter(completed__lte=F('assigned') + days)]
self.assertEqual(test_set, self.expnames[:i + 1]) self.assertEqual(test_set, self.expnames[:i + 1])
@skipUnlessDBFeature("supports_mixed_date_datetime_comparisons")
def test_mixed_comparisons1(self): def test_mixed_comparisons1(self):
for i, delay in enumerate(self.delays): for i, delay in enumerate(self.delays):
test_set = [e.name for e in Experiment.objects.filter(assigned__gt=F('start') - delay)] test_set = [e.name for e in Experiment.objects.filter(assigned__gt=F('start') - delay)]