# HG changeset patch # User Sylvain Thénault # Date 1276841640 -7200 # Node ID 8b2264e485bcaca490638986330faf90d19247ba # Parent c5ff8cd747581b87011e16a6f3481bbf6ff2f6c1 [ms] orderby/groupby/having attributes of Select node should be resetted to empty tuple, not None diff -r c5ff8cd74758 -r 8b2264e485bc server/mssteps.py --- a/server/mssteps.py Thu Jun 17 18:50:20 2010 +0200 +++ b/server/mssteps.py Fri Jun 18 08:14:00 2010 +0200 @@ -21,8 +21,8 @@ * get data from the parent plan, the latest step, temporary table... * each step has is own members (this is not necessarily bad, but a bit messy for now) +""" -""" __docformat__ = "restructuredtext en" from rql.nodes import VariableRef, Variable, Function @@ -37,11 +37,11 @@ for select in union.children: if keepgroup: having, orderby = select.having, select.orderby - select.having, select.orderby = None, None + select.having, select.orderby = (), () clauses.append( (having, orderby) ) else: groupby, having, orderby = select.groupby, select.having, select.orderby - select.groupby, select.having, select.orderby = None, None, None + select.groupby, select.having, select.orderby = (), (), () clauses.append( (groupby, having, orderby) ) return clauses