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

Refs #24485 -- Renamed some expression types

Browse source
This commit is contained in:
Josh Smeaton 2015-03-17 11:38:55 +11:00 • committed by Tim Graham
parent ff2aa40192
commit 88d798d71a
6 changed files with 32 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -42,8 +42,8 @@ class Combinable(object):
other = Value(other)
if reversed:
return Expression(other, connector, self)
return Expression(self, connector, other)
return CombinedExpression(other, connector, self)
return CombinedExpression(self, connector, other)
#############
# OPERATORS #
@ -156,8 +156,8 @@ class BaseExpression(object):
```
def override_as_sql(self, compiler, connection):
# custom logic
return super(ExpressionNode, self).as_sql(compiler, connection)
setattr(ExpressionNode, 'as_' + connection.vendor, override_as_sql)
return super(Expression, self).as_sql(compiler, connection)
setattr(Expression, 'as_' + connection.vendor, override_as_sql)
```
Arguments:
@ -193,7 +193,7 @@ class BaseExpression(object):
* summarize: a terminal aggregate clause
* for_save: whether this expression about to be used in a save or update
Returns: an ExpressionNode to be added to the query.
Returns: an Expression to be added to the query.
"""
c = self.copy()
c.is_summary = summarize
@ -330,17 +330,17 @@ class BaseExpression(object):
return self
class ExpressionNode(BaseExpression, Combinable):
class Expression(BaseExpression, Combinable):
"""
An expression that can be combined with other expressions.
"""
pass
class Expression(ExpressionNode):
class CombinedExpression(Expression):
def __init__(self, lhs, connector, rhs, output_field=None):
super(Expression, self).__init__(output_field=output_field)
super(CombinedExpression, self).__init__(output_field=output_field)
self.connector = connector
self.lhs = lhs
self.rhs = rhs
@ -391,7 +391,7 @@ class Expression(ExpressionNode):
return c
class DurationExpression(Expression):
class DurationExpression(CombinedExpression):
def compile(self, side, compiler, connection):
if not isinstance(side, DurationValue):
try:
@ -447,7 +447,7 @@ class F(Combinable):
return OrderBy(self, descending=True)
class Func(ExpressionNode):
class Func(Expression):
"""
A SQL function call.
"""
@ -504,7 +504,7 @@ class Func(ExpressionNode):
return copy
class Value(ExpressionNode):
class Value(Expression):
"""
Represents a wrapped value as a node within an expression
"""
@ -557,7 +557,7 @@ class DurationValue(Value):
return connection.ops.date_interval_sql(self.value)
class RawSQL(ExpressionNode):
class RawSQL(Expression):
def __init__(self, sql, params, output_field=None):
if output_field is None:
output_field = fields.Field()
@ -574,7 +574,7 @@ class RawSQL(ExpressionNode):
return [self]
class Random(ExpressionNode):
class Random(Expression):
def __init__(self):
super(Random, self).__init__(output_field=fields.FloatField())
@ -585,7 +585,7 @@ class Random(ExpressionNode):
return connection.ops.random_function_sql(), []
class Col(ExpressionNode):
class Col(Expression):
def __init__(self, alias, target, output_field=None):
if output_field is None:
output_field = target
@ -613,7 +613,7 @@ class Col(ExpressionNode):
self.target.get_db_converters(connection))
class Ref(ExpressionNode):
class Ref(Expression):
"""
Reference to column alias of the query. For example, Ref('sum_cost') in
qs.annotate(sum_cost=Sum('cost')) query.
@ -646,7 +646,7 @@ class Ref(ExpressionNode):
return [self]
class When(ExpressionNode):
class When(Expression):
template = 'WHEN %(condition)s THEN %(result)s'
def __init__(self, condition=None, then=None, **lookups):
@ -702,7 +702,7 @@ class When(ExpressionNode):
return cols
class Case(ExpressionNode):
class Case(Expression):
"""
An SQL searched CASE expression:
@ -769,7 +769,7 @@ class Case(ExpressionNode):
return sql, sql_params
class Date(ExpressionNode):
class Date(Expression):
"""
Add a date selection column.
"""
@ -816,7 +816,7 @@ class Date(ExpressionNode):
return value
class DateTime(ExpressionNode):
class DateTime(Expression):
"""
Add a datetime selection column.
"""