[Erp5-report] r15526 - in /erp5/trunk/products/ERP5/bootstrap/erp5_core: SkinTemplateItem/p...
nobody at svn.erp5.org
nobody at svn.erp5.org
Tue Aug 7 14:54:20 CEST 2007
Author: vincent
Date: Tue Aug 7 14:54:20 2007
New Revision: 15526
URL: http://svn.erp5.org?rev=15526&view=rev
Log:
Add explicit joins with catalog.
Add conditions around uneeded joins in Resource_zGetInventoryList in specific getXxxInventory case (ie, getXxxInventoryList is not optimised).
Modified:
erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetInventoryList.xml
erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetMovementHistoryList.xml
erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetInventoryList.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetInventoryList.xml?rev=15526&r1=15525&r2=15526&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetInventoryList.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetInventoryList.xml Tue Aug 7 14:54:20 2007
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.ZSQLMethods.SQL</string>
- <string>SQL</string>
- </tuple>
- <none/>
+ <global name="SQL" module="Products.ZSQLMethods.SQL"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
@@ -164,23 +161,23 @@
<key> <string>_keys</string> </key>
<value>
<list>
-<string>from_table_list</string>
-<string>where_expression</string>
-<string>order_by_expression</string>
-<string>group_by_expression</string>
-<string>selection_domain</string>
-<string>selection_report</string>
-<string>ignore_variation</string>
-<string>standardize</string>
-<string>omit_simulation</string>
-<string>section_filtered</string>
-<string>omit_input</string>
-<string>omit_output</string>
-<string>input_simulation_state</string>
-<string>output_simulation_state</string>
-<string>precision</string>
-<string>inventory_list</string>
-<string>statistic</string>
+ <string>from_table_list</string>
+ <string>where_expression</string>
+ <string>order_by_expression</string>
+ <string>group_by_expression</string>
+ <string>selection_domain</string>
+ <string>selection_report</string>
+ <string>ignore_variation</string>
+ <string>standardize</string>
+ <string>omit_simulation</string>
+ <string>section_filtered</string>
+ <string>omit_input</string>
+ <string>omit_output</string>
+ <string>input_simulation_state</string>
+ <string>output_simulation_state</string>
+ <string>precision</string>
+ <string>inventory_list</string>
+ <string>statistic</string>
</list>
</value>
</item>
@@ -253,13 +250,13 @@
<key> <string>src</string> </key>
<value> <string encoding="cdata"><![CDATA[
+<dtml-let join_with_catalog="omit_simulation or inventory_list or statistic">\n
+\n
SELECT\n
<dtml-if expr="precision is not None">\n
- SUM(ROUND(stock.quantity, <dtml-var precision>)) AS inventory,\n
SUM(ROUND(stock.quantity, <dtml-var precision>)) AS total_quantity,\n
SUM(ROUND(stock.total_price, <dtml-var precision>)) AS total_price\n
<dtml-else>\n
- SUM(stock.quantity) AS inventory,\n
SUM(stock.quantity) AS total_quantity,\n
SUM(stock.total_price) AS total_price\n
</dtml-if>\n
@@ -298,8 +295,10 @@
\n
FROM\n
stock\n
- <dtml-if section_filtered> INNER <dtml-else> LEFT </dtml-if> \n
- JOIN catalog AS section ON (section.uid = stock.section_uid)\n
+ <dtml-if join_with_catalog>\n
+ <dtml-if section_filtered> INNER <dtml-else> LEFT </dtml-if> JOIN catalog AS section ON (section.uid = stock.section_uid)\n
+ , catalog as node, catalog as resource, catalog as catalog\n
+ </dtml-if>\n
<dtml-in prefix="table" expr="from_table_list"> \n
<dtml-if expr="table_key != \'stock\'">\n
, <dtml-var table_item> AS <dtml-var table_key>\n
@@ -307,7 +306,6 @@
</dtml-in>\n
<dtml-if selection_domain>, <dtml-var "portal_selections.buildSQLJoinExpressionFromDomainSelection(selection_domain)"> </dtml-if>\n
<dtml-if selection_report>, <dtml-var "portal_selections.buildSQLJoinExpressionFromDomainSelection(selection_report)"> </dtml-if>\n
- , catalog as node, catalog as resource\n
\n
WHERE\n
1 = 1\n
@@ -315,11 +313,12 @@
AND <dtml-var where_expression>\n
</dtml-if>\n
\n
+<dtml-if join_with_catalog>\n
AND node.uid = stock.node_uid\n
AND resource.uid = stock.resource_uid\n
-\n
-<dtml-if omit_simulation>\n
- AND catalog.portal_type != \'Simulation Movement\'\n
+ <dtml-if omit_simulation>\n
+ AND catalog.portal_type != \'Simulation Movement\'\n
+ </dtml-if>\n
</dtml-if>\n
\n
<dtml-if selection_domain>\n
@@ -336,6 +335,7 @@
ORDER BY\n
<dtml-var order_by_expression>\n
</dtml-if>\n
+</dtml-let>\n
]]></string> </value>
@@ -345,9 +345,11 @@
<value>
<object>
<klass>
+ <global name="__newobj__" module="copy_reg"/>
+ </klass>
+ <tuple>
<global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </klass>
- <none/>
+ </tuple>
<state>
<dictionary>
<item>
@@ -374,13 +376,13 @@
<key> <string>raw</string> </key>
<value> <string encoding="cdata"><![CDATA[
+<dtml-let join_with_catalog="omit_simulation or inventory_list or statistic">\n
+\n
SELECT\n
<dtml-if expr="precision is not None">\n
- SUM(ROUND(stock.quantity, <dtml-var precision>)) AS inventory,\n
SUM(ROUND(stock.quantity, <dtml-var precision>)) AS total_quantity,\n
SUM(ROUND(stock.total_price, <dtml-var precision>)) AS total_price\n
<dtml-else>\n
- SUM(stock.quantity) AS inventory,\n
SUM(stock.quantity) AS total_quantity,\n
SUM(stock.total_price) AS total_price\n
</dtml-if>\n
@@ -419,8 +421,10 @@
\n
FROM\n
stock\n
- <dtml-if section_filtered> INNER <dtml-else> LEFT </dtml-if> \n
- JOIN catalog AS section ON (section.uid = stock.section_uid)\n
+ <dtml-if join_with_catalog>\n
+ <dtml-if section_filtered> INNER <dtml-else> LEFT </dtml-if> JOIN catalog AS section ON (section.uid = stock.section_uid)\n
+ , catalog as node, catalog as resource, catalog as catalog\n
+ </dtml-if>\n
<dtml-in prefix="table" expr="from_table_list"> \n
<dtml-if expr="table_key != \'stock\'">\n
, <dtml-var table_item> AS <dtml-var table_key>\n
@@ -428,7 +432,6 @@
</dtml-in>\n
<dtml-if selection_domain>, <dtml-var "portal_selections.buildSQLJoinExpressionFromDomainSelection(selection_domain)"> </dtml-if>\n
<dtml-if selection_report>, <dtml-var "portal_selections.buildSQLJoinExpressionFromDomainSelection(selection_report)"> </dtml-if>\n
- , catalog as node, catalog as resource\n
\n
WHERE\n
1 = 1\n
@@ -436,11 +439,12 @@
AND <dtml-var where_expression>\n
</dtml-if>\n
\n
+<dtml-if join_with_catalog>\n
AND node.uid = stock.node_uid\n
AND resource.uid = stock.resource_uid\n
-\n
-<dtml-if omit_simulation>\n
- AND catalog.portal_type != \'Simulation Movement\'\n
+ <dtml-if omit_simulation>\n
+ AND catalog.portal_type != \'Simulation Movement\'\n
+ </dtml-if>\n
</dtml-if>\n
\n
<dtml-if selection_domain>\n
@@ -457,6 +461,7 @@
ORDER BY\n
<dtml-var order_by_expression>\n
</dtml-if>\n
+</dtml-let>\n
]]></string> </value>
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetMovementHistoryList.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetMovementHistoryList.xml?rev=15526&r1=15525&r2=15526&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetMovementHistoryList.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetMovementHistoryList.xml Tue Aug 7 14:54:20 2007
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.ZSQLMethods.SQL</string>
- <string>SQL</string>
- </tuple>
- <none/>
+ <global name="SQL" module="Products.ZSQLMethods.SQL"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
@@ -630,9 +627,7 @@
</item>
<item>
<key> <string>connection_hook</string> </key>
- <value>
- <none/>
- </value>
+ <value> <string></string> </value>
</item>
<item>
<key> <string>connection_id</string> </key>
@@ -699,7 +694,7 @@
</dtml-in>\n
<dtml-if selection_domain>, <dtml-var "portal_selections.buildSQLJoinExpressionFromDomainSelection(selection_domain)"> </dtml-if>\n
<dtml-if selection_report>, <dtml-var "portal_selections.buildSQLJoinExpressionFromDomainSelection(selection_report)"> </dtml-if>\n
- , catalog as node, catalog as resource\n
+ , catalog as node, catalog as resource, catalog as catalog\n
\n
WHERE\n
1 = 1\n
@@ -709,6 +704,7 @@
\n
AND node.uid = stock.node_uid\n
AND resource.uid = stock.resource_uid\n
+ AND catalog.uid = stock.uid\n
\n
<dtml-if omit_simulation>\n
AND catalog.portal_type != \'Simulation Movement\'\n
@@ -783,9 +779,11 @@
<value>
<object>
<klass>
+ <global name="__newobj__" module="copy_reg"/>
+ </klass>
+ <tuple>
<global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </klass>
- <none/>
+ </tuple>
<state>
<dictionary>
<item>
@@ -857,7 +855,7 @@
</dtml-in>\n
<dtml-if selection_domain>, <dtml-var "portal_selections.buildSQLJoinExpressionFromDomainSelection(selection_domain)"> </dtml-if>\n
<dtml-if selection_report>, <dtml-var "portal_selections.buildSQLJoinExpressionFromDomainSelection(selection_report)"> </dtml-if>\n
- , catalog as node, catalog as resource\n
+ , catalog as node, catalog as resource, catalog as catalog\n
\n
WHERE\n
1 = 1\n
@@ -867,6 +865,7 @@
\n
AND node.uid = stock.node_uid\n
AND resource.uid = stock.resource_uid\n
+ AND catalog.uid = stock.uid\n
\n
<dtml-if omit_simulation>\n
AND catalog.portal_type != \'Simulation Movement\'\n
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision?rev=15526&r1=15525&r2=15526&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision Tue Aug 7 14:54:20 2007
@@ -1,1 +1,1 @@
-381
+383
More information about the Erp5-report
mailing list