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

product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_SubCatalogQuery.catalog_keys.xml

+<catalog_method>
+</catalog_method>
\ No newline at end of file

product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_search_results.xml

@@ -82,6 +82,17 @@
                                   <dictionary/>
                                 </value>
                             </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>
                                 <key> <string>where_expression</string> </key>
                                 <value>
@@ -101,6 +112,7 @@
                             <string>select_expression</string>
                             <string>group_by_expression</string>
                             <string>from_table_list</string>
+                            <string>valid_from_table_list</string>
                             <string>from_expression</string>
                             <string>sort_on</string>
                             <string>limit_expression</string>
@@ -127,6 +139,7 @@ where_expression\r\n
 select_expression\r\n
 group_by_expression\r\n
 from_table_list:list\r\n
+valid_from_table_list:list\r\n
 from_expression\r\n
 sort_on\r\n
 limit_expression\r\n
@@ -177,9 +190,13 @@ SELECT DISTINCT\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-if>\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
@@ -264,9 +281,13 @@ SELECT DISTINCT\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-if>\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

product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/change_log

+2009-11-20 Yusuke
+* Relation bug is fixed.
+
 2009-04-18 Kazuhiko
 * Version 5.4.1
 

product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision

-143
\ No newline at end of file
+163
\ No newline at end of file

product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/template_catalog_method_id_list

@@ -29,6 +29,7 @@ erp5_mysql_innodb/z0_uncatalog_predicate
 erp5_mysql_innodb/z0_uncatalog_predicate_category
 erp5_mysql_innodb/z0_uncatalog_stock
 erp5_mysql_innodb/z0_uncatalog_versioning
+erp5_mysql_innodb/z_SubCatalogQuery
 erp5_mysql_innodb/z_catalog_alarm_list
 erp5_mysql_innodb/z_catalog_delivery_list
 erp5_mysql_innodb/z_catalog_fulltext_list