diff options
| author | Tim Graham <timograham@gmail.com> | 2017-09-22 15:34:24 -0400 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2017-09-25 14:48:15 -0400 |
| commit | a80903b7114c984b5087597e8c34750e7bb44f51 (patch) | |
| tree | 62f8064da3575b8e8980813f4888d7a0c70b39a3 /tests/db_functions/test_datetime.py | |
| parent | 8a1768432b1ec3ecfa390ac5eb70dbfb0cff59b3 (diff) | |
Removed DatabaseFeatures.supports_microsecond_precision.
MySQL 5.5 (refs #28552) was the last database to use it.
Diffstat (limited to 'tests/db_functions/test_datetime.py')
| -rw-r--r-- | tests/db_functions/test_datetime.py | 127 |
1 files changed, 60 insertions, 67 deletions
diff --git a/tests/db_functions/test_datetime.py b/tests/db_functions/test_datetime.py index f168f73c86..e2f786bf6b 100644 --- a/tests/db_functions/test_datetime.py +++ b/tests/db_functions/test_datetime.py @@ -3,7 +3,6 @@ from datetime import datetime import pytz from django.conf import settings -from django.db import connection from django.db.models import DateField, DateTimeField, IntegerField, TimeField from django.db.models.functions import ( Extract, ExtractDay, ExtractHour, ExtractMinute, ExtractMonth, @@ -19,10 +18,6 @@ from django.utils import timezone from .models import DTModel -def microsecond_support(value): - return value if connection.features.supports_microsecond_precision else value.replace(microsecond=0) - - def truncate_to(value, kind, tzinfo=None): # Convert to target timezone before truncation if tzinfo is not None: @@ -138,8 +133,8 @@ class DateFunctionTests(TestCase): self.assertEqual(str(qs.query).count('extract'), 0) def test_extract_func(self): - start_datetime = microsecond_support(datetime(2015, 6, 15, 14, 30, 50, 321)) - end_datetime = microsecond_support(datetime(2016, 6, 15, 14, 10, 50, 123)) + 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) @@ -212,8 +207,8 @@ class DateFunctionTests(TestCase): @skipUnlessDBFeature('has_native_duration_field') def test_extract_duration(self): - start_datetime = microsecond_support(datetime(2015, 6, 15, 14, 30, 50, 321)) - end_datetime = microsecond_support(datetime(2016, 6, 15, 14, 10, 50, 123)) + 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) @@ -241,8 +236,8 @@ class DateFunctionTests(TestCase): list(DTModel.objects.annotate(extracted=Extract('duration', 'second'))) def test_extract_year_func(self): - start_datetime = microsecond_support(datetime(2015, 6, 15, 14, 30, 50, 321)) - end_datetime = microsecond_support(datetime(2016, 6, 15, 14, 10, 50, 123)) + 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) @@ -261,8 +256,8 @@ class DateFunctionTests(TestCase): self.assertEqual(DTModel.objects.filter(start_datetime__year=ExtractYear('start_datetime')).count(), 2) def test_extract_month_func(self): - start_datetime = microsecond_support(datetime(2015, 6, 15, 14, 30, 50, 321)) - end_datetime = microsecond_support(datetime(2016, 6, 15, 14, 10, 50, 123)) + 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) @@ -281,8 +276,8 @@ class DateFunctionTests(TestCase): self.assertEqual(DTModel.objects.filter(start_datetime__month=ExtractMonth('start_datetime')).count(), 2) def test_extract_day_func(self): - start_datetime = microsecond_support(datetime(2015, 6, 15, 14, 30, 50, 321)) - end_datetime = microsecond_support(datetime(2016, 6, 15, 14, 10, 50, 123)) + 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) @@ -301,8 +296,8 @@ class DateFunctionTests(TestCase): self.assertEqual(DTModel.objects.filter(start_datetime__day=ExtractDay('start_datetime')).count(), 2) def test_extract_week_func(self): - start_datetime = microsecond_support(datetime(2015, 6, 15, 14, 30, 50, 321)) - end_datetime = microsecond_support(datetime(2016, 6, 15, 14, 10, 50, 123)) + 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) @@ -322,8 +317,8 @@ class DateFunctionTests(TestCase): self.assertEqual(DTModel.objects.filter(start_datetime__week=ExtractWeek('start_datetime')).count(), 2) def test_extract_quarter_func(self): - start_datetime = microsecond_support(datetime(2015, 6, 15, 14, 30, 50, 321)) - end_datetime = microsecond_support(datetime(2016, 8, 15, 14, 10, 50, 123)) + start_datetime = datetime(2015, 6, 15, 14, 30, 50, 321) + end_datetime = datetime(2016, 8, 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) @@ -342,12 +337,12 @@ class DateFunctionTests(TestCase): self.assertEqual(DTModel.objects.filter(start_datetime__quarter=ExtractQuarter('start_datetime')).count(), 2) def test_extract_quarter_func_boundaries(self): - end_datetime = microsecond_support(datetime(2016, 6, 15, 14, 10, 50, 123)) + end_datetime = datetime(2016, 6, 15, 14, 10, 50, 123) if settings.USE_TZ: end_datetime = timezone.make_aware(end_datetime, is_dst=False) - last_quarter_2014 = microsecond_support(datetime(2014, 12, 31, 13, 0)) - first_quarter_2015 = microsecond_support(datetime(2015, 1, 1, 13, 0)) + last_quarter_2014 = datetime(2014, 12, 31, 13, 0) + first_quarter_2015 = datetime(2015, 1, 1, 13, 0) if settings.USE_TZ: last_quarter_2014 = timezone.make_aware(last_quarter_2014, is_dst=False) first_quarter_2015 = timezone.make_aware(first_quarter_2015, is_dst=False) @@ -363,13 +358,13 @@ class DateFunctionTests(TestCase): ], lambda m: (m.start_datetime, m.extracted)) def test_extract_week_func_boundaries(self): - end_datetime = microsecond_support(datetime(2016, 6, 15, 14, 10, 50, 123)) + 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 = microsecond_support(datetime(2014, 12, 27, 13, 0)) # Sunday - week_1_day_2014_2015 = microsecond_support(datetime(2014, 12, 31, 13, 0)) # Wednesday - week_53_day_2015 = microsecond_support(datetime(2015, 12, 31, 13, 0)) # Thursday + 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) @@ -389,8 +384,8 @@ class DateFunctionTests(TestCase): ], lambda m: (m.start_datetime, m.extracted)) def test_extract_weekday_func(self): - start_datetime = microsecond_support(datetime(2015, 6, 15, 14, 30, 50, 321)) - end_datetime = microsecond_support(datetime(2016, 6, 15, 14, 10, 50, 123)) + 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) @@ -415,8 +410,8 @@ class DateFunctionTests(TestCase): self.assertEqual(DTModel.objects.filter(start_datetime__week_day=ExtractWeekDay('start_datetime')).count(), 2) def test_extract_hour_func(self): - start_datetime = microsecond_support(datetime(2015, 6, 15, 14, 30, 50, 321)) - end_datetime = microsecond_support(datetime(2016, 6, 15, 14, 10, 50, 123)) + 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) @@ -435,8 +430,8 @@ class DateFunctionTests(TestCase): self.assertEqual(DTModel.objects.filter(start_datetime__hour=ExtractHour('start_datetime')).count(), 2) def test_extract_minute_func(self): - start_datetime = microsecond_support(datetime(2015, 6, 15, 14, 30, 50, 321)) - end_datetime = microsecond_support(datetime(2016, 6, 15, 14, 10, 50, 123)) + 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) @@ -455,8 +450,8 @@ class DateFunctionTests(TestCase): self.assertEqual(DTModel.objects.filter(start_datetime__minute=ExtractMinute('start_datetime')).count(), 2) def test_extract_second_func(self): - start_datetime = microsecond_support(datetime(2015, 6, 15, 14, 30, 50, 321)) - end_datetime = microsecond_support(datetime(2016, 6, 15, 14, 10, 50, 123)) + 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) @@ -475,8 +470,8 @@ class DateFunctionTests(TestCase): self.assertEqual(DTModel.objects.filter(start_datetime__second=ExtractSecond('start_datetime')).count(), 2) def test_trunc_func(self): - start_datetime = microsecond_support(datetime(2015, 6, 15, 14, 30, 50, 321)) - end_datetime = microsecond_support(datetime(2016, 6, 15, 14, 10, 50, 123)) + 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) @@ -557,8 +552,8 @@ class DateFunctionTests(TestCase): self.assertEqual(qs.count(), 2) def test_trunc_year_func(self): - start_datetime = microsecond_support(datetime(2015, 6, 15, 14, 30, 50, 321)) - end_datetime = truncate_to(microsecond_support(datetime(2016, 6, 15, 14, 10, 50, 123)), 'year') + start_datetime = datetime(2015, 6, 15, 14, 30, 50, 321) + end_datetime = truncate_to(datetime(2016, 6, 15, 14, 10, 50, 123), 'year') if settings.USE_TZ: start_datetime = timezone.make_aware(start_datetime, is_dst=False) end_datetime = timezone.make_aware(end_datetime, is_dst=False) @@ -589,10 +584,10 @@ class DateFunctionTests(TestCase): list(DTModel.objects.annotate(truncated=TruncYear('start_time', output_field=TimeField()))) def test_trunc_quarter_func(self): - start_datetime = microsecond_support(datetime(2015, 6, 15, 14, 30, 50, 321)) - end_datetime = truncate_to(microsecond_support(datetime(2016, 10, 15, 14, 10, 50, 123)), 'quarter') - last_quarter_2015 = truncate_to(microsecond_support(datetime(2015, 12, 31, 14, 10, 50, 123)), 'quarter') - first_quarter_2016 = truncate_to(microsecond_support(datetime(2016, 1, 1, 14, 10, 50, 123)), 'quarter') + start_datetime = datetime(2015, 6, 15, 14, 30, 50, 321) + end_datetime = truncate_to(datetime(2016, 10, 15, 14, 10, 50, 123), 'quarter') + last_quarter_2015 = truncate_to(datetime(2015, 12, 31, 14, 10, 50, 123), 'quarter') + first_quarter_2016 = truncate_to(datetime(2016, 1, 1, 14, 10, 50, 123), 'quarter') if settings.USE_TZ: start_datetime = timezone.make_aware(start_datetime, is_dst=False) end_datetime = timezone.make_aware(end_datetime, is_dst=False) @@ -630,8 +625,8 @@ class DateFunctionTests(TestCase): list(DTModel.objects.annotate(truncated=TruncQuarter('start_time', output_field=TimeField()))) def test_trunc_month_func(self): - start_datetime = microsecond_support(datetime(2015, 6, 15, 14, 30, 50, 321)) - end_datetime = truncate_to(microsecond_support(datetime(2016, 6, 15, 14, 10, 50, 123)), 'month') + start_datetime = datetime(2015, 6, 15, 14, 30, 50, 321) + end_datetime = truncate_to(datetime(2016, 6, 15, 14, 10, 50, 123), 'month') if settings.USE_TZ: start_datetime = timezone.make_aware(start_datetime, is_dst=False) end_datetime = timezone.make_aware(end_datetime, is_dst=False) @@ -662,8 +657,8 @@ class DateFunctionTests(TestCase): list(DTModel.objects.annotate(truncated=TruncMonth('start_time', output_field=TimeField()))) def test_trunc_date_func(self): - start_datetime = microsecond_support(datetime(2015, 6, 15, 14, 30, 50, 321)) - end_datetime = microsecond_support(datetime(2016, 6, 15, 14, 10, 50, 123)) + 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) @@ -686,8 +681,8 @@ class DateFunctionTests(TestCase): list(DTModel.objects.annotate(truncated=TruncDate('start_time', output_field=TimeField()))) def test_trunc_time_func(self): - start_datetime = microsecond_support(datetime(2015, 6, 15, 14, 30, 50, 321)) - end_datetime = microsecond_support(datetime(2016, 6, 15, 14, 10, 50, 123)) + 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) @@ -710,8 +705,8 @@ class DateFunctionTests(TestCase): list(DTModel.objects.annotate(truncated=TruncTime('start_date', output_field=DateField()))) def test_trunc_day_func(self): - start_datetime = microsecond_support(datetime(2015, 6, 15, 14, 30, 50, 321)) - end_datetime = truncate_to(microsecond_support(datetime(2016, 6, 15, 14, 10, 50, 123)), 'day') + start_datetime = datetime(2015, 6, 15, 14, 30, 50, 321) + end_datetime = truncate_to(datetime(2016, 6, 15, 14, 10, 50, 123), 'day') if settings.USE_TZ: start_datetime = timezone.make_aware(start_datetime, is_dst=False) end_datetime = timezone.make_aware(end_datetime, is_dst=False) @@ -734,8 +729,8 @@ class DateFunctionTests(TestCase): list(DTModel.objects.annotate(truncated=TruncDay('start_time', output_field=TimeField()))) def test_trunc_hour_func(self): - start_datetime = microsecond_support(datetime(2015, 6, 15, 14, 30, 50, 321)) - end_datetime = truncate_to(microsecond_support(datetime(2016, 6, 15, 14, 10, 50, 123)), 'hour') + start_datetime = datetime(2015, 6, 15, 14, 30, 50, 321) + end_datetime = truncate_to(datetime(2016, 6, 15, 14, 10, 50, 123), 'hour') if settings.USE_TZ: start_datetime = timezone.make_aware(start_datetime, is_dst=False) end_datetime = timezone.make_aware(end_datetime, is_dst=False) @@ -766,8 +761,8 @@ class DateFunctionTests(TestCase): list(DTModel.objects.annotate(truncated=TruncHour('start_date', output_field=DateField()))) def test_trunc_minute_func(self): - start_datetime = microsecond_support(datetime(2015, 6, 15, 14, 30, 50, 321)) - end_datetime = truncate_to(microsecond_support(datetime(2016, 6, 15, 14, 10, 50, 123)), 'minute') + start_datetime = datetime(2015, 6, 15, 14, 30, 50, 321) + end_datetime = truncate_to(datetime(2016, 6, 15, 14, 10, 50, 123), 'minute') if settings.USE_TZ: start_datetime = timezone.make_aware(start_datetime, is_dst=False) end_datetime = timezone.make_aware(end_datetime, is_dst=False) @@ -798,8 +793,8 @@ class DateFunctionTests(TestCase): list(DTModel.objects.annotate(truncated=TruncMinute('start_date', output_field=DateField()))) def test_trunc_second_func(self): - start_datetime = microsecond_support(datetime(2015, 6, 15, 14, 30, 50, 321)) - end_datetime = truncate_to(microsecond_support(datetime(2016, 6, 15, 14, 10, 50, 123)), 'second') + start_datetime = datetime(2015, 6, 15, 14, 30, 50, 321) + end_datetime = truncate_to(datetime(2016, 6, 15, 14, 10, 50, 123), 'second') if settings.USE_TZ: start_datetime = timezone.make_aware(start_datetime, is_dst=False) end_datetime = timezone.make_aware(end_datetime, is_dst=False) @@ -821,9 +816,7 @@ class DateFunctionTests(TestCase): ], lambda m: (m.start_datetime, m.extracted) ) - - result = 1 if connection.features.supports_microsecond_precision else 2 - self.assertEqual(DTModel.objects.filter(start_datetime=TruncSecond('start_datetime')).count(), result) + self.assertEqual(DTModel.objects.filter(start_datetime=TruncSecond('start_datetime')).count(), 1) with self.assertRaisesMessage(ValueError, "Cannot truncate DateField 'start_date' to DateTimeField"): list(DTModel.objects.annotate(truncated=TruncSecond('start_date'))) @@ -836,8 +829,8 @@ class DateFunctionTests(TestCase): class DateFunctionWithTimeZoneTests(DateFunctionTests): def test_extract_func_with_timezone(self): - start_datetime = microsecond_support(datetime(2015, 6, 15, 23, 30, 1, 321)) - end_datetime = microsecond_support(datetime(2015, 6, 16, 13, 11, 27, 123)) + start_datetime = datetime(2015, 6, 15, 23, 30, 1, 321) + end_datetime = datetime(2015, 6, 16, 13, 11, 27, 123) 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) @@ -877,8 +870,8 @@ class DateFunctionWithTimeZoneTests(DateFunctionTests): self.assertEqual(melb_model.hour_melb, 9) def test_extract_func_explicit_timezone_priority(self): - start_datetime = microsecond_support(datetime(2015, 6, 15, 23, 30, 1, 321)) - end_datetime = microsecond_support(datetime(2015, 6, 16, 13, 11, 27, 123)) + start_datetime = datetime(2015, 6, 15, 23, 30, 1, 321) + end_datetime = datetime(2015, 6, 16, 13, 11, 27, 123) 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) @@ -893,8 +886,8 @@ class DateFunctionWithTimeZoneTests(DateFunctionTests): self.assertEqual(model.day_utc, 15) def test_trunc_timezone_applied_before_truncation(self): - start_datetime = microsecond_support(datetime(2016, 1, 1, 1, 30, 50, 321)) - end_datetime = microsecond_support(datetime(2016, 6, 15, 14, 10, 50, 123)) + start_datetime = datetime(2016, 1, 1, 1, 30, 50, 321) + end_datetime = datetime(2016, 6, 15, 14, 10, 50, 123) 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) @@ -919,8 +912,8 @@ class DateFunctionWithTimeZoneTests(DateFunctionTests): If the truncated datetime transitions to a different offset (daylight saving) then the returned value will have that new timezone/offset. """ - start_datetime = microsecond_support(datetime(2015, 6, 15, 14, 30, 50, 321)) - end_datetime = microsecond_support(datetime(2016, 6, 15, 14, 10, 50, 123)) + start_datetime = datetime(2015, 6, 15, 14, 30, 50, 321) + end_datetime = datetime(2016, 6, 15, 14, 10, 50, 123) 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) |
