mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2024-11-13 16:14:07 -08:00
Code Issues Actions 2 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
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 26 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
packages/nodes-base/nodes/Merge/test/node/workflow.combine.mergeByFields.json
View file

@ -278,8 +278,8 @@
{ {
"json": { "json": {
"id": 1, "id": 1,
"data": "c", "data": "a",
"input": 2, "input": 1,
"text": "foo", "text": "foo",
"tag": "second" "tag": "second"
} }
@ -287,8 +287,8 @@
{ {
"json": { "json": {
"id": 2, "id": 2,
"data": "d", "data": "b",
"input": 2, "input": 1,
"text": "foo", "text": "foo",
"tag": "second" "tag": "second"
} }

30
packages/nodes-base/nodes/Merge/v2/GenericFunctions.ts
View file

@ -132,12 +132,8 @@ export function findMatches(
fieldsToMatch: PairToMatch[], fieldsToMatch: PairToMatch[],
options: MatchFieldsOptions, options: MatchFieldsOptions,
) { ) {
let data1 = [...input1]; const data1 = [...input1];
let data2 = [...input2]; const data2 = [...input2];
if (options.joinMode === 'enrichInput2') {
[data1, data2] = [data2, data1];
}
const isEntriesEqual = fuzzyCompare(options.fuzzyCompare as boolean); const isEntriesEqual = fuzzyCompare(options.fuzzyCompare as boolean);
const disableDotNotation = options.disableDotNotation || false; const disableDotNotation = options.disableDotNotation || false;
@ -263,12 +259,8 @@ export function mergeMatched(
let binary: IBinaryKeyData = {}; let binary: IBinaryKeyData = {};
if (resolveClash === 'addSuffix') { if (resolveClash === 'addSuffix') {
let suffix1 = '1'; const suffix1 = '1';
let suffix2 = '2'; const suffix2 = '2';
if (joinMode === 'enrichInput2') {
[suffix1, suffix2] = [suffix2, suffix1];
}
[entry] = addSuffixToEntriesKeys([entry], suffix1); [entry] = addSuffixToEntriesKeys([entry], suffix1);
matches = addSuffixToEntriesKeys(matches, suffix2); matches = addSuffixToEntriesKeys(matches, suffix2);
@ -279,15 +271,15 @@ export function mergeMatched(
...matches.map((item) => item.binary as IDataObject), ...matches.map((item) => item.binary as IDataObject),
); );
} else { } else {
let preferInput1 = 'preferInput1'; const preferInput1 = 'preferInput1';
let preferInput2 = 'preferInput2'; const preferInput2 = 'preferInput2';
if (joinMode === 'enrichInput2') {
[preferInput1, preferInput2] = [preferInput2, preferInput1];
}
if (resolveClash === undefined) { if (resolveClash === undefined) {
resolveClash = 'preferInput2'; if (joinMode !== 'enrichInput2') {
resolveClash = 'preferInput2';
} else {
resolveClash = 'preferInput1';
}
} }
if (resolveClash === preferInput1) { if (resolveClash === preferInput1) {

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); const mergedEntries = mergeMatched(matches.matched, clashResolveOptions, joinMode);
if (clashResolveOptions.resolveClash === 'addSuffix') { if (joinMode === 'enrichInput1') {
const suffix = joinMode === 'enrichInput1' ? '1' : '2'; if (clashResolveOptions.resolveClash === 'addSuffix') {
returnData.push( returnData.push(...mergedEntries, ...addSuffixToEntriesKeys(matches.unmatched1, '1'));
...mergedEntries, } else {
...addSuffixToEntriesKeys(matches.unmatched1, suffix), returnData.push(...mergedEntries, ...matches.unmatched1);
); }
} else { } else {
returnData.push(...mergedEntries, ...matches.unmatched1); if (clashResolveOptions.resolveClash === 'addSuffix') {
returnData.push(...mergedEntries, ...addSuffixToEntriesKeys(matches.unmatched2, '2'));
} else {
returnData.push(...mergedEntries, ...matches.unmatched2);
}
} }
} }
} }