slapos_mysql_innodb_catalog:

* drop default_or_child_aggregate_reference
* drop  default_or_child_aggregate_uid catalog key
* drop unused follow_up_default_or_child_aggregate_uid
* drop causality_subscription_request_related_uid related key

master/bt5/slapos_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_causality_subscription_request.catalog_keys.xml

-<catalog_method>
-</catalog_method>

master/bt5/slapos_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_causality_subscription_request.sql

-<dtml-var table_0>.base_category_uid = <dtml-var "portal_categories.causality.getUid()">
-AND <dtml-var table_1>.uid = <dtml-var table_0>.uid
-AND <dtml-var table_1>.portal_type = 'Subscription Request'
-AND <dtml-var table_1>.simulation_state != 'deleted'
-
-<dtml-var RELATED_QUERY_SEPARATOR>
-<dtml-var table_0>.category_uid = <dtml-var query_table>.uid
-

master/bt5/slapos_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_causality_subscription_request.xml

-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <global name="SQL Method" module="erp5.portal_type"/>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>allow_simple_one_argument_traversal</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>arguments_src</string> </key>
-            <value> <string>table_0\n
-table_1\n
-RELATED_QUERY_SEPARATOR=" AND "\n
-query_table="catalog"</string> </value>
-        </item>
-        <item>
-            <key> <string>cache_time_</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>class_file_</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>class_name_</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>connection_hook</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>connection_id</string> </key>
-            <value> <string>erp5_sql_connection</string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>z_related_causality_subscription_request</string> </value>
-        </item>
-        <item>
-            <key> <string>max_cache_</string> </key>
-            <value> <int>100</int> </value>
-        </item>
-        <item>
-            <key> <string>max_rows_</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>SQL Method</string> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>z_related_causality_subscription_request</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>

master/bt5/slapos_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_default_or_child_aggregate.catalog_keys.xml

-<catalog_method>
-</catalog_method>

master/bt5/slapos_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_default_or_child_aggregate.sql

-<dtml-var table_0>.uid = <dtml-var table_1>.uid
-<dtml-var RELATED_QUERY_SEPARATOR>
-<dtml-var table_2>.uid = <dtml-var table_1>.category_uid
-<dtml-var RELATED_QUERY_SEPARATOR>
-<dtml-var table_1>.base_category_uid = <dtml-var "portal_categories.aggregate.getUid()">
-AND <dtml-var table_0>.uid = <dtml-var table_1>.uid
-AND (<dtml-var table_0>.parent_uid = <dtml-var query_table>.uid
-OR <dtml-var table_0>.uid = <dtml-var query_table>.uid)
\ No newline at end of file

master/bt5/slapos_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_default_or_child_aggregate.xml

-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <global name="SQL Method" module="erp5.portal_type"/>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>allow_simple_one_argument_traversal</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>arguments_src</string> </key>
-            <value> <string>table_0\n
-table_1\n
-table_2\n
-RELATED_QUERY_SEPARATOR=" AND "\n
-query_table="catalog"</string> </value>
-        </item>
-        <item>
-            <key> <string>cache_time_</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>class_file_</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>class_name_</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>connection_hook</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>connection_id</string> </key>
-            <value> <string>erp5_sql_connection</string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>z_related_default_or_child_aggregate</string> </value>
-        </item>
-        <item>
-            <key> <string>max_cache_</string> </key>
-            <value> <int>100</int> </value>
-        </item>
-        <item>
-            <key> <string>max_rows_</string> </key>
-            <value> <int>1000</int> </value>
-        </item>
-        <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>SQL Method</string> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>z_related_default_or_child_aggregate</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>

master/bt5/slapos_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_follow_up_default_or_child_aggregate.catalog_keys.xml

-<catalog_method>
-</catalog_method>

master/bt5/slapos_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_follow_up_default_or_child_aggregate.sql

-catalog.uid = <dtml-var table_0>.uid
-
--- follow up
-AND <dtml-var table_0>.base_category_uid = <dtml-var "portal_categories.follow_up.getUid()">
-AND ((<dtml-var table_1>.parent_uid = <dtml-var table_0>.category_uid AND <dtml-var table_2>.uid = <dtml-var table_1>.uid)
-  OR <dtml-var table_1>.uid = <dtml-var table_0>.category_uid AND <dtml-var table_2>.uid = <dtml-var table_1>.uid)
-
--- aggregate
-AND <dtml-var table_2>.base_category_uid = <dtml-var "portal_categories.aggregate.getUid()">
-AND <dtml-var table_2>.category_uid = <dtml-var table_3>.uid
-

master/bt5/slapos_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_follow_up_default_or_child_aggregate.xml

-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <global name="SQL Method" module="erp5.portal_type"/>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>allow_simple_one_argument_traversal</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>arguments_src</string> </key>
-            <value> <string>table_0\n
-table_1\n
-table_2\n
-table_3</string> </value>
-        </item>
-        <item>
-            <key> <string>cache_time_</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>class_file_</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>class_name_</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>connection_hook</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>connection_id</string> </key>
-            <value> <string>erp5_sql_connection</string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>z_related_follow_up_default_or_child_aggregate</string> </value>
-        </item>
-        <item>
-            <key> <string>max_cache_</string> </key>
-            <value> <int>100</int> </value>
-        </item>
-        <item>
-            <key> <string>max_rows_</string> </key>
-            <value> <int>1000</int> </value>
-        </item>
-        <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>SQL Method</string> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>z_related_follow_up_default_or_child_aggregate</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>

master/bt5/slapos_mysql_innodb_catalog/CatalogRelatedKeyTemplateItem/related_key_list.xml

 <key_list>
- <key>causality_subscription_request_related_uid | category,catalog/uid/z_related_causality_subscription_request</key>
- <key>default_or_child_aggregate_reference | catalog,category,catalog/reference/z_related_default_or_child_aggregate</key>
- <key>default_or_child_aggregate_uid | catalog,category,catalog/uid/z_related_default_or_child_aggregate</key>
- <key>follow_up_default_or_child_aggregate_uid | category,catalog,category,catalog/uid/z_related_follow_up_default_or_child_aggregate</key>
  <key>related_successor_but_with_different_title_than_catalog_title | category,catalog/uid/z_related_successor_but_with_different_title_than_catalog_title</key>
 </key_list>
\ No newline at end of file

master/bt5/slapos_mysql_innodb_catalog/bt/template_catalog_method_id_list

@@ -20,7 +20,4 @@ erp5_mysql_innodb/z_create_consistency
 erp5_mysql_innodb/z_create_item
 erp5_mysql_innodb/z_create_slapos_item
 erp5_mysql_innodb/z_create_software_instance_tree
-erp5_mysql_innodb/z_related_causality_subscription_request
-erp5_mysql_innodb/z_related_default_or_child_aggregate
-erp5_mysql_innodb/z_related_follow_up_default_or_child_aggregate
 erp5_mysql_innodb/z_related_successor_but_with_different_title_than_catalog_title
\ No newline at end of file

master/bt5/slapos_mysql_innodb_catalog/bt/template_catalog_related_key_list

-causality_subscription_request_related_uid | category,catalog/uid/z_related_causality_subscription_request
-related_successor_but_with_different_title_than_catalog_title | category,catalog/uid/z_related_successor_but_with_different_title_than_catalog_title
+related_successor_but_with_different_title_than_catalog_title | category,catalog/uid/z_related_successor_but_with_different_title_than_catalog_title
\ No newline at end of file
-default_or_child_aggregate_reference | catalog,category,catalog/reference/z_related_default_or_child_aggregate
-default_or_child_aggregate_uid | catalog,category,catalog/uid/z_related_default_or_child_aggregate
-follow_up_default_or_child_aggregate_uid | category,catalog,category,catalog/uid/z_related_follow_up_default_or_child_aggregate
\ No newline at end of file