From 3df198917454313a40a19ec553774e9a38cef56f Mon Sep 17 00:00:00 2001
From: Jean-Paul Smets <jp@nexedi.com>
Date: Sat, 13 Jan 2007 15:33:42 +0000
Subject: [PATCH] Add the possibility to combine report and domain sections by
 using table aliasing.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@12061 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../portal_catalog/erp5_mysql_innodb/z_count_results.xml  | 8 ++++----
 .../portal_catalog/erp5_mysql_innodb/z_search_results.xml | 8 ++++----
 .../portal_catalog/erp5_mysql_ndb/z_count_results.xml     | 8 ++++----
 .../portal_catalog/erp5_mysql_ndb/z_search_results.xml    | 8 ++++----
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_count_results.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_count_results.xml
index b9eeba486d..076046028d 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_count_results.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_count_results.xml
@@ -228,12 +228,12 @@ SELECT\n
 FROM\n
   <dtml-in from_table_list> <dtml-var sequence-item> AS <dtml-var sequence-key><dtml-if sequence-end><dtml-else>,</dtml-if></dtml-in>\n
   <dtml-if selection_domain>\n
-    <dtml-let expression="selection_domain.asSQLJoinExpression()">\n
+    <dtml-let expression="selection_domain.asSQLJoinExpression(category_table_alias = 'domain_category')">\n
       <dtml-if expression> , <dtml-var expression> </dtml-if>\n
     </dtml-let>\n
   </dtml-if>\n
   <dtml-if selection_report>\n
-    <dtml-let expression="selection_report.asSQLJoinExpression()">\n
+    <dtml-let expression="selection_report.asSQLJoinExpression(category_table_alias = 'report_category')">\n
       <dtml-if expression> , <dtml-var expression> </dtml-if>\n
     </dtml-let>\n
   </dtml-if>\n
@@ -243,12 +243,12 @@ WHERE\n
   AND <dtml-var where_expression>\n
 </dtml-if>\n
 <dtml-if selection_domain>\n
-  <dtml-let expression="selection_domain.asSQLExpression()">\n
+  <dtml-let expression="selection_domain.asSQLExpression(category_table_alias = 'domain_category')">\n
     <dtml-if expression> AND <dtml-var expression> </dtml-if>\n
   </dtml-let>\n
 </dtml-if>\n
 <dtml-if selection_report>\n
-  <dtml-let expression="selection_report.asSQLExpression(strict_membership=1)">\n
+  <dtml-let expression="selection_report.asSQLExpression(strict_membership=1, category_table_alias = 'report_category')">\n
     <dtml-if expression> AND <dtml-var expression> </dtml-if>\n
   </dtml-let>\n
 </dtml-if>\n
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_search_results.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_search_results.xml
index 635755066a..e3d8063da3 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_search_results.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_search_results.xml
@@ -186,12 +186,12 @@ SELECT DISTINCT\n
 FROM\n
   <dtml-in from_table_list> <dtml-var sequence-item> AS <dtml-var sequence-key><dtml-if sequence-end><dtml-else>,</dtml-if></dtml-in>\n
   <dtml-if selection_domain>\n
-    <dtml-let expression="selection_domain.asSQLJoinExpression()">\n
+    <dtml-let expression="selection_domain.asSQLJoinExpression(category_table_alias = 'domain_category')">\n
       <dtml-if expression> , <dtml-var expression> </dtml-if>\n
     </dtml-let>\n
   </dtml-if>\n
   <dtml-if selection_report>\n
-    <dtml-let expression="selection_report.asSQLJoinExpression()">\n
+    <dtml-let expression="selection_report.asSQLJoinExpression(category_table_alias = 'report_category')">\n
       <dtml-if expression> , <dtml-var expression> </dtml-if>\n
     </dtml-let>\n
   </dtml-if>\n
@@ -202,12 +202,12 @@ WHERE \n
   AND <dtml-var where_expression>\n
 </dtml-if>\n
 <dtml-if selection_domain>\n
-  <dtml-let expression="selection_domain.asSQLExpression()">\n
+  <dtml-let expression="selection_domain.asSQLExpression(category_table_alias = 'domain_category')">\n
     <dtml-if expression> AND <dtml-var expression> </dtml-if>\n
   </dtml-let>\n
 </dtml-if>\n
 <dtml-if selection_report>\n
-  <dtml-let expression="selection_report.asSQLExpression(strict_membership=1)">\n
+  <dtml-let expression="selection_report.asSQLExpression(strict_membership=1, category_table_alias = 'report_category')">\n
     <dtml-if expression> AND <dtml-var expression> </dtml-if>\n
   </dtml-let>\n
 </dtml-if>\n
diff --git a/product/ERP5/bootstrap/erp5_mysql_ndb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_ndb/z_count_results.xml b/product/ERP5/bootstrap/erp5_mysql_ndb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_ndb/z_count_results.xml
index a7bedf5e1e..76c75d0808 100644
--- a/product/ERP5/bootstrap/erp5_mysql_ndb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_ndb/z_count_results.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_ndb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_ndb/z_count_results.xml
@@ -142,12 +142,12 @@ SELECT\n
 FROM\n
   <dtml-in from_table_list> <dtml-var sequence-item> AS <dtml-var sequence-key><dtml-if sequence-end><dtml-else>,</dtml-if></dtml-in>\n
   <dtml-if selection_domain>\n
-    <dtml-let expression="selection_domain.asSQLJoinExpression()">\n
+    <dtml-let expression="selection_domain.asSQLJoinExpression(category_table_alias = 'domain_category')">\n
       <dtml-if expression> , <dtml-var expression> </dtml-if>\n
     </dtml-let>\n
   </dtml-if>\n
   <dtml-if selection_report>\n
-    <dtml-let expression="selection_report.asSQLJoinExpression()">\n
+    <dtml-let expression="selection_report.asSQLJoinExpression(category_table_alias = 'report_category')">\n
       <dtml-if expression> , <dtml-var expression> </dtml-if>\n
     </dtml-let>\n
   </dtml-if>\n
@@ -157,12 +157,12 @@ WHERE\n
   AND <dtml-var where_expression>\n
 </dtml-if>\n
 <dtml-if selection_domain>\n
-  <dtml-let expression="selection_domain.asSQLExpression()">\n
+  <dtml-let expression="selection_domain.asSQLExpression(category_table_alias = 'domain_category')">\n
     <dtml-if expression> AND <dtml-var expression> </dtml-if>\n
   </dtml-let>\n
 </dtml-if>\n
 <dtml-if selection_report>\n
-  <dtml-let expression="selection_report.asSQLExpression(strict_membership=1)">\n
+  <dtml-let expression="selection_report.asSQLExpression(strict_membership=1, category_table_alias = 'report_category')">\n
     <dtml-if expression> AND <dtml-var expression> </dtml-if>\n
   </dtml-let>\n
 </dtml-if>\n
diff --git a/product/ERP5/bootstrap/erp5_mysql_ndb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_ndb/z_search_results.xml b/product/ERP5/bootstrap/erp5_mysql_ndb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_ndb/z_search_results.xml
index 30a31a290c..7896439cfc 100644
--- a/product/ERP5/bootstrap/erp5_mysql_ndb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_ndb/z_search_results.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_ndb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_ndb/z_search_results.xml
@@ -178,12 +178,12 @@ SELECT DISTINCT\n
 FROM\n
   <dtml-in from_table_list> <dtml-var sequence-item> AS <dtml-var sequence-key><dtml-if sequence-end><dtml-else>,</dtml-if></dtml-in>\n
   <dtml-if selection_domain>\n
-    <dtml-let expression="selection_domain.asSQLJoinExpression()">\n
+    <dtml-let expression="selection_domain.asSQLJoinExpression(category_table_alias = 'domain_category')">\n
       <dtml-if expression> , <dtml-var expression> </dtml-if>\n
     </dtml-let>\n
   </dtml-if>\n
   <dtml-if selection_report>\n
-    <dtml-let expression="selection_report.asSQLJoinExpression()">\n
+    <dtml-let expression="selection_report.asSQLJoinExpression(category_table_alias = 'report_category')">\n
       <dtml-if expression> , <dtml-var expression> </dtml-if>\n
     </dtml-let>\n
   </dtml-if>\n
@@ -194,12 +194,12 @@ WHERE \n
   AND <dtml-var where_expression>\n
 </dtml-if>\n
 <dtml-if selection_domain>\n
-  <dtml-let expression="selection_domain.asSQLExpression()">\n
+  <dtml-let expression="selection_domain.asSQLExpression(category_table_alias = 'domain_category')">\n
     <dtml-if expression> AND <dtml-var expression> </dtml-if>\n
   </dtml-let>\n
 </dtml-if>\n
 <dtml-if selection_report>\n
-  <dtml-let expression="selection_report.asSQLExpression(strict_membership=1)">\n
+  <dtml-let expression="selection_report.asSQLExpression(strict_membership=1, category_table_alias = 'report_category')">\n
     <dtml-if expression> AND <dtml-var expression> </dtml-if>\n
   </dtml-let>\n
 </dtml-if>\n
-- 
2.30.9