From 8da2a2e2b5de5c057ad5616e6e3a3d66f12d0a9a Mon Sep 17 00:00:00 2001
From: Sebastian Listl <s.listl@adito.de>
Date: Mon, 5 Oct 2020 13:41:31 +0200
Subject: [PATCH] #1065734 Duplicate merge error
---
process/DuplicateScanner_lib/process.js | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/process/DuplicateScanner_lib/process.js b/process/DuplicateScanner_lib/process.js
index 12420f6405c..b8f14e5ecaf 100644
--- a/process/DuplicateScanner_lib/process.js
+++ b/process/DuplicateScanner_lib/process.js
@@ -1107,12 +1107,11 @@ _DuplicateScannerUtils._migrateParticipantsToNewContact = function (pTableName,
.where([pTableName, pContactIdColumn], pTargetContactId)
.arrayColumn();
- var updateCount = newWhere([pTableName, pAssignableIdColumn], excludedIds, SqlBuilder.NOT_IN())
+ var updateCount = newWhereIfSet([pTableName, pAssignableIdColumn], excludedIds, SqlBuilder.NOT_IN())
.and([pTableName, pContactIdColumn], pSourceContactId)
.updateFields(new Map().set(pContactIdColumn, pTargetContactId), pTableName);
- var deleteCount = newWhere([pTableName, pAssignableIdColumn], excludedIds, SqlBuilder.IN())
- .and([pTableName, pContactIdColumn], pSourceContactId)
+ var deleteCount = newWhere([pTableName, pContactIdColumn], pSourceContactId)
.tableName(pTableName)
.deleteData();
--
GitLab