diff options
| author | Josh Smeaton <josh.smeaton@gmail.com> | 2015-03-16 15:51:23 +1100 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2015-03-17 08:36:15 -0400 |
| commit | 34e09e532da41d56d3ba68babd05c4fd848abaa2 (patch) | |
| tree | cf85977b562305e8ab488cb54b5541104d3b5447 /django | |
| parent | e150bbd4d65b4b2c3897bdabdda94eba508747a2 (diff) | |
[1.8.x] Fixed #24486 -- Fixed error with datetime and DurationField arithmetic
Backport of ff2aa4019259947734c4791d6afc9f5405d901d0 from master
Diffstat (limited to 'django')
| -rw-r--r-- | django/db/models/expressions.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/django/db/models/expressions.py b/django/db/models/expressions.py index 41ce6ba187..0e328ccf55 100644 --- a/django/db/models/expressions.py +++ b/django/db/models/expressions.py @@ -398,9 +398,10 @@ class DurationExpression(Expression): output = side.output_field except FieldError: pass - if output.get_internal_type() == 'DurationField': - sql, params = compiler.compile(side) - return connection.ops.format_for_duration_arithmetic(sql), params + else: + if output.get_internal_type() == 'DurationField': + sql, params = compiler.compile(side) + return connection.ops.format_for_duration_arithmetic(sql), params return compiler.compile(side) def as_sql(self, compiler, connection): |