Skip to content

erp5
erp5
Commit cfc75a55 authored by Yusuke Muraoka's avatar Yusuke Muraoka
Browse files
Options

2009-11-20 Yusuke 

* Relation bug is fixed.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@30782 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent fa46022a
Hide whitespace changes
Inline Side-by-side
Showing with 295 additions and 3 deletions
product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_SubCatalogQuery.xml 0 → 100644
View file @ cfc75a55
<?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>_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_expression</string> </key>
<value>
<dictionary/>
</value>
</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>
<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>selection_domain</string>
<string>selection_report</string>
<string>where_expression</string>
<string>select_expression</string>
<string>group_by_expression</string>
<string>from_table_list</string>
<string>from_expression</string>
<string>limit_expression</string>
</list>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>arguments_src</string> </key>
<value> <string>selection_domain\r\n
selection_report\r\n
where_expression\r\n
select_expression\r\n
group_by_expression\r\n
from_table_list:list\r\n
from_expression\r\n
limit_expression</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_SubCatalogQuery</string> </value>
</item>
<item>
<key> <string>src</string> </key>
<value> <string encoding="cdata"><![CDATA[
catalog.uid IN (\n
SELECT catalog.uid\n
FROM\n
catalog,\n
<dtml-if from_expression>\n
<dtml-var from_expression>\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-if>\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 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
)\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[
catalog.uid IN (\n
SELECT catalog.uid\n
FROM\n
catalog,\n
<dtml-if from_expression>\n
<dtml-var from_expression>\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-if>\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 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
)\n
]]></string> </value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_search_results.xml
View file @ cfc75a55
...@@ -82,6 +82,17 @@ ...@@ -82,6 +82,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>
...@@ -101,6 +112,7 @@ ...@@ -101,6 +112,7 @@
<string>select_expression</string> <string>select_expression</string>
<string>group_by_expression</string> <string>group_by_expression</string>
<string>from_table_list</string> <string>from_table_list</string>
<string>valid_from_table_list</string>
<string>from_expression</string> <string>from_expression</string>
<string>sort_on</string> <string>sort_on</string>
<string>limit_expression</string> <string>limit_expression</string>
...@@ -127,6 +139,7 @@ where_expression\r\n ...@@ -127,6 +139,7 @@ where_expression\r\n
select_expression\r\n select_expression\r\n
group_by_expression\r\n group_by_expression\r\n
from_table_list:list\r\n from_table_list:list\r\n
valid_from_table_list:list\r\n
from_expression\r\n from_expression\r\n
sort_on\r\n sort_on\r\n
limit_expression\r\n limit_expression\r\n
...@@ -178,7 +191,11 @@ FROM\n ...@@ -178,7 +191,11 @@ FROM\n
<dtml-if from_expression>\n <dtml-if from_expression>\n
<dtml-var from_expression>\n <dtml-var from_expression>\n
<dtml-else>\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-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-if>\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
...@@ -265,7 +282,11 @@ FROM\n ...@@ -265,7 +282,11 @@ FROM\n
<dtml-if from_expression>\n <dtml-if from_expression>\n
<dtml-var from_expression>\n <dtml-var from_expression>\n
<dtml-else>\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-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-if>\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
......
product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/change_log
View file @ cfc75a55
2009-11-20 Yusuke
* Relation bug is fixed.
2009-04-18 Kazuhiko 2009-04-18 Kazuhiko
* Version 5.4.1 * Version 5.4.1
......
product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision
View file @ cfc75a55
143 163
\ No newline at end of file \ No newline at end of file
product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/template_catalog_method_id_list
View file @ cfc75a55
...@@ -29,6 +29,7 @@ erp5_mysql_innodb/z0_uncatalog_predicate ...@@ -29,6 +29,7 @@ erp5_mysql_innodb/z0_uncatalog_predicate
erp5_mysql_innodb/z0_uncatalog_predicate_category erp5_mysql_innodb/z0_uncatalog_predicate_category
erp5_mysql_innodb/z0_uncatalog_stock erp5_mysql_innodb/z0_uncatalog_stock
erp5_mysql_innodb/z0_uncatalog_versioning erp5_mysql_innodb/z0_uncatalog_versioning
erp5_mysql_innodb/z_SubCatalogQuery
erp5_mysql_innodb/z_catalog_alarm_list erp5_mysql_innodb/z_catalog_alarm_list
erp5_mysql_innodb/z_catalog_delivery_list erp5_mysql_innodb/z_catalog_delivery_list
erp5_mysql_innodb/z_catalog_fulltext_list erp5_mysql_innodb/z_catalog_fulltext_list
......
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