mirror of
https://github.com/Abdulazizzn/n8n-enterprise-unlocked.git
synced 2025-12-17 18:12:04 +00:00
fix: Update operations to run per item (#8967)
Co-authored-by: Elias Meire <elias@meire.dev>
This commit is contained in:
@@ -10,7 +10,6 @@ import type {
|
||||
INodeType,
|
||||
INodeTypeDescription,
|
||||
} from 'n8n-workflow';
|
||||
import { NodeOperationError } from 'n8n-workflow';
|
||||
|
||||
import type { ITables } from './interfaces';
|
||||
|
||||
@@ -30,7 +29,7 @@ export class MicrosoftSql implements INodeType {
|
||||
name: 'microsoftSql',
|
||||
icon: 'file:mssql.svg',
|
||||
group: ['input'],
|
||||
version: 1,
|
||||
version: [1, 1.1],
|
||||
description: 'Get, add and update data in Microsoft SQL',
|
||||
defaults: {
|
||||
name: 'Microsoft SQL',
|
||||
@@ -250,10 +249,50 @@ export class MicrosoftSql implements INodeType {
|
||||
await pool.connect();
|
||||
|
||||
let responseData: IDataObject | IDataObject[] = [];
|
||||
let returnData: INodeExecutionData[] = [];
|
||||
|
||||
const items = this.getInputData();
|
||||
const operation = this.getNodeParameter('operation', 0);
|
||||
const nodeVersion = this.getNode().typeVersion;
|
||||
|
||||
if (operation === 'executeQuery' && nodeVersion >= 1.1) {
|
||||
for (let i = 0; i < items.length; i++) {
|
||||
try {
|
||||
let rawQuery = this.getNodeParameter('query', i) as string;
|
||||
|
||||
for (const resolvable of getResolvables(rawQuery)) {
|
||||
rawQuery = rawQuery.replace(
|
||||
resolvable,
|
||||
this.evaluateExpression(resolvable, i) as string,
|
||||
);
|
||||
}
|
||||
|
||||
const { recordsets }: IResult<any[]> = await pool.request().query(rawQuery);
|
||||
|
||||
const result: IDataObject[] = recordsets.length > 1 ? flatten(recordsets) : recordsets[0];
|
||||
|
||||
for (const entry of result) {
|
||||
returnData.push({
|
||||
json: entry,
|
||||
pairedItem: [{ item: i }],
|
||||
});
|
||||
}
|
||||
} catch (error) {
|
||||
if (this.continueOnFail()) {
|
||||
returnData.push({
|
||||
json: { error: error.message },
|
||||
pairedItem: [{ item: i }],
|
||||
});
|
||||
continue;
|
||||
}
|
||||
await pool.close();
|
||||
throw error;
|
||||
}
|
||||
}
|
||||
|
||||
await pool.close();
|
||||
return [returnData];
|
||||
}
|
||||
try {
|
||||
if (operation === 'executeQuery') {
|
||||
let rawQuery = this.getNodeParameter('query', 0) as string;
|
||||
@@ -267,15 +306,19 @@ export class MicrosoftSql implements INodeType {
|
||||
const result = recordsets.length > 1 ? flatten(recordsets) : recordsets[0];
|
||||
|
||||
responseData = result;
|
||||
} else if (operation === 'insert') {
|
||||
}
|
||||
|
||||
if (operation === 'insert') {
|
||||
const tables = createTableStruct(this.getNodeParameter, items);
|
||||
|
||||
await insertOperation(tables, pool);
|
||||
|
||||
responseData = items;
|
||||
} else if (operation === 'update') {
|
||||
}
|
||||
|
||||
if (operation === 'update') {
|
||||
const updateKeys = items.map(
|
||||
(item, index) => this.getNodeParameter('updateKey', index) as string,
|
||||
(_, index) => this.getNodeParameter('updateKey', index) as string,
|
||||
);
|
||||
|
||||
const tables = createTableStruct(
|
||||
@@ -288,7 +331,9 @@ export class MicrosoftSql implements INodeType {
|
||||
await updateOperation(tables, pool);
|
||||
|
||||
responseData = items;
|
||||
} else if (operation === 'delete') {
|
||||
}
|
||||
|
||||
if (operation === 'delete') {
|
||||
const tables = items.reduce((acc, item, index) => {
|
||||
const table = this.getNodeParameter('table', index) as string;
|
||||
const deleteKey = this.getNodeParameter('deleteKey', index) as string;
|
||||
@@ -303,13 +348,14 @@ export class MicrosoftSql implements INodeType {
|
||||
}, {} as ITables);
|
||||
|
||||
responseData = await deleteOperation(tables, pool);
|
||||
} else {
|
||||
await pool.close();
|
||||
throw new NodeOperationError(
|
||||
this.getNode(),
|
||||
`The operation "${operation}" is not supported!`,
|
||||
);
|
||||
}
|
||||
|
||||
const itemData = generatePairedItemData(items.length);
|
||||
|
||||
returnData = this.helpers.constructExecutionMetaData(
|
||||
this.helpers.returnJsonArray(responseData),
|
||||
{ itemData },
|
||||
);
|
||||
} catch (error) {
|
||||
if (this.continueOnFail()) {
|
||||
responseData = items;
|
||||
@@ -322,13 +368,6 @@ export class MicrosoftSql implements INodeType {
|
||||
// shuts down the connection pool associated with the db object to allow the process to finish
|
||||
await pool.close();
|
||||
|
||||
const itemData = generatePairedItemData(items.length);
|
||||
|
||||
const returnItems = this.helpers.constructExecutionMetaData(
|
||||
this.helpers.returnJsonArray(responseData),
|
||||
{ itemData },
|
||||
);
|
||||
|
||||
return [returnItems];
|
||||
return [returnData];
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user