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

[nobody at svn.erp5.org]

Author: yusei
Date: Fri Feb 27 03:52:58 2009
New Revision: 25734

URL: http://svn.erp5.org?rev=25734&view=rev
Log:
It is not obvious that there is the same name column is in table somewhere.
because column_set is extended.

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=25734&r1=25733&r2=25734&view=diff
==============================================================================
--- erp5/trunk/products/ZSQLCatalog/SQLCatalog.py [utf8] (original)
+++ erp5/trunk/products/ZSQLCatalog/SQLCatalog.py [utf8] Fri Feb 27 03:52:58 2009
@@ -1739,7 +1739,7 @@
         LOG('SQLCatalog', 100, 'Malformed related key definition: %r. Ignored.' % (entire_definition, ))
         continue
       related_key_id = split_entire_definition[0].strip()
-      if related_key_id in column_set:
+      if related_key_id in column_set and related_key_id in column_map:
         LOG('SQLCatalog', 100, 'Related key %r has the same name as an existing column on tables %r' % (related_key_id, column_map[related_key_id]))
       column_set.add(related_key_id)
     return column_set