summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/sql/functions.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2009-01-28 01:28:20 +0000
committerMike Bayer <mike_mp@zzzcomputing.com>2009-01-28 01:28:20 +0000
commit397ba5d73d8486a2092cacfaaa743d92731ce67c (patch)
treec8703adb47ed04f345374242a25055c2749f04e4 /lib/sqlalchemy/sql/functions.py
parent7e7aa8f7c28628c4b5de7428c33ed63552e8f5b9 (diff)
downloadsqlalchemy-397ba5d73d8486a2092cacfaaa743d92731ce67c.tar.gz
- _CalculatedClause is gone
- Function rolls the various standalone execution functionality of CC into itself, accesses its internal state more directly - collate just uses _BinaryExpression, don't know why it didn't do this already - added new _Case construct, compiles directly - the world is a happier place
Diffstat (limited to 'lib/sqlalchemy/sql/functions.py')
-rw-r--r--lib/sqlalchemy/sql/functions.py9
1 files changed, 2 insertions, 7 deletions
diff --git a/lib/sqlalchemy/sql/functions.py b/lib/sqlalchemy/sql/functions.py
index 1bcc6d864..c6cb938d4 100644
--- a/lib/sqlalchemy/sql/functions.py
+++ b/lib/sqlalchemy/sql/functions.py
@@ -13,18 +13,13 @@ class _GenericMeta(VisitableType):
class GenericFunction(Function):
__metaclass__ = _GenericMeta
- def __init__(self, type_=None, group=True, args=(), **kwargs):
+ def __init__(self, type_=None, args=(), **kwargs):
self.packagenames = []
self.name = self.__class__.__name__
self._bind = kwargs.get('bind', None)
- if group:
- self.clause_expr = ClauseList(
+ self.clause_expr = ClauseList(
operator=operators.comma_op,
group_contents=True, *args).self_group()
- else:
- self.clause_expr = ClauseList(
- operator=operators.comma_op,
- group_contents=True, *args)
self.type = sqltypes.to_instance(
type_ or getattr(self, '__return_type__', None))