Fixed #10154: Allow combining F expressions with timedelta values.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15018 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 10 insertions, 0 deletions

diff --git a/django/db/models/sql/expressions.py b/django/db/models/sql/expressions.py
index fffbba085c..1bbf742b5c 100644
--- a/django/db/models/sql/expressions.py
+++ b/django/db/models/sql/expressions.py
@@ -85,3 +85,13 @@ class SQLEvaluator(object):
             return col.as_sql(qn, connection), ()
         else:
             return '%s.%s' % (qn(col[0]), qn(col[1])), ()
+
+    def evaluate_date_modifier_node(self, node, qn, connection):
+        timedelta = node.children.pop()
+        sql, params = self.evaluate_node(node, qn, connection)
+
+        if timedelta.days == 0 and timedelta.seconds == 0 and \
+                timedelta.microseconds == 0:
+            return sql, params
+
+        return connection.ops.date_interval_sql(sql, node.connector, timedelta), params