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

[nobody at svn.erp5.org]

Author: vincent
Date: Fri Feb 27 11:06:48 2009
New Revision: 25739

URL: http://svn.erp5.org?rev=25739&view=rev
Log:
Distinguish the case where a related key has the same name as a column from the case where a related key is declared more than once.

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=25739&r1=25738&r2=25739&view=diff
==============================================================================
--- erp5/trunk/products/ZSQLCatalog/SQLCatalog.py [utf8] (original)
+++ erp5/trunk/products/ZSQLCatalog/SQLCatalog.py [utf8] Fri Feb 27 11:06:48 2009
@@ -1739,8 +1739,11 @@
         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 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]))
+      if related_key_id in column_set:
+        if 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]))
+        else:
+          LOG('SQLCatalog', 100, 'Related key %r is declared more than once.' % (related_key_id, )
       column_set.add(related_key_id)
     return column_set