Fix: Delete all processedObjects when transactionId is null

Evolveum · Feb 10, 2023 · a0371c5 · a0371c5
1 parent eb52cb5
commit a0371c5
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/SqaleRepositoryService.java b/repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/SqaleRepositoryService.java
@@ -763,11 +763,13 @@ public ModifyObjectResult<SimulationResultType> deleteSimulatedProcessedObjects(
             RootUpdateContext<SimulationResultType, QObject<MObject>, MObject> update = prepareUpdateContext(jdbcSession, SimulationResultType.class, SqaleUtils.oidToUuidMandatory(oid));
 
             QProcessedObject alias = QProcessedObjectMapping.getProcessedObjectMapping().defaultAlias();
-            jdbcSession.newDelete(alias)
-                    .where(alias.ownerOid.eq(SqaleUtils.oidToUuidMandatory(oid))
-                            .and(alias.transactionId.eq(transactionId))
-                    )
-                    .execute();
+
+            var predicate = alias.ownerOid.eq(SqaleUtils.oidToUuidMandatory(oid));
+            // If transactionId is null, delete all processed objects
+            // otherwise delete only ones in particular transaction
+            predicate = transactionId != null ? alias.transactionId.eq(transactionId) : predicate;
+
+            jdbcSession.newDelete(alias).where(predicate).execute();
             update.finishExecutionOwn();
             jdbcSession.commit();
             return new ModifyObjectResult<>(update.getPrismObject(), update.getPrismObject(), Collections.emptyList());