add left join support in some related keys

bt5/erp5_invoicing/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_grand_grand_grand_parent.xml

@@ -17,7 +17,9 @@
             <value> <string>table_0\r\n
 table_1\r\n
 table_2\r\n
-table_3</string> </value>
+table_3\r\n
+RELATED_QUERY_SEPARATOR=" AND "\r\n
+query_table="catalog"</string> </value>
         </item>
         <item>
             <key> <string>cache_time_</string> </key>
@@ -57,11 +59,17 @@ table_3</string> </value>
             <key> <string>src</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-<dtml-var table_0>.uid = catalog.parent_uid\n
-AND <dtml-var table_1>.uid = <dtml-var table_0>.parent_uid\n
-AND <dtml-var table_2>.uid = <dtml-var table_1>.parent_uid\n
-AND <dtml-var table_3>.uid = <dtml-var table_2>.parent_uid\n
 \n
+<dtml-var table_1>.uid = <dtml-var table_0>.parent_uid\n
+<dtml-var RELATED_QUERY_SEPARATOR>\n
+\n
+<dtml-var table_2>.uid = <dtml-var table_1>.parent_uid\n
+<dtml-var RELATED_QUERY_SEPARATOR>\n
+\n
+<dtml-var table_3>.uid = <dtml-var table_2>.parent_uid\n
+\n
+<dtml-var RELATED_QUERY_SEPARATOR>\n
+<dtml-var table_0>.uid = <dtml-var query_table>.parent_uid\n
 
 
 ]]></string> </value>

bt5/erp5_invoicing/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_grand_grand_parent_specialise.xml

@@ -17,7 +17,9 @@
             <value> <string>table_0\r\n
 table_1\r\n
 table_2\r\n
-table_3</string> </value>
+table_3\r\n
+RELATED_QUERY_SEPARATOR=" AND "\r\n
+query_table="catalog"</string> </value>
         </item>
         <item>
             <key> <string>cache_time_</string> </key>
@@ -58,11 +60,16 @@ table_3</string> </value>
             <value> <string encoding="cdata"><![CDATA[
 
 <dtml-var table_0>.base_category_uid = <dtml-var "portal_categories.specialise.getUid()">\n
-AND <dtml-var table_0>.uid = <dtml-var table_2>.parent_uid\n
-AND <dtml-var table_1>.uid = catalog.parent_uid\n
-AND <dtml-var table_2>.uid = <dtml-var table_1>.parent_uid\n
-AND <dtml-var table_3>.uid = <dtml-var table_0>.category_uid\n
-
+<dtml-var RELATED_QUERY_SEPARATOR>\n
+\n
+<dtml-var table_0>.uid = <dtml-var table_2>.parent_uid\n
+<dtml-var RELATED_QUERY_SEPARATOR>\n
+\n
+<dtml-var table_2>.uid = <dtml-var table_1>.parent_uid\n
+<dtml-var RELATED_QUERY_SEPARATOR>\n
+\n
+<dtml-var table_3>.uid = <dtml-var table_0>.category_uid\n
+AND <dtml-var table_1>.uid = <dtml-var query_table>.parent_uid
 
 ]]></string> </value>
         </item>

bt5/erp5_invoicing/bt/revision

-386
+387
\ No newline at end of file

product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_explanation.xml

@@ -14,8 +14,10 @@
         </item>
         <item>
             <key> <string>arguments_src</string> </key>
-            <value> <string>table_0\n
-table_1</string> </value>
+            <value> <string>table_0\r\n
+table_1\r\n
+RELATED_QUERY_SEPARATOR=" AND "\r\n
+query_table="catalog"</string> </value>
         </item>
         <item>
             <key> <string>cache_time_</string> </key>
@@ -55,8 +57,9 @@ table_1</string> </value>
             <key> <string>src</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-<dtml-var table_0>.uid = catalog.uid\n
- AND <dtml-var table_1>.uid = <dtml-var table_0>.explanation_uid\n
+<dtml-var table_1>.uid = <dtml-var table_0>.explanation_uid\n
+<dtml-var RELATED_QUERY_SEPARATOR>\n
+<dtml-var table_0>.uid = <dtml-var query_table>.uid\n
 
 
 ]]></string> </value>

product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_parent_specialise.xml

@@ -14,8 +14,10 @@
         </item>
         <item>
             <key> <string>arguments_src</string> </key>
-            <value> <string>table_0\n
-table_1</string> </value>
+            <value> <string>table_0\r\n
+table_1\r\n
+RELATED_QUERY_SEPARATOR=" AND "\r\n
+query_table="catalog"</string> </value>
         </item>
         <item>
             <key> <string>cache_time_</string> </key>
@@ -55,11 +57,10 @@ table_1</string> </value>
             <key> <string>src</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-<dtml-var table_1>.uid = <dtml-var table_0>.category_uid\n
-AND <dtml-var table_0>.base_category_uid = <dtml-var "portal_categories.specialise.getUid()">\n
-AND <dtml-var table_0>.uid = catalog.parent_uid\n
-\n
-
+<dtml-var table_0>.base_category_uid = <dtml-var "portal_categories.specialise.getUid()">\n
+AND <dtml-var table_1>.uid = <dtml-var table_0>.category_uid\n
+<dtml-var RELATED_QUERY_SEPARATOR>\n
+<dtml-var table_0>.uid = <dtml-var query_table>.parent_uid
 
 ]]></string> </value>
         </item>