bt5_config: Update the current status of erp5_mysql_innodb_catalog with erp5 master

product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/SQLCatalog_makeFullTextQuery.py

@@ -6,5 +6,5 @@ from Products.ZSQLCatalog.SQLCatalog import Query
 
 query = ComplexQuery(Query(title=value),
                      Query(reference=value),
-                     operator="OR")
+                     logical_operator="OR")
 return query

product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_item_list.sql

 DELETE FROM
   item
 WHERE
-<<<<<<< HEAD
 <dtml-sqltest uid type="int" multiple>
 
 <dtml-var sql_delimiter>
-=======
-<dtml-in uid>
-  uid=<dtml-sqlvar sequence-item type="int"><dtml-if sequence-end><dtml-else> OR </dtml-if>
-</dtml-in>
-;
-
-<dtml-var "'\0'">
->>>>>>> 3ce2fc0... bt5_prototype: Move erp5_mysql_innodb_catalog back to BT5 type
 
 <dtml-let movement_list="[]" uid_dict="{}">
   <dtml-in prefix="loop" expr="_.range(_.len(uid))">
@@ -22,11 +13,7 @@ WHERE
     </dtml-if>
   </dtml-in>
   <dtml-if expr="_.len(movement_list) > 0">
-<<<<<<< HEAD
 INSERT INTO
-=======
-REPLACE INTO
->>>>>>> 3ce2fc0... bt5_prototype: Move erp5_mysql_innodb_catalog back to BT5 type
   item
 VALUES
     <dtml-in prefix="loop" expr="movement_list">

product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_measure_list.sql

 DELETE FROM `measure` WHERE
-<<<<<<< HEAD
   <dtml-sqltest uid column="resource_uid" type="int" multiple>
-=======
-  <dtml-sqltest uid column="resource_uid" type="int" multiple>;
->>>>>>> 3ce2fc0... bt5_prototype: Move erp5_mysql_innodb_catalog back to BT5 type
 
 <dtml-let measure_list="[]">
   <dtml-in getMeasureRowList prefix="loop">
@@ -13,11 +9,7 @@ DELETE FROM `measure` WHERE
   <dtml-if measure_list>
     <dtml-var sql_delimiter>
 
-<<<<<<< HEAD
 INSERT INTO `measure`
-=======
-REPLACE INTO `measure`
->>>>>>> 3ce2fc0... bt5_prototype: Move erp5_mysql_innodb_catalog back to BT5 type
 VALUES
     <dtml-in measure_list prefix="loop">
 (

product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_movement_category_list.sql

 DELETE FROM
   category
 WHERE
-<<<<<<< HEAD
 <dtml-sqltest uid type="int" multiple>
 
 <dtml-var sql_delimiter>
 
-=======
-<dtml-in uid>
-  uid=<dtml-sqlvar sequence-item type="int"><dtml-if sequence-end><dtml-else> OR </dtml-if>
-</dtml-in>
-;
-<dtml-var "'\0'">
->>>>>>> 3ce2fc0... bt5_prototype: Move erp5_mysql_innodb_catalog back to BT5 type
 <dtml-let category_list="[]" getCategoryParentUidList="portal_categories.getCategoryParentUidList">
 <dtml-in prefix="loop" expr="_.range(_.len(uid))">
 <dtml-if expr="getCategoryList[loop_item]">
@@ -22,11 +14,7 @@ WHERE
 <dtml-call expr="category_list.append((uid[loop_item], uid_item[0], uid_item[1], uid_item[2]))">
 </dtml-in></dtml-if></dtml-let></dtml-if></dtml-in>
 <dtml-if expr="category_list">
-<<<<<<< HEAD
 INSERT INTO category VALUES
-=======
-REPLACE INTO category VALUES
->>>>>>> 3ce2fc0... bt5_prototype: Move erp5_mysql_innodb_catalog back to BT5 type
 <dtml-in prefix="loop" expr="category_list">
 (<dtml-sqlvar expr="loop_item[0]" type="int">, <dtml-sqlvar expr="loop_item[1]" type="int">, <dtml-sqlvar expr="loop_item[2]" type="int">, <dtml-sqlvar expr="loop_item[3]" type="int">)<dtml-if sequence-end><dtml-else>,</dtml-if>
 </dtml-in>

product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_non_movement_category_list.sql

 DELETE FROM
   category
 WHERE
-<<<<<<< HEAD
 <dtml-sqltest uid type="int" multiple>
 
 <dtml-var sql_delimiter>
 
-=======
-<dtml-in uid>
-  uid=<dtml-sqlvar sequence-item type="int"><dtml-if sequence-end><dtml-else> OR </dtml-if>
-</dtml-in>
-;
-<dtml-var "'\0'">
->>>>>>> 3ce2fc0... bt5_prototype: Move erp5_mysql_innodb_catalog back to BT5 type
 <dtml-let category_list="[]" getCategoryParentUidList="portal_categories.getCategoryParentUidList">
 <dtml-in prefix="loop" expr="_.range(_.len(uid))">
 <dtml-if expr="getAcquiredCategoryList[loop_item]">
@@ -22,11 +14,7 @@ WHERE
 <dtml-call expr="category_list.append((uid[loop_item], uid_item[0], uid_item[1], uid_item[2]))">
 </dtml-in></dtml-if></dtml-let></dtml-if></dtml-in>  
 <dtml-if expr="category_list">
-<<<<<<< HEAD
 INSERT INTO category VALUES
-=======
-REPLACE INTO category VALUES
->>>>>>> 3ce2fc0... bt5_prototype: Move erp5_mysql_innodb_catalog back to BT5 type
 <dtml-in prefix="loop" expr="category_list">
 (<dtml-sqlvar expr="loop_item[0]" type="int">, <dtml-sqlvar expr="loop_item[1]" type="int">, <dtml-sqlvar expr="loop_item[2]" type="int">, <dtml-sqlvar expr="loop_item[3]" type="int">)<dtml-if sequence-end><dtml-else>,</dtml-if>
 </dtml-in>

product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_predicate_category_list.sql

 DELETE FROM
   predicate_category
 WHERE
-<<<<<<< HEAD
 <dtml-sqltest uid type="int" multiple>
 
   <dtml-var sql_delimiter>
-=======
-<dtml-in uid>
-  uid=<dtml-sqlvar sequence-item type="int"><dtml-if sequence-end><dtml-else> OR </dtml-if>
-</dtml-in>
-;
-
-<dtml-var "'\0'">
->>>>>>> 3ce2fc0... bt5_prototype: Move erp5_mysql_innodb_catalog back to BT5 type
 
 <dtml-let predicate_list="[]">
   <dtml-in prefix="loop" expr="_.range(_.len(uid))">
@@ -23,11 +14,7 @@ WHERE
     </dtml-if>
   </dtml-in>
   <dtml-if expr="_.len(predicate_list) > 0">
-<<<<<<< HEAD
 INSERT INTO predicate_category VALUES
-=======
-REPLACE INTO predicate_category VALUES 
->>>>>>> 3ce2fc0... bt5_prototype: Move erp5_mysql_innodb_catalog back to BT5 type
     <dtml-in prefix="loop" expr="predicate_list">
       <dtml-if sequence-start><dtml-else>,</dtml-if>
       <dtml-if "predicate_property_dict[loop_item].has_key('membership_criterion_category_list')">

product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_predicate_list.sql

-<<<<<<< HEAD
 DELETE FROM
   predicate
 WHERE
@@ -6,8 +5,6 @@ WHERE
 
 <dtml-var sql_delimiter>
 
-=======
->>>>>>> 3ce2fc0... bt5_prototype: Move erp5_mysql_innodb_catalog back to BT5 type
 <dtml-let predicate_list="[]">
   <dtml-in prefix="loop" expr="_.range(_.len(uid))">
     <dtml-if "isPredicate[loop_item]">
@@ -17,11 +14,7 @@ WHERE
     </dtml-if>
   </dtml-in>
   <dtml-if expr="_.len(predicate_list) > 0">
-<<<<<<< HEAD
 INSERT INTO predicate VALUES
-=======
-REPLACE INTO predicate VALUES 
->>>>>>> 3ce2fc0... bt5_prototype: Move erp5_mysql_innodb_catalog back to BT5 type
     <dtml-in prefix="loop" expr="predicate_list">
       <dtml-if sequence-start><dtml-else>,</dtml-if>
 ( 

product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_quantity_unit_conversion_list.sql

@@ -13,12 +13,7 @@
 
 <dtml-if quantity_unit_conversion_dict>
 DELETE FROM `quantity_unit_conversion` WHERE
-<<<<<<< HEAD
   <dtml-sqltest "quantity_unit_conversion_dict.keys()" column="resource_uid" type="int" multiple>
-=======
-  <dtml-sqltest "quantity_unit_conversion_dict.keys()" column="resource_uid" type="int" multiple>;
-
->>>>>>> 3ce2fc0... bt5_prototype: Move erp5_mysql_innodb_catalog back to BT5 type
 
   <dtml-var sql_delimiter>
 
@@ -26,12 +21,7 @@ DELETE FROM `quantity_unit_conversion` WHERE
   <dtml-call "value_list.extend(loop_item.values())">
 </dtml-in>
 
-<<<<<<< HEAD
 INSERT INTO `quantity_unit_conversion` VALUES
-=======
-REPLACE INTO `quantity_unit_conversion`
-VALUES
->>>>>>> 3ce2fc0... bt5_prototype: Move erp5_mysql_innodb_catalog back to BT5 type
     <dtml-in "value_list" prefix="loop">
 (
   <dtml-sqlvar expr="loop_item['uid']" type="int" optional>,

product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_stock_list.sql

 DELETE FROM
   stock
 WHERE
-<<<<<<< HEAD
 <dtml-sqltest uid type="int" multiple>
 
 <dtml-var sql_delimiter>
 
-=======
-<dtml-in uid>
-  uid=<dtml-sqlvar sequence-item type="int"><dtml-if sequence-end><dtml-else> OR </dtml-if>
-</dtml-in>
-;
-
-<dtml-var "'\0'">
->>>>>>> 3ce2fc0... bt5_prototype: Move erp5_mysql_innodb_catalog back to BT5 type
 <dtml-let row_list="[]" uid_dict="{}">
   <dtml-in prefix="loop" expr="_.range(_.len(uid))">
     <dtml-if "not(isInventoryMovement[loop_item]) and isMovement[loop_item] and getResourceUid[loop_item]">
@@ -81,11 +72,7 @@ WHERE
   </dtml-in>
 
   <dtml-if "row_list">
-<<<<<<< HEAD
 INSERT INTO
-=======
-REPLACE INTO
->>>>>>> 3ce2fc0... bt5_prototype: Move erp5_mysql_innodb_catalog back to BT5 type
   stock
 (
   `uid`,

product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_transformation_list.sql

@@ -3,11 +3,7 @@
 DELETE FROM `transformation` WHERE
   <dtml-sqltest expr="outer_item['uid']" column="uid" type="int">
   AND
-<<<<<<< HEAD
   <dtml-sqltest expr="outer_item['variation_text']" column="variation_text" type="string">
-=======
-  <dtml-sqltest expr="outer_item['variation_text']" column="variation_text" type="string">;
->>>>>>> 3ce2fc0... bt5_prototype: Move erp5_mysql_innodb_catalog back to BT5 type
 <dtml-var sql_delimiter>
 <dtml-call "row_list.extend(outer_item['row_dict_list'])">
 </dtml-in>

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

@@ -7,20 +7,16 @@
     <pickle>
       <dictionary>
         <item>
-<<<<<<< HEAD
             <key> <string>allow_simple_one_argument_traversal</string> </key>
             <value>
               <none/>
             </value>
         </item>
         <item>
-=======
->>>>>>> e319ca4... bt5_prototype: Move erp5_mysql_innodb_catalog back to BT5 type
             <key> <string>arguments_src</string> </key>
             <value> <string></string> </value>
         </item>
         <item>
-<<<<<<< HEAD
             <key> <string>cache_time_</string> </key>
             <value> <int>0</int> </value>
         </item>
@@ -37,8 +33,6 @@
             <value> <string></string> </value>
         </item>
         <item>
-=======
->>>>>>> e319ca4... bt5_prototype: Move erp5_mysql_innodb_catalog back to BT5 type
             <key> <string>connection_id</string> </key>
             <value> <string>erp5_sql_connection</string> </value>
         </item>
@@ -47,7 +41,6 @@
             <value> <string>z_get_table_schema</string> </value>
         </item>
         <item>
-<<<<<<< HEAD
             <key> <string>max_cache_</string> </key>
             <value> <int>100</int> </value>
         </item>
@@ -56,8 +49,6 @@
             <value> <int>0</int> </value>
         </item>
         <item>
-=======
->>>>>>> e319ca4... bt5_prototype: Move erp5_mysql_innodb_catalog back to BT5 type
             <key> <string>title</string> </key>
             <value> <string></string> </value>
         </item>

product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_getitem_by_path.sql

 SELECT <dtml-if uid_only>uid<dtml-else>uid,path</dtml-if> from catalog 
 WHERE 
-<<<<<<< HEAD
 <dtml-if path_list>
   path IN (<dtml-in path_list><dtml-sqlvar sequence-item type="string">
            <dtml-if sequence-end><dtml-else>,</dtml-if></dtml-in>)
@@ -8,13 +7,4 @@ WHERE
 <dtml-else>
   <dtml-sqltest path op=eq type="string">
   LIMIT 1
-=======
-  1 = 1
-<dtml-if path>
-  AND <dtml-sqltest path op=eq type="string">
-</dtml-if>
-<dtml-if path_list>
-  AND path IN (<dtml-in path_list><dtml-sqlvar sequence-item type="string">
-               <dtml-if sequence-end><dtml-else>,</dtml-if></dtml-in>)
->>>>>>> 3ce2fc0... bt5_prototype: Move erp5_mysql_innodb_catalog back to BT5 type
 </dtml-if>

product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_getitem_by_uid.sql

 SELECT <dtml-if path_only>path<dtml-else>uid,path</dtml-if> from catalog 
 WHERE 
-<<<<<<< HEAD
 <dtml-if uid_list>
   uid IN (<dtml-in uid_list><dtml-sqlvar sequence-item type="int">
           <dtml-if sequence-end><dtml-else>,</dtml-if></dtml-in>)
@@ -8,13 +7,4 @@ WHERE
 <dtml-else>
   <dtml-sqltest uid op=eq type="int">
   LIMIT 1
-=======
-  1 = 1
-<dtml-if expr="uid is not None">
-  AND <dtml-sqltest uid op=eq type="int">
-</dtml-if>
-<dtml-if uid_list>
-  AND uid IN (<dtml-in uid_list><dtml-sqlvar sequence-item type="int">
-               <dtml-if sequence-end><dtml-else>,</dtml-if></dtml-in>)
->>>>>>> 3ce2fc0... bt5_prototype: Move erp5_mysql_innodb_catalog back to BT5 type
 </dtml-if>

product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_produce_reserved_uid_list.sql

@@ -4,15 +4,9 @@ VALUES
 <dtml-in "_.range(count - 1)">
 ( <dtml-sqlvar instance_id type="string"> , 'reserved' ) ,
 </dtml-in>
-<<<<<<< HEAD
 ( <dtml-sqlvar instance_id type="string"> , 'reserved' )
 
 <dtml-var sql_delimiter>
-=======
-( <dtml-sqlvar instance_id type="string"> , 'reserved' );
-
-<dtml-var "'\0'">
->>>>>>> 3ce2fc0... bt5_prototype: Move erp5_mysql_innodb_catalog back to BT5 type
 
 SELECT   
   uid

product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogRelatedKeyTemplateItem/related_key_list.xml

@@ -65,8 +65,4 @@
  <key>translated_simulation_state_title | translation/translated_message/z_related_translated_simulation_state_title</key>
  <key>translated_validation_state | translation/translated_message/z_related_translated_validation_state</key>
  <key>translated_validation_state_title | translation/translated_message/z_related_translated_validation_state_title</key>
-<<<<<<< HEAD
-=======
- <key>variationCategory | category/category_uid/z_related_uid</key>
->>>>>>> 3ce2fc0... bt5_prototype: Move erp5_mysql_innodb_catalog back to BT5 type
 </key_list>
\ No newline at end of file

product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/template_catalog_related_key_list

@@ -41,10 +41,6 @@ item_section_category_uid | category/category_uid/z_related_section_uid_from_ite
 parent_relative_url | catalog/relative_url/z_related_parent
 resourceType | catalog/portal_type/z_related_resource_uid_from_stock
 grand_parent_portal_type | catalog,catalog/portal_type/z_related_grand_parent
-<<<<<<< HEAD
-=======
-variationCategory | category/category_uid/z_related_uid
->>>>>>> 3ce2fc0... bt5_prototype: Move erp5_mysql_innodb_catalog back to BT5 type
 translated_validation_state | translation/translated_message/z_related_translated_validation_state
 stock_resource_category_uid | category/category_uid/z_related_resource_uid_from_stock
 parent_title | catalog/title/z_related_parent