Commit e8f1dc0a authored by Aurel's avatar Aurel

take where expression into account as now date comparison will pass through...

take where expression into account as now date comparison will pass through it, keep date parameter for compatibility

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@17853 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent c02d7db4
...@@ -74,6 +74,12 @@ ...@@ -74,6 +74,12 @@
</dictionary> </dictionary>
</value> </value>
</item> </item>
<item>
<key> <string>where_expression</string> </key>
<value>
<dictionary/>
</value>
</item>
</dictionary> </dictionary>
</value> </value>
</item> </item>
...@@ -81,11 +87,12 @@ ...@@ -81,11 +87,12 @@
<key> <string>_keys</string> </key> <key> <string>_keys</string> </key>
<value> <value>
<list> <list>
<string>column_value_list_list</string> <string>column_value_list_list</string>
<string>column_id_list</string> <string>column_id_list</string>
<string>group_by_expression</string> <string>group_by_expression</string>
<string>date</string> <string>date</string>
<string>simulation_state</string> <string>simulation_state</string>
<string>where_expression</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -106,7 +113,8 @@ ...@@ -106,7 +113,8 @@
column_id_list:list\r\n column_id_list:list\r\n
group_by_expression\r\n group_by_expression\r\n
date\r\n date\r\n
simulation_state=delivered</string> </value> simulation_state=delivered\r\n
where_expression</string> </value>
</item> </item>
<item> <item>
<key> <string>connection_id</string> </key> <key> <string>connection_id</string> </key>
...@@ -141,6 +149,9 @@ WHERE\n ...@@ -141,6 +149,9 @@ WHERE\n
<dtml-if date>\n <dtml-if date>\n
AND date <= <dtml-sqlvar date type="string">\n AND date <= <dtml-sqlvar date type="string">\n
</dtml-if>\n </dtml-if>\n
<dtml-if where_expression>\n
AND <dtml-var where_expression>\n
</dtml-if>\n
GROUP BY\n GROUP BY\n
<dtml-var group_by_expression>\n <dtml-var group_by_expression>\n
...@@ -204,6 +215,9 @@ WHERE\n ...@@ -204,6 +215,9 @@ WHERE\n
<dtml-if date>\n <dtml-if date>\n
AND date <= <dtml-sqlvar date type="string">\n AND date <= <dtml-sqlvar date type="string">\n
</dtml-if>\n </dtml-if>\n
<dtml-if where_expression>\n
AND <dtml-var where_expression>\n
</dtml-if>\n
GROUP BY\n GROUP BY\n
<dtml-var group_by_expression>\n <dtml-var group_by_expression>\n
......
592 593
\ 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