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

Allowed Func subclasses to add kwargs to __repr__(). 

Thanks Tim Graham for the review.
This commit is contained in:
Mariusz Felisiak 2017-07-17 16:07:19 +02:00 committed by Tim Graham
parent adab280cef
commit e5835a7cb8
2 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
django/db/models/aggregates.py
View File

@ -70,12 +70,8 @@ class Count(Aggregate):
output_field=IntegerField(), **extra output_field=IntegerField(), **extra
) )
def __repr__(self): def _get_repr_options(self):
return "{}({}, distinct={})".format( return {'distinct': self.extra['distinct'] != ''}
self.__class__.__name__,
self.arg_joiner.join(str(arg) for arg in self.source_expressions),
'False' if self.extra['distinct'] == '' else 'True',
)
def convert_value(self, value, expression, connection, context): def convert_value(self, value, expression, connection, context):
if value is None: if value is None:
@ -100,12 +96,8 @@ class StdDev(Aggregate):
self.function = 'STDDEV_SAMP' if sample else 'STDDEV_POP' self.function = 'STDDEV_SAMP' if sample else 'STDDEV_POP'
super().__init__(expression, output_field=FloatField(), **extra) super().__init__(expression, output_field=FloatField(), **extra)
def __repr__(self): def _get_repr_options(self):
return "{}({}, sample={})".format( return {'sample': self.function == 'STDDEV_SAMP'}
self.__class__.__name__,
self.arg_joiner.join(str(arg) for arg in self.source_expressions),
'False' if self.function == 'STDDEV_POP' else 'True',
)
def convert_value(self, value, expression, connection, context): def convert_value(self, value, expression, connection, context):
if value is None: if value is None:
@ -134,12 +126,8 @@ class Variance(Aggregate):
self.function = 'VAR_SAMP' if sample else 'VAR_POP' self.function = 'VAR_SAMP' if sample else 'VAR_POP'
super().__init__(expression, output_field=FloatField(), **extra) super().__init__(expression, output_field=FloatField(), **extra)
def __repr__(self): def _get_repr_options(self):
return "{}({}, sample={})".format( return {'sample': self.function == 'VAR_SAMP'}
self.__class__.__name__,
self.arg_joiner.join(str(arg) for arg in self.source_expressions),
'False' if self.function == 'VAR_POP' else 'True',
)
def convert_value(self, value, expression, connection, context): def convert_value(self, value, expression, connection, context):
if value is None: if value is None:

7
django/db/models/expressions.py
View File

@ -531,11 +531,16 @@ class Func(Expression):
def __repr__(self): def __repr__(self):
args = self.arg_joiner.join(str(arg) for arg in self.source_expressions) args = self.arg_joiner.join(str(arg) for arg in self.source_expressions)
extra = ', '.join(str(key) + '=' + str(val) for key, val in self.extra.items()) extra = dict(self.extra, **self._get_repr_options())
if extra: if extra:
extra = ', '.join(str(key) + '=' + str(val) for key, val in extra.items())
return "{}({}, {})".format(self.__class__.__name__, args, extra) return "{}({}, {})".format(self.__class__.__name__, args, extra)
return "{}({})".format(self.__class__.__name__, args) return "{}({})".format(self.__class__.__name__, args)
def _get_repr_options(self):
"""Return a dict of extra __init__() options to include in the repr."""
return {}
def get_source_expressions(self): def get_source_expressions(self):
return self.source_expressions return self.source_expressions