[Erp5-report] r20109 - in /erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog: Ca...
nobody at svn.erp5.org
nobody at svn.erp5.org
Tue Mar 25 13:57:03 CET 2008
Author: aurel
Date: Tue Mar 25 13:57:00 2008
New Revision: 20109
URL: http://svn.erp5.org?rev=20109&view=rev
Log:
2008-03-25 aurel
* z_count_results must retrieve all rows by default as limit is explicitly given by catalog
Added:
erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_count_results.xml
Modified:
erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/change_log
erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision
Added: erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_count_results.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_count_results.xml?rev=20109&view=auto
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_count_results.xml (added)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_count_results.xml Tue Mar 25 13:57:00 2008
@@ -1,0 +1,290 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="SQL" module="Products.ZSQLMethods.SQL"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>__ac_local_roles__</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_arg</string> </key>
+ <value>
+ <object>
+ <klass>
+ <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
+ </klass>
+ <tuple/>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>_data</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>from_table_list</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>group_by_expression</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>limit_expression</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>select_expression</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>selection_domain</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>selection_report</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>where_expression</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>_keys</string> </key>
+ <value>
+ <list>
+<string>from_table_list</string>
+<string>where_expression</string>
+<string>select_expression</string>
+<string>group_by_expression</string>
+<string>selection_domain</string>
+<string>selection_report</string>
+<string>limit_expression</string>
+ </list>
+ </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>allow_simple_one_argument_traversal</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>arguments_src</string> </key>
+ <value> <string>from_table_list\r\n
+where_expression\r\n
+select_expression\r\n
+group_by_expression\r\n
+selection_domain\r\n
+selection_report\r\n
+limit_expression</string> </value>
+ </item>
+ <item>
+ <key> <string>cache_time_</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>class_file_</string> </key>
+ <value> <string>ZSQLCatalog.zsqlbrain</string> </value>
+ </item>
+ <item>
+ <key> <string>class_name_</string> </key>
+ <value> <string>ZSQLBrain</string> </value>
+ </item>
+ <item>
+ <key> <string>connection_hook</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>connection_id</string> </key>
+ <value> <string>erp5_sql_connection</string> </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>z_count_results</string> </value>
+ </item>
+ <item>
+ <key> <string>max_cache_</string> </key>
+ <value> <int>1000</int> </value>
+ </item>
+ <item>
+ <key> <string>max_rows_</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>src</string> </key>
+ <value> <string encoding="cdata"><![CDATA[
+
+SELECT\n
+ COUNT(DISTINCT catalog.uid) <dtml-comment>We need subselect for better statistics</dtml-comment>\n
+<dtml-if select_expression>\n
+ , <dtml-var select_expression>\n
+</dtml-if>\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="portal_selections.buildSQLJoinExpressionFromDomainSelection(selection_domain, 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="portal_selections.buildSQLJoinExpressionFromDomainSelection(selection_report, category_table_alias = \'report_category\')">\n
+ <dtml-if expression> , <dtml-var expression> </dtml-if>\n
+ </dtml-let>\n
+ </dtml-if>\n
+WHERE\n
+ 1 = 1\n
+<dtml-if where_expression>\n
+ AND <dtml-var where_expression>\n
+</dtml-if>\n
+<dtml-if selection_domain>\n
+ <dtml-let expression="portal_selections.buildSQLExpressionFromDomainSelection(selection_domain, 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="portal_selections.buildSQLExpressionFromDomainSelection(selection_report, 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
+<dtml-if sort_on>\n
+ORDER BY\n
+ <dtml-var sort_on>\n
+</dtml-if>\n
+<dtml-if group_by_expression>\n
+GROUP BY\n
+ <dtml-var group_by_expression>\n
+</dtml-if>\n
+<dtml-if limit_expression>\n
+LIMIT <dtml-var "limit_expression">\n
+</dtml-if>\n
+
+
+]]></string> </value>
+ </item>
+ <item>
+ <key> <string>template</string> </key>
+ <value>
+ <object>
+ <klass>
+ <global name="__newobj__" module="copy_reg"/>
+ </klass>
+ <tuple>
+ <global name="SQL" module="Shared.DC.ZRDB.DA"/>
+ </tuple>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>__name__</string> </key>
+ <value> <string encoding="cdata"><![CDATA[
+
+<string>
+
+]]></string> </value>
+ </item>
+ <item>
+ <key> <string>_vars</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>globals</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>raw</string> </key>
+ <value> <string encoding="cdata"><![CDATA[
+
+SELECT\n
+ COUNT(DISTINCT catalog.uid) <dtml-comment>We need subselect for better statistics</dtml-comment>\n
+<dtml-if select_expression>\n
+ , <dtml-var select_expression>\n
+</dtml-if>\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="portal_selections.buildSQLJoinExpressionFromDomainSelection(selection_domain, 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="portal_selections.buildSQLJoinExpressionFromDomainSelection(selection_report, category_table_alias = \'report_category\')">\n
+ <dtml-if expression> , <dtml-var expression> </dtml-if>\n
+ </dtml-let>\n
+ </dtml-if>\n
+WHERE\n
+ 1 = 1\n
+<dtml-if where_expression>\n
+ AND <dtml-var where_expression>\n
+</dtml-if>\n
+<dtml-if selection_domain>\n
+ <dtml-let expression="portal_selections.buildSQLExpressionFromDomainSelection(selection_domain, 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="portal_selections.buildSQLExpressionFromDomainSelection(selection_report, 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
+<dtml-if sort_on>\n
+ORDER BY\n
+ <dtml-var sort_on>\n
+</dtml-if>\n
+<dtml-if group_by_expression>\n
+GROUP BY\n
+ <dtml-var group_by_expression>\n
+</dtml-if>\n
+<dtml-if limit_expression>\n
+LIMIT <dtml-var "limit_expression">\n
+</dtml-if>\n
+
+
+]]></string> </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/change_log?rev=20109&r1=20108&r2=20109&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/change_log (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/change_log Tue Mar 25 13:57:00 2008
@@ -1,3 +1,6 @@
+2008-03-25 aurel
+* z_count_results must retrieve all rows by default as limit is explicitly given by catalog
+
2007-06-22 yo
* Remove keyword keys, because there is no way to disable them later.
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision?rev=20109&r1=20108&r2=20109&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision Tue Mar 25 13:57:00 2008
@@ -1,1 +1,1 @@
-100
+104
More information about the Erp5-report
mailing list