[Erp5-report] r15548 - /erp5/trunk/products/ZSQLCatalog/SQLCatalog.py

[nobody at svn.erp5.org]

Author: vincent
Date: Wed Aug  8 11:02:27 2007
New Revision: 15548

URL: http://svn.erp5.org?rev=15548&view=rev
Log:
Revert commit 15547, it was not ready yet to be integrated.

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

Modified: erp5/trunk/products/ZSQLCatalog/SQLCatalog.py
URL: http://svn.erp5.org/erp5/trunk/products/ZSQLCatalog/SQLCatalog.py?rev=15548&r1=15547&r2=15548&view=diff
==============================================================================
--- erp5/trunk/products/ZSQLCatalog/SQLCatalog.py (original)
+++ erp5/trunk/products/ZSQLCatalog/SQLCatalog.py Wed Aug  8 11:02:27 2007
@@ -2071,7 +2071,7 @@
               new_key = '%s.%s' % (query_table, key)
             elif key == 'uid':
               # uid is always ambiguous so we can only change it here
-              new_key = '%s.uid' % (query_table, )
+              new_key = 'catalog.uid'
           else:
             new_key = key
           if new_key is not None:
@@ -2087,7 +2087,7 @@
     select_expression = ''
     group_by_expression = ''
 
-    from_table_dict = {}
+    from_table_dict = {'catalog' : 'catalog'} # Always include catalog table
     if len(kw):
       if kw.has_key('select_expression'):
         select_expression_list.append(kw['select_expression'])