From e8fbea998621608f02cac6f8963a41a18bb80b36 Mon Sep 17 00:00:00 2001 From: Maciej Swiderski Date: Fri, 23 Nov 2012 13:57:00 +0100 Subject: [PATCH] JBPM-3866 - Avoid task duplicates when querying for tasks --- .../src/main/resources/META-INF/Taskorm.xml | 37 ++++++++++--------- .../main/assembly/resources/Taskorm-JPA2.xml | 37 ++++++++++--------- jbpm-installer/db/Taskorm-JPA2.xml | 37 ++++++++++--------- 3 files changed, 57 insertions(+), 54 deletions(-) diff --git a/jbpm-human-task/jbpm-human-task-core/src/main/resources/META-INF/Taskorm.xml b/jbpm-human-task/jbpm-human-task-core/src/main/resources/META-INF/Taskorm.xml index d244d08e7c..e729f809db 100644 --- a/jbpm-human-task/jbpm-human-task-core/src/main/resources/META-INF/Taskorm.xml +++ b/jbpm-human-task/jbpm-human-task-core/src/main/resources/META-INF/Taskorm.xml @@ -50,7 +50,7 @@ where or t.descriptions.size = 0 ) and - t.taskData.expirationTime is null + t.taskData.expirationTime is null group by t.id @@ -101,7 +101,7 @@ where or t.descriptions.size = 0 ) and - t.taskData.expirationTime is null + t.taskData.expirationTime is null group by t.id @@ -154,7 +154,7 @@ where t.taskData.status in ('Created', 'Ready', 'Reserved', 'InProgress', 'Suspended') and - t.taskData.expirationTime is null + t.taskData.expirationTime is null group by t.id @@ -207,7 +207,7 @@ where t.taskData.status in (:status) and - t.taskData.expirationTime is null + t.taskData.expirationTime is null group by t.id @@ -260,7 +260,7 @@ where t.taskData.status in ('Created', 'Ready', 'Reserved', 'InProgress', 'Suspended') and - t.taskData.expirationTime is null + t.taskData.expirationTime is null group by t.id @@ -313,7 +313,7 @@ where t.taskData.status in (:status) and - t.taskData.expirationTime is null + t.taskData.expirationTime is null group by t.id @@ -366,7 +366,7 @@ where t.taskData.status in ('Created', 'Ready', 'Reserved', 'InProgress', 'Suspended') and - t.taskData.expirationTime is null + t.taskData.expirationTime is null group by t.id @@ -421,7 +421,7 @@ where t.taskData.status in ('Created', 'Ready', 'Reserved', 'InProgress', 'Suspended') and - t.taskData.expirationTime is null + t.taskData.expirationTime is null group by t.id @@ -473,7 +473,7 @@ where t.taskData.status in ('Created', 'Ready', 'Reserved', 'InProgress', 'Suspended') and - t.taskData.expirationTime is null + t.taskData.expirationTime is null group by t.id @@ -526,7 +526,7 @@ where or t.descriptions.size = 0 ) and - t.taskData.expirationTime is null + t.taskData.expirationTime is null group by t.id @@ -577,7 +577,7 @@ where or t.descriptions.size = 0 ) and - t.taskData.expirationTime is null + t.taskData.expirationTime is null group by t.id @@ -628,7 +628,7 @@ where or t.descriptions.size = 0 ) and - t.taskData.expirationTime is null + t.taskData.expirationTime is null group by t.id @@ -677,7 +677,7 @@ where or t.descriptions.size = 0 ) and - t.taskData.expirationTime is null + t.taskData.expirationTime is null group by t.id @@ -727,7 +727,7 @@ where or t.descriptions.size = 0 ) and - t.taskData.expirationTime is null + t.taskData.expirationTime is null group by t.id @@ -777,7 +777,7 @@ where t.taskData.status in (:status) and - t.taskData.expirationTime is null + t.taskData.expirationTime is null group by t.id @@ -828,7 +828,7 @@ where t.taskData.status in (:status) and - t.taskData.expirationTime is null + t.taskData.expirationTime is null group by t.id @@ -882,6 +882,7 @@ where and t.taskData.activationTime < :since + group by t.id @@ -930,7 +931,7 @@ where or t.descriptions.size = 0 ) and - t.taskData.expirationTime is null + t.taskData.expirationTime is null group by t.id @@ -982,7 +983,7 @@ where or t.descriptions.size = 0 ) and - t.taskData.expirationTime is null + t.taskData.expirationTime is null group by t.id diff --git a/jbpm-human-task/jbpm-human-task-war/src/main/assembly/resources/Taskorm-JPA2.xml b/jbpm-human-task/jbpm-human-task-war/src/main/assembly/resources/Taskorm-JPA2.xml index c3ca2c7964..e8e0105463 100644 --- a/jbpm-human-task/jbpm-human-task-war/src/main/assembly/resources/Taskorm-JPA2.xml +++ b/jbpm-human-task/jbpm-human-task-war/src/main/assembly/resources/Taskorm-JPA2.xml @@ -50,7 +50,7 @@ where or t.descriptions.size = 0 ) and - t.taskData.expirationTime is null + t.taskData.expirationTime is null group by t.id @@ -101,7 +101,7 @@ where or t.descriptions.size = 0 ) and - t.taskData.expirationTime is null + t.taskData.expirationTime is null group by t.id @@ -154,7 +154,7 @@ where t.taskData.status in ('Created', 'Ready', 'Reserved', 'InProgress', 'Suspended') and - t.taskData.expirationTime is null + t.taskData.expirationTime is null group by t.id @@ -207,7 +207,7 @@ where t.taskData.status in (:status) and - t.taskData.expirationTime is null + t.taskData.expirationTime is null group by t.id @@ -260,7 +260,7 @@ where t.taskData.status in ('Created', 'Ready', 'Reserved', 'InProgress', 'Suspended') and - t.taskData.expirationTime is null + t.taskData.expirationTime is null group by t.id @@ -313,7 +313,7 @@ where t.taskData.status in (:status) and - t.taskData.expirationTime is null + t.taskData.expirationTime is null group by t.id @@ -366,7 +366,7 @@ where t.taskData.status in ('Created', 'Ready', 'Reserved', 'InProgress', 'Suspended') and - t.taskData.expirationTime is null + t.taskData.expirationTime is null group by t.id @@ -421,7 +421,7 @@ where t.taskData.status in ('Created', 'Ready', 'Reserved', 'InProgress', 'Suspended') and - t.taskData.expirationTime is null + t.taskData.expirationTime is null group by t.id @@ -473,7 +473,7 @@ where t.taskData.status in ('Created', 'Ready', 'Reserved', 'InProgress', 'Suspended') and - t.taskData.expirationTime is null + t.taskData.expirationTime is null group by t.id @@ -526,7 +526,7 @@ where or t.descriptions.size = 0 ) and - t.taskData.expirationTime is null + t.taskData.expirationTime is null group by t.id @@ -577,7 +577,7 @@ where or t.descriptions.size = 0 ) and - t.taskData.expirationTime is null + t.taskData.expirationTime is null group by t.id @@ -628,7 +628,7 @@ where or t.descriptions.size = 0 ) and - t.taskData.expirationTime is null + t.taskData.expirationTime is null group by t.id @@ -677,7 +677,7 @@ where or t.descriptions.size = 0 ) and - t.taskData.expirationTime is null + t.taskData.expirationTime is null group by t.id @@ -727,7 +727,7 @@ where or t.descriptions.size = 0 ) and - t.taskData.expirationTime is null + t.taskData.expirationTime is null group by t.id @@ -777,7 +777,7 @@ where t.taskData.status in (:status) and - t.taskData.expirationTime is null + t.taskData.expirationTime is null group by t.id @@ -828,7 +828,7 @@ where t.taskData.status in (:status) and - t.taskData.expirationTime is null + t.taskData.expirationTime is null group by t.id @@ -882,6 +882,7 @@ where and t.taskData.activationTime < :since + group by t.id @@ -930,7 +931,7 @@ where or t.descriptions.size = 0 ) and - t.taskData.expirationTime is null + t.taskData.expirationTime is null group by t.id @@ -982,7 +983,7 @@ where or t.descriptions.size = 0 ) and - t.taskData.expirationTime is null + t.taskData.expirationTime is null group by t.id diff --git a/jbpm-installer/db/Taskorm-JPA2.xml b/jbpm-installer/db/Taskorm-JPA2.xml index 48d9d57ad1..794d0c4a00 100644 --- a/jbpm-installer/db/Taskorm-JPA2.xml +++ b/jbpm-installer/db/Taskorm-JPA2.xml @@ -50,7 +50,7 @@ where or t.descriptions.size = 0 ) and - t.taskData.expirationTime is null + t.taskData.expirationTime is null group by t.id @@ -101,7 +101,7 @@ where or t.descriptions.size = 0 ) and - t.taskData.expirationTime is null + t.taskData.expirationTime is null group by t.id @@ -154,7 +154,7 @@ where t.taskData.status in ('Created', 'Ready', 'Reserved', 'InProgress', 'Suspended') and - t.taskData.expirationTime is null + t.taskData.expirationTime is null group by t.id @@ -207,7 +207,7 @@ where t.taskData.status in (:status) and - t.taskData.expirationTime is null + t.taskData.expirationTime is null group by t.id @@ -260,7 +260,7 @@ where t.taskData.status in ('Created', 'Ready', 'Reserved', 'InProgress', 'Suspended') and - t.taskData.expirationTime is null + t.taskData.expirationTime is null group by t.id @@ -313,7 +313,7 @@ where t.taskData.status in (:status) and - t.taskData.expirationTime is null + t.taskData.expirationTime is null group by t.id @@ -366,7 +366,7 @@ where t.taskData.status in ('Created', 'Ready', 'Reserved', 'InProgress', 'Suspended') and - t.taskData.expirationTime is null + t.taskData.expirationTime is null group by t.id @@ -421,7 +421,7 @@ where t.taskData.status in ('Created', 'Ready', 'Reserved', 'InProgress', 'Suspended') and - t.taskData.expirationTime is null + t.taskData.expirationTime is null group by t.id @@ -473,7 +473,7 @@ where t.taskData.status in ('Created', 'Ready', 'Reserved', 'InProgress', 'Suspended') and - t.taskData.expirationTime is null + t.taskData.expirationTime is null group by t.id @@ -526,7 +526,7 @@ where or t.descriptions.size = 0 ) and - t.taskData.expirationTime is null + t.taskData.expirationTime is null group by t.id @@ -577,7 +577,7 @@ where or t.descriptions.size = 0 ) and - t.taskData.expirationTime is null + t.taskData.expirationTime is null group by t.id @@ -628,7 +628,7 @@ where or t.descriptions.size = 0 ) and - t.taskData.expirationTime is null + t.taskData.expirationTime is null group by t.id @@ -677,7 +677,7 @@ where or t.descriptions.size = 0 ) and - t.taskData.expirationTime is null + t.taskData.expirationTime is null group by t.id @@ -727,7 +727,7 @@ where or t.descriptions.size = 0 ) and - t.taskData.expirationTime is null + t.taskData.expirationTime is null group by t.id @@ -777,7 +777,7 @@ where t.taskData.status in (:status) and - t.taskData.expirationTime is null + t.taskData.expirationTime is null group by t.id @@ -828,7 +828,7 @@ where t.taskData.status in (:status) and - t.taskData.expirationTime is null + t.taskData.expirationTime is null group by t.id @@ -882,6 +882,7 @@ where and t.taskData.activationTime < :since + group by t.id @@ -930,7 +931,7 @@ where or t.descriptions.size = 0 ) and - t.taskData.expirationTime is null + t.taskData.expirationTime is null group by t.id @@ -982,7 +983,7 @@ where or t.descriptions.size = 0 ) and - t.taskData.expirationTime is null + t.taskData.expirationTime is null group by t.id