ZSQLCatalog: Move catalog table registration out of ColumnMap.

registerCatalog method must be avoided whenever possible.

product/ZSQLCatalog/ColumnMap.py

@@ -416,7 +416,6 @@ class ColumnMap(object):
 
     # now that we have all aliases, calculate missing joins comming from
     # non-RelatedKey relationships (like full_text).
-    self.registerCatalog()
     self._calculateMissingJoins()
     # and all left joins that did not come from explicit queries
     # (i.e. joins comming from 'sort_on', 'select_dict', etc.)

product/ZSQLCatalog/Query/EntireQuery.py

@@ -96,6 +96,9 @@ class EntireQuery(object):
                             )
       self.column_map = column_map
     if 1:
+      column_map.registerTable(
+        self.catalog_table_name,
+      )
       for extra_column in self.extra_column_list:
         table, column = extra_column.replace('`', '').split('.')
         if table != self.catalog_table_name: