Commit e93ca42f authored by Vincent Pelletier's avatar Vincent Pelletier

Remove never passed parameters.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@25261 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent ff4fa2a4
......@@ -7,9 +7,8 @@ cache_time:0
class_name:
class_file:
</dtml-comment>
<params>path
<params>
processing_node
method_id
uid
</params>
UPDATE message
......@@ -17,14 +16,8 @@ SET
processing_node=<dtml-sqlvar processing_node type="int">,
processing=0
WHERE
<dtml-if uid>
uid IN (
<dtml-in uid><dtml-sqlvar sequence-item type="int"><dtml-if sequence-end><dtml-else>,</dtml-if></dtml-in>
)
<dtml-else>
processing_node = -1
AND path = <dtml-sqlvar path type="string">
<dtml-if method_id>AND method_id = <dtml-sqlvar method_id type="string"></dtml-if>
</dtml-if>
<dtml-var sql_delimiter>
COMMIT
......@@ -10,7 +10,6 @@ class_file:
<params>path
method_id
processing_node
priority
include_processing
to_date
offset:int=0
......@@ -24,7 +23,6 @@ WHERE
AND processing = 0
</dtml-if>
<dtml-if expr="processing_node is not None"> AND processing_node = <dtml-sqlvar processing_node type="int"> </dtml-if>
<dtml-if priority> AND priority = <dtml-sqlvar priority type="int"> </dtml-if>
<dtml-if path>AND path = <dtml-sqlvar path type="string"> </dtml-if>
<dtml-if method_id> AND method_id = <dtml-sqlvar method_id type="string"> </dtml-if>
<dtml-if to_date> AND date <= <dtml-sqlvar to_date type="datetime"> </dtml-if>
......
......@@ -7,19 +7,15 @@ cache_time:0
class_name:
class_file:
</dtml-comment>
<params>processing_node
<params>
method_id
path
to_date
order_validation_text
group_method_id</params>
</params>
SELECT uid FROM
message
WHERE
processing = 0
<dtml-if expr="processing_node is not None"> AND processing_node = <dtml-sqlvar processing_node type="int"> </dtml-if>
<dtml-if method_id> AND method_id = <dtml-sqlvar method_id type="string"> </dtml-if>
<dtml-if path> AND path = <dtml-sqlvar path type="string"> </dtml-if>
<dtml-if to_date> AND date <= <dtml-sqlvar to_date type="datetime"> </dtml-if>
<dtml-if order_validation_text> AND order_validation_text = <dtml-sqlvar order_validation_text type="string"> </dtml-if>
<dtml-if group_method_id> AND group_method_id = <dtml-sqlvar group_method_id type="string"> </dtml-if>
......@@ -11,7 +11,7 @@ class_file:
to_date
count
group_method_id
order_validation_text</params>
</params>
UPDATE
message
SET
......@@ -20,7 +20,6 @@ WHERE
processing_node=0
AND date <= <dtml-sqlvar to_date type="datetime">
<dtml-if group_method_id> AND group_method_id = <dtml-sqlvar group_method_id type="string"> </dtml-if>
<dtml-if order_validation_text> AND order_validation_text = <dtml-sqlvar order_validation_text type="string"> </dtml-if>
ORDER BY
priority, date, uid
<dtml-if count>
......
......@@ -9,11 +9,9 @@ class_file:
</dtml-comment>
<params>uid:list
priority
date
retry
delay
processing_node
order_validation_text</params>
</params>
UPDATE
message
SET
......@@ -23,22 +21,11 @@ SET
</dtml-if>
<dtml-if delay>
, date = DATE_ADD(UTC_TIMESTAMP(), INTERVAL <dtml-sqlvar delay type="int"> * (retry + 1) SECOND)
<dtml-elif date>
, date = <dtml-sqlvar date type="datetime">
</dtml-if>
<dtml-if retry>
, retry = retry + <dtml-sqlvar retry type="int">
</dtml-if>
WHERE
1 = 1
<dtml-if uid>
AND uid IN (
uid IN (
<dtml-in uid><dtml-sqlvar sequence-item type="int"><dtml-if sequence-end><dtml-else>,</dtml-if></dtml-in>
)
</dtml-if>
<dtml-if expr="_.getattr(_, 'processing_node', None) is not None">
AND processing_node = <dtml-sqlvar processing_node type="int">
</dtml-if>
<dtml-if order_validation_text>
AND order_validation_text = <dtml-sqlvar order_validation_text type="string">
</dtml-if>
......@@ -7,21 +7,16 @@ cache_time:0
class_name:
class_file:
</dtml-comment>
<params>path
<params>
processing_node
method_id
uid</params>
UPDATE message_queue
SET
processing_node=<dtml-sqlvar processing_node type="int">,
processing=0
WHERE
<dtml-if path> path = <dtml-sqlvar path type="string">
<dtml-else>
uid IN (
<dtml-in uid><dtml-sqlvar sequence-item type="int"><dtml-if sequence-end><dtml-else>,</dtml-if></dtml-in>
)
</dtml-if>
<dtml-if method_id> AND method_id = <dtml-sqlvar method_id type="string"></dtml-if>
<dtml-var sql_delimiter>
COMMIT
......@@ -10,7 +10,6 @@ class_file:
<params>path
method_id
processing_node
priority
to_date
offset:int=0
count:int=1000
......@@ -20,7 +19,6 @@ SELECT * FROM
WHERE
processing = 0
<dtml-if expr="processing_node is not None"> AND processing_node = <dtml-sqlvar processing_node type="int"> </dtml-if>
<dtml-if priority>AND priority = <dtml-sqlvar priority type="int"> </dtml-if>
<dtml-if path>AND path = <dtml-sqlvar path type="string"></dtml-if>
<dtml-if method_id>AND method_id = <dtml-sqlvar method_id type="string"></dtml-if>
<dtml-if to_date> AND date <= <dtml-sqlvar to_date type="datetime"> </dtml-if>
......
......@@ -10,7 +10,7 @@ class_file:
<params>uid
priority
delay
date</params>
</params>
UPDATE
message_queue
SET
......@@ -20,8 +20,6 @@ SET
</dtml-if>
<dtml-if delay>
, date = DATE_ADD(UTC_TIMESTAMP(), INTERVAL <dtml-sqlvar delay type="int"> SECOND)
<dtml-elif date>
, date = <dtml-sqlvar date type="datetime">
</dtml-if>
WHERE
uid IN (
......
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