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

[nobody at svn.erp5.org]

Author: vincent
Date: Tue Aug  7 14:54:35 2007
New Revision: 15527

URL: http://svn.erp5.org?rev=15527&view=rev
Log:
Remove implicit join with catalog. You need to update Resource_zGetInventoryList and Resource_zGetMovementHistoryList from erp5_core.

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=15527&r1=15526&r2=15527&view=diff
==============================================================================
--- erp5/trunk/products/ZSQLCatalog/SQLCatalog.py (original)
+++ erp5/trunk/products/ZSQLCatalog/SQLCatalog.py Tue Aug  7 14:54:35 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 = 'catalog.uid'
+              new_key = '%s.uid' % (query_table, )
           else:
             new_key = key
           if new_key is not None:
@@ -2087,7 +2087,7 @@
     select_expression = ''
     group_by_expression = ''
 
-    from_table_dict = {'catalog' : 'catalog'} # Always include catalog table
+    from_table_dict = {}
     if len(kw):
       if kw.has_key('select_expression'):
         select_expression_list.append(kw['select_expression'])