admin/n8n-enterprise-unlocked
1
0
Fork 0
mirror of https://github.com/Abdulazizzn/n8n-enterprise-unlocked.git synced 2025-12-24 04:59:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(MySQL Node): Hints for executeQuery and select operations (#16753)

Browse Source
This commit is contained in:
Michael Kret
2025-07-04 13:57:18 +03:00
committed by GitHub
parent 945098d789
commit f2eb38617f
8 changed files with 159 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
packages/nodes-base/nodes/Postgres/test/v2/utils.test.ts
View File

@@ -1,4 +1,4 @@
import type { IDataObject, IExecuteFunctions, INode } from 'n8n-workflow';
import type { IDataObject, INode } from 'n8n-workflow';
import { NodeOperationError } from 'n8n-workflow';
import pgPromise from 'pg-promise';
@@ -18,7 +18,6 @@ import {
convertValuesToJsonWithPgp,
hasJsonDataTypeInSchema,
evaluateExpression,
addExecutionHints,
} from '../../v2/helpers/utils';
const node: INode = {
@@ -547,38 +546,3 @@ describe('Test PostgresV2, convertArraysToPostgresFormat', () => {
});
});
});
describe('Test PostgresV2, addExecutionHints', () => {
it('should add batching insert hint to executeQuery operation', () => {
const context = {
getNodeParameter: (parameterName: string) => {
if (parameterName === 'options.queryBatching') {
return 'single';
}
if (parameterName === 'query') {
return 'INSERT INTO my_test_table VALUES (`{{ $json.name }}`)';
}
},
addExecutionHints: jest.fn(),
} as unknown as IExecuteFunctions;
addExecutionHints(context, [{ json: {} }, { json: {} }], 'executeQuery', false);
expect(context.addExecutionHints).toHaveBeenCalledWith({
message:
"Inserts were batched for performance. If you need to preserve item matching, consider changing 'Query batching' to 'Independent' in the options.",
location: 'outputPane',
});
});
it('should add run per item hint to select operation', () => {
const context = {
addExecutionHints: jest.fn(),
} as unknown as IExecuteFunctions;
addExecutionHints(context, [{ json: {} }, { json: {} }], 'select', false);
expect(context.addExecutionHints).toHaveBeenCalledWith({
location: 'outputPane',
message:
"This node ran 2 times, once for each input item. To run for the first item only, enable 'execute once' in the node settings",
});
});
});

5
packages/nodes-base/nodes/Postgres/v2/actions/router.ts
View File

@@ -3,9 +3,10 @@ import { NodeOperationError } from 'n8n-workflow';
import * as database from './database/Database.resource';
import type { PostgresType } from './node.type';
import { addExecutionHints } from '../../../../utils/utilities';
import { configurePostgres } from '../../transport';
import type { PostgresNodeCredentials, PostgresNodeOptions } from '../helpers/interfaces';
import { addExecutionHints, configureQueryRunner } from '../helpers/utils';
import { configureQueryRunner } from '../helpers/utils';
export async function router(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
let returnData: INodeExecutionData[] = [];
@@ -53,7 +54,7 @@ export async function router(this: IExecuteFunctions): Promise<INodeExecutionDat
);
}
addExecutionHints(this, items, operation, node.executeOnce);
addExecutionHints(this, node, items, operation, node.executeOnce);
return [returnData];
}

27
packages/nodes-base/nodes/Postgres/v2/helpers/utils.ts
View File

@@ -619,30 +619,3 @@ export const convertArraysToPostgresFormat = (
}
}
};
export function addExecutionHints(
context: IExecuteFunctions,
items: INodeExecutionData[],
operation: string,
executeOnce: boolean | undefined,
) {
if (operation === 'select' && items.length > 1 && !executeOnce) {
context.addExecutionHints({
message: `This node ran ${items.length} times, once for each input item. To run for the first item only, enable 'execute once' in the node settings`,
location: 'outputPane',
});
}
if (
operation === 'executeQuery' &&
items.length > 1 &&
(context.getNodeParameter('options.queryBatching', 0, 'single') as string) === 'single' &&
(context.getNodeParameter('query', 0, '') as string).toLowerCase().startsWith('insert')
) {
context.addExecutionHints({
message:
"Inserts were batched for performance. If you need to preserve item matching, consider changing 'Query batching' to 'Independent' in the options.",
location: 'outputPane',
});
}
}