[Erp5-report] r26176 - /erp5/trunk/products/ZSQLCatalog/SQLExpression.py

[nobody at svn.erp5.org]

Author: vincent
Date: Fri Mar 27 07:08:34 2009
New Revision: 26176

URL: http://svn.erp5.org?rev=26176&view=rev
Log:
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.

Modified:
    erp5/trunk/products/ZSQLCatalog/SQLExpression.py

Modified: erp5/trunk/products/ZSQLCatalog/SQLExpression.py
URL: http://svn.erp5.org/erp5/trunk/products/ZSQLCatalog/SQLExpression.py?rev=26176&r1=26175&r2=26176&view=diff
==============================================================================
--- erp5/trunk/products/ZSQLCatalog/SQLExpression.py [utf8] (original)
+++ erp5/trunk/products/ZSQLCatalog/SQLExpression.py [utf8] Fri Mar 27 07:08:34 2009
@@ -314,7 +314,7 @@
                 sql_expression.query,
                 ', '.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:
           mergeable_set.add(alias)
     return result, mergeable_set