Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(Merge Node): Overhaul, v3 #9528

Merged
merged 57 commits into from
Jul 2, 2024

Conversation

michael-radency
Copy link
Contributor

@michael-radency michael-radency commented May 28, 2024

Summary

Support for multiple inputs(#8975), SQL mode, and some smaller improvements

Related tickets and issues

https://linear.app/n8n/issue/NODE-1348/merge-node-overhaul

@michael-radency michael-radency added node/improvement New feature or request n8n team Authored by the n8n team labels May 28, 2024
});
}

const inputData = inputsData[parseInt(String(useDataOfInput)) - 1];
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you could get rid of the parsing and just use useDataOfInput as it's already of type Number

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice job adding unit tests 🎉

const nodeParameters: IDataObject = {
operation: 'combineBySql',
query:
'SELECT *, input1.data as data_1\nFROM input1\nLEFT JOIN input2\nON input1.id = input2.id\n',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could you add a test for invalid SQL input

parameters: {},
};

const inputsData = [
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what happens if the input is invalid? could you add test cases for that?

packages/nodes-base/nodes/Merge/v3/helpers/utils.ts Outdated Show resolved Hide resolved
packages/nodes-base/nodes/Merge/v3/helpers/utils.ts Outdated Show resolved Hide resolved
packages/nodes-base/nodes/Merge/v3/helpers/utils.ts Outdated Show resolved Hide resolved
michael-radency and others added 8 commits July 2, 2024 08:09
Co-authored-by: Shireen Missi <94372015+ShireenMissi@users.noreply.github.com>
Co-authored-by: Shireen Missi <94372015+ShireenMissi@users.noreply.github.com>
Co-authored-by: Shireen Missi <94372015+ShireenMissi@users.noreply.github.com>
Co-authored-by: Shireen Missi <94372015+ShireenMissi@users.noreply.github.com>
Copy link
Contributor

@ShireenMissi ShireenMissi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 👍

Copy link
Contributor

github-actions bot commented Jul 2, 2024

⚠️ Some Cypress E2E specs are failing, please fix them before merging

Copy link

cypress bot commented Jul 2, 2024

3 flaky tests on run #5740 ↗︎

0 399 0 0 Flakiness 3

Details:

🌳 🖥️ browsers:node18.12.0-chrome107 🤖 ivov 🗃️ e2e/*
Project: n8n Commit: 165342237e
Status: Passed Duration: 05:04 💡
Started: Jul 2, 2024 12:42 PM Ended: Jul 2, 2024 12:47 PM
Flakiness  5-ndv.cy.ts • 2 flaky tests

View Output Video

Test Artifacts
NDV > should not retrieve remote options when required params throw errors Screenshots Video
NDV > Stop listening for trigger event from NDV Screenshots Video
Flakiness  10-undo-redo.cy.ts • 1 flaky test

View Output Video

Test Artifacts
Undo/Redo > should undo/redo renaming node using NDV Test Replay Screenshots Video

Review all test suite changes for PR #9528 ↗︎

Copy link
Contributor

github-actions bot commented Jul 2, 2024

✅ All Cypress E2E specs passed

@michael-radency michael-radency merged commit af69c80 into master Jul 2, 2024
27 checks passed
@michael-radency michael-radency deleted the node-1348-merge-node-overhaul-v3 branch July 2, 2024 10:47
@github-actions github-actions bot mentioned this pull request Jul 3, 2024
@janober
Copy link
Member

janober commented Jul 3, 2024

Got released with n8n@1.49.0

adrian-martinez-onestic pushed a commit to onesdata/n8n-fork that referenced this pull request Jul 8, 2024
Co-authored-by: Jan Oberhauser <jan.oberhauser@gmail.com>
Co-authored-by: Shireen Missi <94372015+ShireenMissi@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
n8n team Authored by the n8n team node/improvement New feature or request Released
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants