erp5_catalog: Create ERP5 SQL Method everywhere in Archive tool and testArchive

product/ERP5Catalog/Tool/ArchiveTool.py

@@ -128,7 +128,7 @@ class ArchiveTool(BaseTool):
     source_catalog_id = source_catalog.getId()
     if source_connection_id is None or source_deferred_connection_id is None:
       for method in source_catalog.objectValues():
-        if method.meta_type == "Z SQL Method":
+        if method.meta_type in ["Z SQL Method", "ERP5 SQL Method"]:
           if source_deferred_connection_id is None and 'deferred' in method.connection_id:
             source_deferred_connection_id = method.connection_id
           elif source_connection_id is None and 'transactionless' not in method.connection_id:

product/ERP5Catalog/tests/testArchive.py

@@ -88,14 +88,13 @@ class TestArchive(InventoryAPITestCase):
     portal_skins_custom = portal.portal_skins.custom
     zsql_method = getattr(portal_skins_custom, zsql_method_id, None)
     if zsql_method is None:
-      portal_skins_custom.manage_addProduct['ZSQLMethods']\
-               .manage_addZSQLMethod(
+      zsql_method = portal_skins_custom.newContent( \
+          portal_type = 'SQL Method',
           id = zsql_method_id,
           title = '',
           connection_id = connection_id,
           arguments = "",
-          template = "select path from catalog")
-      zsql_method = portal_skins_custom[zsql_method_id]
+          src = "select path from catalog")
       zsql_method.max_rows_ = 0
     # it is mandatory to provide connection_id, or the
     # zsql method will look at preference and use the one