mirror of
https://github.com/django/django.git
synced 2025-09-26 12:09:19 +00:00
Refs #33355 -- Fixed Trunc() with years < 1000 on SQLite.
Thanks to Nick Pope for spotting the bug in Code Review. Co-Authored-By: Nick Pope <nick@nickpope.me.uk>
This commit is contained in:
parent
c66ecc5568
commit
5111b636d9
3 changed files with 32 additions and 17 deletions
|
@ -653,7 +653,7 @@ class DateFunctionTests(TestCase):
|
|||
self.assertEqual(DTModel.objects.filter(start_datetime__second=ExtractSecond('start_datetime')).count(), 2)
|
||||
|
||||
def test_trunc_func(self):
|
||||
start_datetime = datetime(2015, 6, 15, 14, 30, 50, 321)
|
||||
start_datetime = datetime(999, 6, 15, 14, 30, 50, 321)
|
||||
end_datetime = datetime(2016, 6, 15, 14, 10, 50, 123)
|
||||
if settings.USE_TZ:
|
||||
start_datetime = timezone.make_aware(start_datetime)
|
||||
|
@ -730,9 +730,7 @@ class DateFunctionTests(TestCase):
|
|||
qs = DTModel.objects.filter(start_datetime__date=Trunc('start_datetime', 'day', output_field=DateField()))
|
||||
self.assertEqual(qs.count(), 2)
|
||||
|
||||
def test_trunc_week(self):
|
||||
start_datetime = datetime(2015, 6, 15, 14, 30, 50, 321)
|
||||
end_datetime = datetime(2016, 6, 15, 14, 10, 50, 123)
|
||||
def _test_trunc_week(self, start_datetime, end_datetime):
|
||||
if settings.USE_TZ:
|
||||
start_datetime = timezone.make_aware(start_datetime)
|
||||
end_datetime = timezone.make_aware(end_datetime)
|
||||
|
@ -760,6 +758,18 @@ class DateFunctionTests(TestCase):
|
|||
lambda m: (m.start_datetime, m.truncated),
|
||||
)
|
||||
|
||||
def test_trunc_week(self):
|
||||
self._test_trunc_week(
|
||||
start_datetime=datetime(2015, 6, 15, 14, 30, 50, 321),
|
||||
end_datetime=datetime(2016, 6, 15, 14, 10, 50, 123),
|
||||
)
|
||||
|
||||
def test_trunc_week_before_1000(self):
|
||||
self._test_trunc_week(
|
||||
start_datetime=datetime(999, 6, 15, 14, 30, 50, 321),
|
||||
end_datetime=datetime(2016, 6, 15, 14, 10, 50, 123),
|
||||
)
|
||||
|
||||
def test_trunc_invalid_arguments(self):
|
||||
msg = 'output_field must be either DateField, TimeField, or DateTimeField'
|
||||
with self.assertRaisesMessage(ValueError, msg):
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue