diff options
| author | Vytis Banaitis <vytis.banaitis@gmail.com> | 2017-02-12 16:43:04 +0200 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2017-02-16 12:35:40 -0500 |
| commit | eedf276ed1b247c87d3852db4241da1aa9779589 (patch) | |
| tree | 7df519aa311499034a9f4c61d464333a9ed6f11f | |
| parent | 4f0185aac39fff4a5f1a3a3f103e6e920eb60703 (diff) | |
[1.11.x] Fixed #27828 -- Fixed a crash when subtracting Integer/DurationField from DateField on Oracle/PostgreSQL.
Backport of d5088f838d837fc9e3109c828f18511055f20bea from master
| -rw-r--r-- | django/db/models/expressions.py | 2 | ||||
| -rw-r--r-- | docs/releases/1.10.6.txt | 3 | ||||
| -rw-r--r-- | tests/expressions/tests.py | 6 |
3 files changed, 10 insertions, 1 deletions
diff --git a/django/db/models/expressions.py b/django/db/models/expressions.py index 36c2b969db..01f1333651 100644 --- a/django/db/models/expressions.py +++ b/django/db/models/expressions.py @@ -390,7 +390,7 @@ class CombinedExpression(Expression): return DurationExpression(self.lhs, self.connector, self.rhs).as_sql(compiler, connection) if (lhs_output and rhs_output and self.connector == self.SUB and lhs_output.get_internal_type() in {'DateField', 'DateTimeField', 'TimeField'} and - lhs_output.get_internal_type() == lhs_output.get_internal_type()): + lhs_output.get_internal_type() == rhs_output.get_internal_type()): return TemporalSubtraction(self.lhs, self.rhs).as_sql(compiler, connection) expressions = [] expression_params = [] diff --git a/docs/releases/1.10.6.txt b/docs/releases/1.10.6.txt index 483854c0e6..b549ae1b9a 100644 --- a/docs/releases/1.10.6.txt +++ b/docs/releases/1.10.6.txt @@ -14,3 +14,6 @@ Bugfixes * Fixed ``RequestDataTooBig`` and ``TooManyFieldsSent`` exceptions crashing rather than generating a bad request response (:ticket:`27820`). + +* Fixed a crash on Oracle and PostgreSQL when subtracting ``DurationField`` + or ``IntegerField`` from ``DateField`` (:ticket:`27828`). diff --git a/tests/expressions/tests.py b/tests/expressions/tests.py index 8399e3c0a9..7bdcb5f1cd 100644 --- a/tests/expressions/tests.py +++ b/tests/expressions/tests.py @@ -1187,6 +1187,12 @@ class FTimeDeltaTests(TestCase): ).order_by('name') self.assertQuerysetEqual(over_estimate, ['e3', 'e4'], lambda e: e.name) + def test_date_minus_duration(self): + more_than_4_days = Experiment.objects.filter( + assigned__lt=F('completed') - Value(datetime.timedelta(days=4), output_field=models.DurationField()) + ) + self.assertQuerysetEqual(more_than_4_days, ['e3', 'e4'], lambda e: e.name) + def test_negative_timedelta_update(self): # subtract 30 seconds, 30 minutes, 2 hours and 2 days experiments = Experiment.objects.filter(name='e0').annotate( |