Commit 117346e0 authored by Jérome Perrin's avatar Jérome Perrin

mysql_innodb_catalog: use consistent query separator

<dtml-var sql_delimiter> without ;
parent 27a88c96
...@@ -2,9 +2,8 @@ DELETE FROM ...@@ -2,9 +2,8 @@ DELETE FROM
item item
WHERE WHERE
<dtml-sqltest uid type="int" multiple> <dtml-sqltest uid type="int" multiple>
;
<dtml-var "'\0'"> <dtml-var sql_delimiter>
<dtml-let movement_list="[]" uid_dict="{}"> <dtml-let movement_list="[]" uid_dict="{}">
<dtml-in prefix="loop" expr="_.range(_.len(uid))"> <dtml-in prefix="loop" expr="_.range(_.len(uid))">
......
DELETE FROM `measure` WHERE DELETE FROM `measure` WHERE
<dtml-sqltest uid column="resource_uid" type="int" multiple>; <dtml-sqltest uid column="resource_uid" type="int" multiple>
<dtml-let measure_list="[]"> <dtml-let measure_list="[]">
<dtml-in getMeasureRowList prefix="loop"> <dtml-in getMeasureRowList prefix="loop">
......
...@@ -2,8 +2,9 @@ DELETE FROM ...@@ -2,8 +2,9 @@ DELETE FROM
category category
WHERE WHERE
<dtml-sqltest uid type="int" multiple> <dtml-sqltest uid type="int" multiple>
;
<dtml-var "'\0'"> <dtml-var sql_delimiter>
<dtml-let category_list="[]" getCategoryParentUidList="portal_categories.getCategoryParentUidList"> <dtml-let category_list="[]" getCategoryParentUidList="portal_categories.getCategoryParentUidList">
<dtml-in prefix="loop" expr="_.range(_.len(uid))"> <dtml-in prefix="loop" expr="_.range(_.len(uid))">
<dtml-if expr="getCategoryList[loop_item]"> <dtml-if expr="getCategoryList[loop_item]">
......
...@@ -2,8 +2,9 @@ DELETE FROM ...@@ -2,8 +2,9 @@ DELETE FROM
category category
WHERE WHERE
<dtml-sqltest uid type="int" multiple> <dtml-sqltest uid type="int" multiple>
;
<dtml-var "'\0'"> <dtml-var sql_delimiter>
<dtml-let category_list="[]" getCategoryParentUidList="portal_categories.getCategoryParentUidList"> <dtml-let category_list="[]" getCategoryParentUidList="portal_categories.getCategoryParentUidList">
<dtml-in prefix="loop" expr="_.range(_.len(uid))"> <dtml-in prefix="loop" expr="_.range(_.len(uid))">
<dtml-if expr="getAcquiredCategoryList[loop_item]"> <dtml-if expr="getAcquiredCategoryList[loop_item]">
......
...@@ -2,9 +2,8 @@ DELETE FROM ...@@ -2,9 +2,8 @@ DELETE FROM
predicate_category predicate_category
WHERE WHERE
<dtml-sqltest uid type="int" multiple> <dtml-sqltest uid type="int" multiple>
;
<dtml-var "'\0'"> <dtml-var sql_delimiter>
<dtml-let predicate_list="[]"> <dtml-let predicate_list="[]">
<dtml-in prefix="loop" expr="_.range(_.len(uid))"> <dtml-in prefix="loop" expr="_.range(_.len(uid))">
......
...@@ -13,8 +13,7 @@ ...@@ -13,8 +13,7 @@
<dtml-if quantity_unit_conversion_dict> <dtml-if quantity_unit_conversion_dict>
DELETE FROM `quantity_unit_conversion` WHERE DELETE FROM `quantity_unit_conversion` WHERE
<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>
<dtml-var sql_delimiter> <dtml-var sql_delimiter>
......
...@@ -2,9 +2,9 @@ DELETE FROM ...@@ -2,9 +2,9 @@ DELETE FROM
stock stock
WHERE WHERE
<dtml-sqltest uid type="int" multiple> <dtml-sqltest uid type="int" multiple>
;
<dtml-var "'\0'"> <dtml-var sql_delimiter>
<dtml-let row_list="[]" uid_dict="{}"> <dtml-let row_list="[]" uid_dict="{}">
<dtml-in prefix="loop" expr="_.range(_.len(uid))"> <dtml-in prefix="loop" expr="_.range(_.len(uid))">
<dtml-if "not(isInventoryMovement[loop_item]) and isMovement[loop_item] and getResourceUid[loop_item]"> <dtml-if "not(isInventoryMovement[loop_item]) and isMovement[loop_item] and getResourceUid[loop_item]">
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
DELETE FROM `transformation` WHERE DELETE FROM `transformation` WHERE
<dtml-sqltest expr="outer_item['uid']" column="uid" type="int"> <dtml-sqltest expr="outer_item['uid']" column="uid" type="int">
AND AND
<dtml-sqltest expr="outer_item['variation_text']" column="variation_text" type="string">; <dtml-sqltest expr="outer_item['variation_text']" column="variation_text" type="string">
<dtml-var sql_delimiter> <dtml-var sql_delimiter>
<dtml-call "row_list.extend(outer_item['row_dict_list'])"> <dtml-call "row_list.extend(outer_item['row_dict_list'])">
</dtml-in> </dtml-in>
......
...@@ -4,9 +4,9 @@ VALUES ...@@ -4,9 +4,9 @@ VALUES
<dtml-in "_.range(count - 1)"> <dtml-in "_.range(count - 1)">
( <dtml-sqlvar instance_id type="string"> , 'reserved' ) , ( <dtml-sqlvar instance_id type="string"> , 'reserved' ) ,
</dtml-in> </dtml-in>
( <dtml-sqlvar instance_id type="string"> , 'reserved' ); ( <dtml-sqlvar instance_id type="string"> , 'reserved' )
<dtml-var "'\0'"> <dtml-var sql_delimiter>
SELECT SELECT
uid uid
......
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