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

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Mon Nov  8 10:05:19 2010
New Revision: 40012

URL: http://svn.erp5.org?rev=40012&view=rev
Log:
If both a related key and a real column are found in getColumnSearchKey(), now the related key is used, because adding a related key with the same name should be done by the explicit intention to override the behaviour.

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=40012&r1=40011&r2=40012&view=diff
==============================================================================
--- erp5/trunk/products/ZSQLCatalog/SQLCatalog.py [utf8] (original)
+++ erp5/trunk/products/ZSQLCatalog/SQLCatalog.py [utf8] Mon Nov  8 10:05:19 2010
@@ -1951,20 +1951,19 @@ class Catalog(Folder,
       Also return a related key definition string with following rules:
        - If returned SearchKey is a RelatedKey, value is its definition
        - Otherwise, value is None
+
+      If both a related key and a real column are found, the related key
+      is used.
     """
-    # Is key a "real" column or some related key ?
-    related_key_definition = None
-    if key in self.getColumnMap():
-      search_key = self.getSearchKey(key, search_key_name)
-    else:
-      # Maybe a related key...
-      related_key_definition = self.getRelatedKeyDefinition(key)
-      if related_key_definition is None:
-        # Unknown
-        search_key = None
+    # Is key a related key or a "real" column ?
+    related_key_definition = self.getRelatedKeyDefinition(key)
+    if related_key_definition is None:
+      if key in self.getColumnMap():
+        search_key = self.getSearchKey(key, search_key_name)
       else:
-        # It's a related key
-        search_key = self.getSearchKey(key, 'RelatedKey')
+        search_key = None
+    else:
+      search_key = self.getSearchKey(key, 'RelatedKey')
     return search_key, related_key_definition
 
   def hasColumn(self, column):