Skip to content

erp5
erp5
Commit 3df19891 authored by Jean-Paul Smets's avatar Jean-Paul Smets
Browse files
Options

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
parent d45976bb
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 16 deletions
product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_count_results.xml
View file @ 3df19891
...@@ -228,12 +228,12 @@ SELECT\n ...@@ -228,12 +228,12 @@ SELECT\n
FROM\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-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-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-if expression> , <dtml-var expression> </dtml-if>\n
</dtml-let>\n </dtml-let>\n
</dtml-if>\n </dtml-if>\n
<dtml-if selection_report>\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-if expression> , <dtml-var expression> </dtml-if>\n
</dtml-let>\n </dtml-let>\n
</dtml-if>\n </dtml-if>\n
...@@ -243,12 +243,12 @@ WHERE\n ...@@ -243,12 +243,12 @@ WHERE\n
AND <dtml-var where_expression>\n AND <dtml-var where_expression>\n
</dtml-if>\n </dtml-if>\n
<dtml-if selection_domain>\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-if expression> AND <dtml-var expression> </dtml-if>\n
</dtml-let>\n </dtml-let>\n
</dtml-if>\n </dtml-if>\n
<dtml-if selection_report>\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-if expression> AND <dtml-var expression> </dtml-if>\n
</dtml-let>\n </dtml-let>\n
</dtml-if>\n </dtml-if>\n
......
product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_search_results.xml
View file @ 3df19891
...@@ -186,12 +186,12 @@ SELECT DISTINCT\n ...@@ -186,12 +186,12 @@ SELECT DISTINCT\n
FROM\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-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-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-if expression> , <dtml-var expression> </dtml-if>\n
</dtml-let>\n </dtml-let>\n
</dtml-if>\n </dtml-if>\n
<dtml-if selection_report>\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-if expression> , <dtml-var expression> </dtml-if>\n
</dtml-let>\n </dtml-let>\n
</dtml-if>\n </dtml-if>\n
...@@ -202,12 +202,12 @@ WHERE \n ...@@ -202,12 +202,12 @@ WHERE \n
AND <dtml-var where_expression>\n AND <dtml-var where_expression>\n
</dtml-if>\n </dtml-if>\n
<dtml-if selection_domain>\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-if expression> AND <dtml-var expression> </dtml-if>\n
</dtml-let>\n </dtml-let>\n
</dtml-if>\n </dtml-if>\n
<dtml-if selection_report>\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-if expression> AND <dtml-var expression> </dtml-if>\n
</dtml-let>\n </dtml-let>\n
</dtml-if>\n </dtml-if>\n
......
product/ERP5/bootstrap/erp5_mysql_ndb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_ndb/z_count_results.xml
View file @ 3df19891
...@@ -142,12 +142,12 @@ SELECT\n ...@@ -142,12 +142,12 @@ SELECT\n
FROM\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-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-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-if expression> , <dtml-var expression> </dtml-if>\n
</dtml-let>\n </dtml-let>\n
</dtml-if>\n </dtml-if>\n
<dtml-if selection_report>\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-if expression> , <dtml-var expression> </dtml-if>\n
</dtml-let>\n </dtml-let>\n
</dtml-if>\n </dtml-if>\n
...@@ -157,12 +157,12 @@ WHERE\n ...@@ -157,12 +157,12 @@ WHERE\n
AND <dtml-var where_expression>\n AND <dtml-var where_expression>\n
</dtml-if>\n </dtml-if>\n
<dtml-if selection_domain>\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-if expression> AND <dtml-var expression> </dtml-if>\n
</dtml-let>\n </dtml-let>\n
</dtml-if>\n </dtml-if>\n
<dtml-if selection_report>\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-if expression> AND <dtml-var expression> </dtml-if>\n
</dtml-let>\n </dtml-let>\n
</dtml-if>\n </dtml-if>\n
......
product/ERP5/bootstrap/erp5_mysql_ndb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_ndb/z_search_results.xml
View file @ 3df19891
...@@ -178,12 +178,12 @@ SELECT DISTINCT\n ...@@ -178,12 +178,12 @@ SELECT DISTINCT\n
FROM\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-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-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-if expression> , <dtml-var expression> </dtml-if>\n
</dtml-let>\n </dtml-let>\n
</dtml-if>\n </dtml-if>\n
<dtml-if selection_report>\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-if expression> , <dtml-var expression> </dtml-if>\n
</dtml-let>\n </dtml-let>\n
</dtml-if>\n </dtml-if>\n
...@@ -194,12 +194,12 @@ WHERE \n ...@@ -194,12 +194,12 @@ WHERE \n
AND <dtml-var where_expression>\n AND <dtml-var where_expression>\n
</dtml-if>\n </dtml-if>\n
<dtml-if selection_domain>\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-if expression> AND <dtml-var expression> </dtml-if>\n
</dtml-let>\n </dtml-let>\n
</dtml-if>\n </dtml-if>\n
<dtml-if selection_report>\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-if expression> AND <dtml-var expression> </dtml-if>\n
</dtml-let>\n </dtml-let>\n
</dtml-if>\n </dtml-if>\n
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7