CMFActivity: ignore dependencies of validated messages when merging duplicates

product/CMFActivity/Activity/SQLBase.py

@@ -249,13 +249,9 @@ class SQLBase(Queue):
               # processing_node.
               # Their dates are lower-than or equal-to now_date.
               # We read each line once so lines have distinct uids.
-              # So what remains to be filtered on are path, method_id and
-              # order_validation_text.
-              try:
-                key = line.path, line.method_id, line.order_validation_text
-              except AttributeError:
-                pass # message_queue does not have 'order_validation_text'
-              else:
+              # So what remains to be filtered on are path and method_id.
+              if self.merge_duplicate:
+                key = line.path, line.method_id
                 original_uid = path_and_method_id_dict.get(key)
                 if original_uid is not None:
                   uid_to_duplicate_uid_list_dict.setdefault(original_uid, []) \

product/CMFActivity/Activity/SQLDict.py

@@ -119,7 +119,6 @@ class SQLDict(SQLBase):
         path=line.path,
         method_id=line.method_id,
         group_method_id=line.group_method_id,
-        order_validation_text=line.order_validation_text
       )
       uid_list = [x.uid for x in result]
       if len(uid_list):

product/CMFActivity/skins/activity/SQLDict_selectDuplicatedLineList.zsql

@@ -11,7 +11,6 @@ class_file:
 path
 method_id
 group_method_id
-order_validation_text
 </params>
 SELECT uid FROM
   message
@@ -20,5 +19,4 @@ WHERE
   AND path = <dtml-sqlvar path type="string">
   AND method_id = <dtml-sqlvar method_id type="string">
   AND group_method_id = <dtml-sqlvar group_method_id type="string">
-  AND order_validation_text = <dtml-sqlvar order_validation_text type="string">
 FOR UPDATE