Replace a (currently) un-fixable log by an XXX comment in code.

Remove deprecated method from API.
Update method caller to use private method instead, while advertising that it must be fixed when technical alternative is implemented.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@27099 20353a03-c40f-0410-a6d1-a30d3c3de9de

product/ZSQLCatalog/ColumnMap.py

@@ -474,10 +474,6 @@ class ColumnMap(object):
   def _addJoinQuery(self, query):
     self.join_query_list.append(query)
 
-  def addJoinQuery(self, query):
-    LOG('ColumnMap', INFO, 'addJoinQuery use is discouraged')
-    self._addJoinQuery(query)
-
   def iterJoinQueryList(self):
     return iter(self.join_query_list)
 

product/ZSQLCatalog/Interface/IColumnMap.py

@@ -271,13 +271,6 @@ class IColumnMap(Interface):
         Group id of given table.
     """
 
-  def addJoinQuery(query):
-    """
-      Adds a query to a list of top-level queries.
-      This method is only made available at interface level for backward
-      compatibility.
-    """
-
   def iterJoinQueryList():
     """
       Get an iterator over queries internally generated when resolving column

product/ZSQLCatalog/SearchKey/RelatedKey.py

@@ -190,7 +190,10 @@ class RelatedKey(SearchKey):
     # Note that doing this has a side effect on result list, as objects
     # lacking a relation will never appear in the result.
     if BACKWARD_COMPATIBILITY:
-      column_map.addJoinQuery(SQLQuery(rendered_related_key))
+      # XXX: Calling a private-ish method on column_map.
+      # This should never happen. It should be removed as soon as an
+      # alternative exists.
+      column_map._addJoinQuery(SQLQuery(rendered_related_key))
       return None
     else:
       return SQLExpression(self, where_expression=rendered_related_key)