admin/n8n-enterprise-unlocked
1
0
Fork 0
mirror of https://github.com/Abdulazizzn/n8n-enterprise-unlocked.git synced 2025-12-20 19:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Merge Node): Enrich input 2 fix (#6526)

Browse Source
This commit is contained in:
Michael Kret
2023-06-23 16:21:42 +03:00
committed by GitHub
parent 806d134602
commit c82c7f1912
3 changed files with 26 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
packages/nodes-base/nodes/Merge/v2/MergeV2.node.ts
View File

@@ -541,14 +541,18 @@ export class MergeV2 implements INodeType {
const mergedEntries = mergeMatched(matches.matched, clashResolveOptions, joinMode);
if (clashResolveOptions.resolveClash === 'addSuffix') {
const suffix = joinMode === 'enrichInput1' ? '1' : '2';
returnData.push(
...mergedEntries,
...addSuffixToEntriesKeys(matches.unmatched1, suffix),
);
if (joinMode === 'enrichInput1') {
if (clashResolveOptions.resolveClash === 'addSuffix') {
returnData.push(...mergedEntries, ...addSuffixToEntriesKeys(matches.unmatched1, '1'));
} else {
returnData.push(...mergedEntries, ...matches.unmatched1);
}
} else {
returnData.push(...mergedEntries, ...matches.unmatched1);
if (clashResolveOptions.resolveClash === 'addSuffix') {
returnData.push(...mergedEntries, ...addSuffixToEntriesKeys(matches.unmatched2, '2'));
} else {
returnData.push(...mergedEntries, ...matches.unmatched2);
}
}
}
}