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

Fixed #31312 -- Properly ordered temporal subtraction params on MySQL. 

Regression in 9bcbcd599a.

Thanks rick2ricks for the report.
This commit is contained in:
Simon Charette 2020-02-27 00:34:37 -05:00 committed by Mariusz Felisiak
parent f1016814d8
commit 41ebe60728
3 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/db/backends/mysql/operations.py
View File

@ -291,7 +291,7 @@ class DatabaseOperations(BaseDatabaseOperations):
"((TIME_TO_SEC(%(lhs)s) * 1000000 + MICROSECOND(%(lhs)s)) -" "((TIME_TO_SEC(%(lhs)s) * 1000000 + MICROSECOND(%(lhs)s)) -"
" (TIME_TO_SEC(%(rhs)s) * 1000000 + MICROSECOND(%(rhs)s)))" " (TIME_TO_SEC(%(rhs)s) * 1000000 + MICROSECOND(%(rhs)s)))"
) % {'lhs': lhs_sql, 'rhs': rhs_sql}, tuple(lhs_params) * 2 + tuple(rhs_params) * 2 ) % {'lhs': lhs_sql, 'rhs': rhs_sql}, tuple(lhs_params) * 2 + tuple(rhs_params) * 2
params = (*lhs_params, *rhs_params) params = (*rhs_params, *lhs_params)
return "TIMESTAMPDIFF(MICROSECOND, %s, %s)" % (rhs_sql, lhs_sql), params return "TIMESTAMPDIFF(MICROSECOND, %s, %s)" % (rhs_sql, lhs_sql), params
def explain_query_prefix(self, format=None, **options): def explain_query_prefix(self, format=None, **options):

4
docs/releases/3.0.4.txt
View File

@ -23,3 +23,7 @@ Bugfixes
* Fixed a regression in Django 3.0 that caused misplacing parameters in logged * Fixed a regression in Django 3.0 that caused misplacing parameters in logged
SQL queries on Oracle (:ticket:`31271`). SQL queries on Oracle (:ticket:`31271`).
* Fixed a regression in Django 3.0.3 that caused misplacing parameters of SQL
queries when subtracting ``DateField`` or ``DateTimeField`` expressions on
MySQL (:ticket:`31312`).

23
tests/expressions/tests.py
View File

@ -1221,13 +1221,13 @@ class FTimeDeltaTests(TestCase):
# e0: started same day as assigned, zero duration # e0: started same day as assigned, zero duration
end = stime + delta0 end = stime + delta0
e0 = Experiment.objects.create( cls.e0 = Experiment.objects.create(
name='e0', assigned=sday, start=stime, end=end, name='e0', assigned=sday, start=stime, end=end,
completed=end.date(), estimated_time=delta0, completed=end.date(), estimated_time=delta0,
) )
cls.deltas.append(delta0) cls.deltas.append(delta0)
cls.delays.append(e0.start - datetime.datetime.combine(e0.assigned, midnight)) cls.delays.append(cls.e0.start - datetime.datetime.combine(cls.e0.assigned, midnight))
cls.days_long.append(e0.completed - e0.assigned) cls.days_long.append(cls.e0.completed - cls.e0.assigned)
# e1: started one day after assigned, tiny duration, data # e1: started one day after assigned, tiny duration, data
# set so that end time has no fractional seconds, which # set so that end time has no fractional seconds, which
@ -1434,6 +1434,23 @@ class FTimeDeltaTests(TestCase):
).filter(difference=datetime.timedelta()) ).filter(difference=datetime.timedelta())
self.assertTrue(queryset.exists()) self.assertTrue(queryset.exists())
@skipUnlessDBFeature('supports_temporal_subtraction')
def test_date_case_subtraction(self):
queryset = Experiment.objects.annotate(
date_case=Case(
When(Q(name='e0'), then=F('completed')),
output_field=DateField(),
),
completed_value=Value(
self.e0.completed,
output_field=DateField(),
),
difference=ExpressionWrapper(
F('date_case') - F('completed_value'), output_field=DurationField(),
),
).filter(difference=datetime.timedelta())
self.assertEqual(queryset.get(), self.e0)
@skipUnlessDBFeature('supports_temporal_subtraction') @skipUnlessDBFeature('supports_temporal_subtraction')
def test_time_subtraction(self): def test_time_subtraction(self):
Time.objects.create(time=datetime.time(12, 30, 15, 2345)) Time.objects.create(time=datetime.time(12, 30, 15, 2345))