From 4cfb19fa07834db913dc8b194f0fda452345ea58 Mon Sep 17 00:00:00 2001 From: "d.buechler" <d.buechler@adito.de> Date: Tue, 20 Aug 2019 10:41:38 +0200 Subject: [PATCH] =?UTF-8?q?Das=20neue=20Feld=20Target=5FEntity=20wurde=20d?= =?UTF-8?q?er=20DuplicatesCluster=20Tabelle=20hinzugef=C3=BCgt.=20Hiermit?= =?UTF-8?q?=20k=C3=B6nnen=20nun=20Entity=20spezifische=20Cluster=20gesucht?= =?UTF-8?q?=20und=20gel=C3=B6scht=20werden.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Duplicates/create_duplicateClusters.xml | 1 + aliasDefinition/Data_alias/Data_alias.aod | 14 ++++++++++++++ process/DuplicateScanner_lib/process.js | 8 ++++---- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/.liquibase/Data_alias/basic/2019.2.1/Duplicates/create_duplicateClusters.xml b/.liquibase/Data_alias/basic/2019.2.1/Duplicates/create_duplicateClusters.xml index a89ca7761d..929dc17ce7 100644 --- a/.liquibase/Data_alias/basic/2019.2.1/Duplicates/create_duplicateClusters.xml +++ b/.liquibase/Data_alias/basic/2019.2.1/Duplicates/create_duplicateClusters.xml @@ -11,6 +11,7 @@ <column name="DUPLICATEID" type="CHAR(36)" > <constraints nullable="false"/> </column> + <column name="TARGET_ENTITY" type="NVARCHAR(200)"/> </createTable> </changeSet> </databaseChangeLog> \ No newline at end of file diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod index e03194b8fc..1c93025030 100644 --- a/aliasDefinition/Data_alias/Data_alias.aod +++ b/aliasDefinition/Data_alias/Data_alias.aod @@ -11351,6 +11351,20 @@ <title></title> <description></description> </entityFieldDb> + <entityFieldDb> + <name>TARGET_ENTITY</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="12" /> + <size v="200" /> + <scale v="0" /> + <notNull v="false" /> + <isUnique v="false" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> </entityFields> </entityDb> <entityDb> diff --git a/process/DuplicateScanner_lib/process.js b/process/DuplicateScanner_lib/process.js index f2886b12d7..6b23e51adf 100644 --- a/process/DuplicateScanner_lib/process.js +++ b/process/DuplicateScanner_lib/process.js @@ -168,7 +168,7 @@ pQueryTargetRecords, pFilterFields, pRecordIdFieldToIgnore) logging.log("foundDuplicates -> " + JSON.stringify(foundDuplicates)); logging.log("foundDuplicateIds -> " + JSON.stringify(foundDuplicateIds)); - let insertQueriesRay = _DuplicateScannerUtils._createInsertDuplicatesClusterQuery(foundDuplicateIds) + let insertQueriesRay = _DuplicateScannerUtils._createInsertDuplicatesClusterQuery(foundDuplicateIds, pTargetEntity) duplicatesToInsertQueries = duplicatesToInsertQueries.concat(insertQueriesRay); } logging.log("duplicatesToInsertQueries -> " + JSON.stringify(duplicatesToInsertQueries)); @@ -218,16 +218,16 @@ _DuplicateScannerUtils._getIdOfIdenticalCachedDuplicatesCluster = function (pRec } -_DuplicateScannerUtils._createInsertDuplicatesClusterQuery = function (pDuplicatesRay) +_DuplicateScannerUtils._createInsertDuplicatesClusterQuery = function (pDuplicatesRay, pTargetEntity) { let duplicatesToInsertQueries = []; - let cols = ["ID", "CLUSTERID", "DUPLICATEID"]; + let cols = ["ID", "CLUSTERID", "DUPLICATEID", "TARGET_ENTITY"]; let newClusterUid = util.getNewUUID(); for (i = 0; i < pDuplicatesRay.length; i++) { let newId = util.getNewUUID(); - let valuesToInsert = [newId, newClusterUid, pDuplicatesRay[i]]; + let valuesToInsert = [newId, newClusterUid, pDuplicatesRay[i], pTargetEntity]; duplicatesToInsertQueries.push(["DUPLICATECLUSTERS", cols, null, valuesToInsert]); } -- GitLab