Commit 7a008db9 authored by Vincent Pelletier's avatar Vincent Pelletier

Add from_expression support in z_count_results.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@32756 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent f6676778
...@@ -24,11 +24,22 @@ ...@@ -24,11 +24,22 @@
<value> <value>
<dictionary> <dictionary>
<item> <item>
<key> <string>from_table_list</string> </key> <key> <string>from_expression</string> </key>
<value> <value>
<dictionary/> <dictionary/>
</value> </value>
</item> </item>
<item>
<key> <string>from_table_list</string> </key>
<value>
<dictionary>
<item>
<key> <string>type</string> </key>
<value> <string>list</string> </value>
</item>
</dictionary>
</value>
</item>
<item> <item>
<key> <string>group_by_expression</string> </key> <key> <string>group_by_expression</string> </key>
<value> <value>
...@@ -59,6 +70,17 @@ ...@@ -59,6 +70,17 @@
<dictionary/> <dictionary/>
</value> </value>
</item> </item>
<item>
<key> <string>valid_from_table_list</string> </key>
<value>
<dictionary>
<item>
<key> <string>type</string> </key>
<value> <string>list</string> </value>
</item>
</dictionary>
</value>
</item>
<item> <item>
<key> <string>where_expression</string> </key> <key> <string>where_expression</string> </key>
<value> <value>
...@@ -72,12 +94,14 @@ ...@@ -72,12 +94,14 @@
<key> <string>_keys</string> </key> <key> <string>_keys</string> </key>
<value> <value>
<list> <list>
<string>from_table_list</string> <string>selection_domain</string>
<string>selection_report</string>
<string>where_expression</string> <string>where_expression</string>
<string>select_expression</string> <string>select_expression</string>
<string>group_by_expression</string> <string>group_by_expression</string>
<string>selection_domain</string> <string>from_table_list</string>
<string>selection_report</string> <string>valid_from_table_list</string>
<string>from_expression</string>
<string>limit_expression</string> <string>limit_expression</string>
</list> </list>
</value> </value>
...@@ -95,12 +119,14 @@ ...@@ -95,12 +119,14 @@
</item> </item>
<item> <item>
<key> <string>arguments_src</string> </key> <key> <string>arguments_src</string> </key>
<value> <string>from_table_list\r\n <value> <string>selection_domain\r\n
selection_report\r\n
where_expression\r\n where_expression\r\n
select_expression\r\n select_expression\r\n
group_by_expression\r\n group_by_expression\r\n
selection_domain\r\n from_table_list:list\r\n
selection_report\r\n valid_from_table_list:list\r\n
from_expression\r\n
limit_expression</string> </value> limit_expression</string> </value>
</item> </item>
<item> <item>
...@@ -145,7 +171,15 @@ SELECT\n ...@@ -145,7 +171,15 @@ SELECT\n
, <dtml-var select_expression>\n , <dtml-var select_expression>\n
</dtml-if>\n </dtml-if>\n
FROM\n FROM\n
<dtml-if from_expression>\n
<dtml-var from_expression>\n
<dtml-else>\n
<dtml-if valid_from_table_list>\n
<dtml-in valid_from_table_list> <dtml-var sequence-item> AS <dtml-var sequence-key><dtml-if sequence-end><dtml-else>,</dtml-if></dtml-in>\n
<dtml-else>\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>\n
</dtml-if>\n
<dtml-if selection_domain>\n <dtml-if selection_domain>\n
<dtml-let expression="portal_selections.buildSQLJoinExpressionFromDomainSelection(selection_domain, category_table_alias = \'domain_category\')">\n <dtml-let expression="portal_selections.buildSQLJoinExpressionFromDomainSelection(selection_domain, category_table_alias = \'domain_category\')">\n
<dtml-if expression> , <dtml-var expression> </dtml-if>\n <dtml-if expression> , <dtml-var expression> </dtml-if>\n
...@@ -228,7 +262,15 @@ SELECT\n ...@@ -228,7 +262,15 @@ SELECT\n
, <dtml-var select_expression>\n , <dtml-var select_expression>\n
</dtml-if>\n </dtml-if>\n
FROM\n FROM\n
<dtml-if from_expression>\n
<dtml-var from_expression>\n
<dtml-else>\n
<dtml-if valid_from_table_list>\n
<dtml-in valid_from_table_list> <dtml-var sequence-item> AS <dtml-var sequence-key><dtml-if sequence-end><dtml-else>,</dtml-if></dtml-in>\n
<dtml-else>\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>\n
</dtml-if>\n
<dtml-if selection_domain>\n <dtml-if selection_domain>\n
<dtml-let expression="portal_selections.buildSQLJoinExpressionFromDomainSelection(selection_domain, category_table_alias = \'domain_category\')">\n <dtml-let expression="portal_selections.buildSQLJoinExpressionFromDomainSelection(selection_domain, category_table_alias = \'domain_category\')">\n
<dtml-if expression> , <dtml-var expression> </dtml-if>\n <dtml-if expression> , <dtml-var expression> </dtml-if>\n
......
174 176
\ No newline at end of file \ No newline at end of file
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