mirror of
https://github.com/django/django.git
synced 2025-07-24 05:36:15 +00:00
Fixed #28649 -- Added ExtractIsoYear database function and iso_year lookup.
This commit is contained in:
Sigurd Ljødal
Tim Graham
parent
c832885a3e
commit
3e09b37f80
10 changed files with 161 additions and 46 deletions
|
|
@ -7,10 +7,10 @@ from django.db.models import (
|
|||
DateField, DateTimeField, IntegerField, Max, OuterRef, Subquery, TimeField,
|
||||
)
|
||||
from django.db.models.functions import (
|
||||
Extract, ExtractDay, ExtractHour, ExtractMinute, ExtractMonth,
|
||||
ExtractQuarter, ExtractSecond, ExtractWeek, ExtractWeekDay, ExtractYear,
|
||||
Trunc, TruncDate, TruncDay, TruncHour, TruncMinute, TruncMonth,
|
||||
TruncQuarter, TruncSecond, TruncTime, TruncWeek, TruncYear,
|
||||
Extract, ExtractDay, ExtractHour, ExtractIsoYear, ExtractMinute,
|
||||
ExtractMonth, ExtractQuarter, ExtractSecond, ExtractWeek, ExtractWeekDay,
|
||||
ExtractYear, Trunc, TruncDate, TruncDay, TruncHour, TruncMinute,
|
||||
TruncMonth, TruncQuarter, TruncSecond, TruncTime, TruncWeek, TruncYear,
|
||||
)
|
||||
from django.test import (
|
||||
TestCase, override_settings, skipIfDBFeature, skipUnlessDBFeature,
|
||||
|
|
@ -86,25 +86,25 @@ class DateFunctionTests(TestCase):
|
|||
self.create_model(start_datetime, end_datetime)
|
||||
self.create_model(end_datetime, start_datetime)
|
||||
|
||||
qs = DTModel.objects.filter(start_datetime__year__exact=2015)
|
||||
self.assertEqual(qs.count(), 1)
|
||||
query_string = str(qs.query).lower()
|
||||
self.assertEqual(query_string.count(' between '), 1)
|
||||
self.assertEqual(query_string.count('extract'), 0)
|
||||
|
||||
# exact is implied and should be the same
|
||||
qs = DTModel.objects.filter(start_datetime__year=2015)
|
||||
self.assertEqual(qs.count(), 1)
|
||||
query_string = str(qs.query).lower()
|
||||
self.assertEqual(query_string.count(' between '), 1)
|
||||
self.assertEqual(query_string.count('extract'), 0)
|
||||
|
||||
# date and datetime fields should behave the same
|
||||
qs = DTModel.objects.filter(start_date__year=2015)
|
||||
self.assertEqual(qs.count(), 1)
|
||||
query_string = str(qs.query).lower()
|
||||
self.assertEqual(query_string.count(' between '), 1)
|
||||
self.assertEqual(query_string.count('extract'), 0)
|
||||
for lookup in ('year', 'iso_year'):
|
||||
with self.subTest(lookup):
|
||||
qs = DTModel.objects.filter(**{'start_datetime__%s__exact' % lookup: 2015})
|
||||
self.assertEqual(qs.count(), 1)
|
||||
query_string = str(qs.query).lower()
|
||||
self.assertEqual(query_string.count(' between '), 1)
|
||||
self.assertEqual(query_string.count('extract'), 0)
|
||||
# exact is implied and should be the same
|
||||
qs = DTModel.objects.filter(**{'start_datetime__%s' % lookup: 2015})
|
||||
self.assertEqual(qs.count(), 1)
|
||||
query_string = str(qs.query).lower()
|
||||
self.assertEqual(query_string.count(' between '), 1)
|
||||
self.assertEqual(query_string.count('extract'), 0)
|
||||
# date and datetime fields should behave the same
|
||||
qs = DTModel.objects.filter(**{'start_date__%s' % lookup: 2015})
|
||||
self.assertEqual(qs.count(), 1)
|
||||
query_string = str(qs.query).lower()
|
||||
self.assertEqual(query_string.count(' between '), 1)
|
||||
self.assertEqual(query_string.count('extract'), 0)
|
||||
|
||||
def test_extract_year_greaterthan_lookup(self):
|
||||
start_datetime = datetime(2015, 6, 15, 14, 10)
|
||||
|
|
@ -115,12 +115,14 @@ class DateFunctionTests(TestCase):
|
|||
self.create_model(start_datetime, end_datetime)
|
||||
self.create_model(end_datetime, start_datetime)
|
||||
|
||||
qs = DTModel.objects.filter(start_datetime__year__gt=2015)
|
||||
self.assertEqual(qs.count(), 1)
|
||||
self.assertEqual(str(qs.query).lower().count('extract'), 0)
|
||||
qs = DTModel.objects.filter(start_datetime__year__gte=2015)
|
||||
self.assertEqual(qs.count(), 2)
|
||||
self.assertEqual(str(qs.query).lower().count('extract'), 0)
|
||||
for lookup in ('year', 'iso_year'):
|
||||
with self.subTest(lookup):
|
||||
qs = DTModel.objects.filter(**{'start_datetime__%s__gt' % lookup: 2015})
|
||||
self.assertEqual(qs.count(), 1)
|
||||
self.assertEqual(str(qs.query).lower().count('extract'), 0)
|
||||
qs = DTModel.objects.filter(**{'start_datetime__%s__gte' % lookup: 2015})
|
||||
self.assertEqual(qs.count(), 2)
|
||||
self.assertEqual(str(qs.query).lower().count('extract'), 0)
|
||||
|
||||
def test_extract_year_lessthan_lookup(self):
|
||||
start_datetime = datetime(2015, 6, 15, 14, 10)
|
||||
|
|
@ -131,12 +133,14 @@ class DateFunctionTests(TestCase):
|
|||
self.create_model(start_datetime, end_datetime)
|
||||
self.create_model(end_datetime, start_datetime)
|
||||
|
||||
qs = DTModel.objects.filter(start_datetime__year__lt=2016)
|
||||
self.assertEqual(qs.count(), 1)
|
||||
self.assertEqual(str(qs.query).count('extract'), 0)
|
||||
qs = DTModel.objects.filter(start_datetime__year__lte=2016)
|
||||
self.assertEqual(qs.count(), 2)
|
||||
self.assertEqual(str(qs.query).count('extract'), 0)
|
||||
for lookup in ('year', 'iso_year'):
|
||||
with self.subTest(lookup):
|
||||
qs = DTModel.objects.filter(**{'start_datetime__%s__lt' % lookup: 2016})
|
||||
self.assertEqual(qs.count(), 1)
|
||||
self.assertEqual(str(qs.query).count('extract'), 0)
|
||||
qs = DTModel.objects.filter(**{'start_datetime__%s__lte' % lookup: 2016})
|
||||
self.assertEqual(qs.count(), 2)
|
||||
self.assertEqual(str(qs.query).count('extract'), 0)
|
||||
|
||||
def test_extract_func(self):
|
||||
start_datetime = datetime(2015, 6, 15, 14, 30, 50, 321)
|
||||
|
|
@ -261,6 +265,51 @@ class DateFunctionTests(TestCase):
|
|||
)
|
||||
self.assertEqual(DTModel.objects.filter(start_datetime__year=ExtractYear('start_datetime')).count(), 2)
|
||||
|
||||
def test_extract_iso_year_func(self):
|
||||
start_datetime = datetime(2015, 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, is_dst=False)
|
||||
end_datetime = timezone.make_aware(end_datetime, is_dst=False)
|
||||
self.create_model(start_datetime, end_datetime)
|
||||
self.create_model(end_datetime, start_datetime)
|
||||
self.assertQuerysetEqual(
|
||||
DTModel.objects.annotate(extracted=ExtractIsoYear('start_datetime')).order_by('start_datetime'),
|
||||
[(start_datetime, start_datetime.year), (end_datetime, end_datetime.year)],
|
||||
lambda m: (m.start_datetime, m.extracted)
|
||||
)
|
||||
self.assertQuerysetEqual(
|
||||
DTModel.objects.annotate(extracted=ExtractIsoYear('start_date')).order_by('start_datetime'),
|
||||
[(start_datetime, start_datetime.year), (end_datetime, end_datetime.year)],
|
||||
lambda m: (m.start_datetime, m.extracted)
|
||||
)
|
||||
# Both dates are from the same week year.
|
||||
self.assertEqual(DTModel.objects.filter(start_datetime__iso_year=ExtractIsoYear('start_datetime')).count(), 2)
|
||||
|
||||
def test_extract_iso_year_func_boundaries(self):
|
||||
end_datetime = datetime(2016, 6, 15, 14, 10, 50, 123)
|
||||
if settings.USE_TZ:
|
||||
end_datetime = timezone.make_aware(end_datetime, is_dst=False)
|
||||
week_52_day_2014 = datetime(2014, 12, 27, 13, 0) # Sunday
|
||||
week_1_day_2014_2015 = datetime(2014, 12, 31, 13, 0) # Wednesday
|
||||
week_53_day_2015 = datetime(2015, 12, 31, 13, 0) # Thursday
|
||||
if settings.USE_TZ:
|
||||
week_1_day_2014_2015 = timezone.make_aware(week_1_day_2014_2015, is_dst=False)
|
||||
week_52_day_2014 = timezone.make_aware(week_52_day_2014, is_dst=False)
|
||||
week_53_day_2015 = timezone.make_aware(week_53_day_2015, is_dst=False)
|
||||
days = [week_52_day_2014, week_1_day_2014_2015, week_53_day_2015]
|
||||
self.create_model(week_53_day_2015, end_datetime)
|
||||
self.create_model(week_52_day_2014, end_datetime)
|
||||
self.create_model(week_1_day_2014_2015, end_datetime)
|
||||
qs = DTModel.objects.filter(start_datetime__in=days).annotate(
|
||||
extracted=ExtractIsoYear('start_datetime'),
|
||||
).order_by('start_datetime')
|
||||
self.assertQuerysetEqual(qs, [
|
||||
(week_52_day_2014, 2014),
|
||||
(week_1_day_2014_2015, 2015),
|
||||
(week_53_day_2015, 2015),
|
||||
], lambda m: (m.start_datetime, m.extracted))
|
||||
|
||||
def test_extract_month_func(self):
|
||||
start_datetime = datetime(2015, 6, 15, 14, 30, 50, 321)
|
||||
end_datetime = datetime(2016, 6, 15, 14, 10, 50, 123)
|
||||
|
|
@ -902,6 +951,7 @@ class DateFunctionWithTimeZoneTests(DateFunctionTests):
|
|||
day=Extract('start_datetime', 'day'),
|
||||
day_melb=Extract('start_datetime', 'day', tzinfo=melb),
|
||||
week=Extract('start_datetime', 'week', tzinfo=melb),
|
||||
isoyear=ExtractIsoYear('start_datetime', tzinfo=melb),
|
||||
weekday=ExtractWeekDay('start_datetime'),
|
||||
weekday_melb=ExtractWeekDay('start_datetime', tzinfo=melb),
|
||||
quarter=ExtractQuarter('start_datetime', tzinfo=melb),
|
||||
|
|
@ -913,6 +963,7 @@ class DateFunctionWithTimeZoneTests(DateFunctionTests):
|
|||
self.assertEqual(utc_model.day, 15)
|
||||
self.assertEqual(utc_model.day_melb, 16)
|
||||
self.assertEqual(utc_model.week, 25)
|
||||
self.assertEqual(utc_model.isoyear, 2015)
|
||||
self.assertEqual(utc_model.weekday, 2)
|
||||
self.assertEqual(utc_model.weekday_melb, 3)
|
||||
self.assertEqual(utc_model.quarter, 2)
|
||||
|
|
@ -925,6 +976,7 @@ class DateFunctionWithTimeZoneTests(DateFunctionTests):
|
|||
self.assertEqual(melb_model.day, 16)
|
||||
self.assertEqual(melb_model.day_melb, 16)
|
||||
self.assertEqual(melb_model.week, 25)
|
||||
self.assertEqual(melb_model.isoyear, 2015)
|
||||
self.assertEqual(melb_model.weekday, 3)
|
||||
self.assertEqual(melb_model.quarter, 2)
|
||||
self.assertEqual(melb_model.weekday_melb, 3)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue