Commit 20ee0b8b authored by Vincent Pelletier's avatar Vincent Pelletier

Fix result dict content: merge-ability of each entry is present in asides set.

This code was a remain from never-commited implementation, sorry for commiting it.

git-svn-id: 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent d2b7c947
......@@ -314,7 +314,7 @@ class SQLExpression(object):
', '.join('%r (%r)' % (x, x.query) for x in self.sql_expression_list))
raise ValueError, message
result[alias] = (column, can_merge_sql_expression)
result[alias] = column
if can_merge_sql_expression:
return result, mergeable_set
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment