mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-08-22 19:44:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Update converters to take a consistent set of parameters.

Browse source 
As suggested by Anssi. This has the slightly strange side effect of
passing the expression to Expression.convert_value has the expression
passed back to it, but it allows more complex patterns of expressions.
This commit is contained in:
Marc Tamlyn 2015-02-20 10:53:59 +00:00
parent 4755f8fc25
commit 32d4db66b9
19 changed files with 44 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

6
django/db/models/expressions.py
View file

@ -252,7 +252,7 @@ class BaseExpression(object):
raise FieldError(
"Expression contains mixed types. You must set output_field")
def convert_value(self, value, connection, context):
def convert_value(self, value, expression, connection, context):
"""
Expressions provide their own converters because users have the option
of manually specifying the output_field which may be a different type
@ -804,7 +804,7 @@ class Date(ExpressionNode):
copy.lookup_type = self.lookup_type
return copy
def convert_value(self, value, connection, context):
def convert_value(self, value, expression, connection, context):
if isinstance(value, datetime.datetime):
value = value.date()
return value
@ -856,7 +856,7 @@ class DateTime(ExpressionNode):
copy.tzname = self.tzname
return copy
def convert_value(self, value, connection, context):
def convert_value(self, value, expression, connection, context):
if settings.USE_TZ:
if value is None:
raise ValueError(