🐛 fix insert and update return input

This commit is contained in:
Ben Hesseldieck
2020-07-08 13:48:35 +02:00
parent bafc1fc45c
commit 0b55fc2ed7

View File

@@ -222,7 +222,7 @@ export class MicrosoftSql implements INodeType {
const pool = new mssql.ConnectionPool(config); const pool = new mssql.ConnectionPool(config);
await pool.connect(); await pool.connect();
let returnItems: INodeExecutionData[] = []; let returnItems = [];
const items = this.getInputData(); const items = this.getInputData();
const operation = this.getNodeParameter('operation', 0) as string; const operation = this.getNodeParameter('operation', 0) as string;
@@ -249,7 +249,7 @@ export class MicrosoftSql implements INodeType {
// ---------------------------------- // ----------------------------------
const tables = createTableStruct(this.getNodeParameter, items); const tables = createTableStruct(this.getNodeParameter, items);
const queriesResults = await executeQueryQueue( await executeQueryQueue(
tables, tables,
({ ({
table, table,
@@ -274,15 +274,7 @@ export class MicrosoftSql implements INodeType {
}, },
); );
const rowsAffected = flatten(queriesResults).reduce( returnItems = items;
(acc: number, resp: mssql.IResult<object>): number =>
(acc += resp.rowsAffected.reduce((sum, val) => (sum += val))),
0,
);
returnItems = this.helpers.returnJsonArray({
rowsAffected,
} as IDataObject);
} else if (operation === 'update') { } else if (operation === 'update') {
// ---------------------------------- // ----------------------------------
// update // update
@@ -297,7 +289,7 @@ export class MicrosoftSql implements INodeType {
['updateKey'].concat(updateKeys), ['updateKey'].concat(updateKeys),
'updateKey', 'updateKey',
); );
const queriesResults = await executeQueryQueue( await executeQueryQueue(
tables, tables,
({ ({
table, table,
@@ -326,15 +318,7 @@ export class MicrosoftSql implements INodeType {
}, },
); );
const rowsAffected = flatten(queriesResults).reduce( returnItems = items;
(acc: number, resp: mssql.IResult<object>): number =>
(acc += resp.rowsAffected.reduce((sum, val) => (sum += val))),
0,
);
returnItems = this.helpers.returnJsonArray({
rowsAffected,
} as IDataObject);
} else if (operation === 'delete') { } else if (operation === 'delete') {
// ---------------------------------- // ----------------------------------
// delete // delete
@@ -380,14 +364,14 @@ export class MicrosoftSql implements INodeType {
}), }),
); );
const rowsAffected = flatten(queriesResults).reduce( const rowsDeleted = flatten(queriesResults).reduce(
(acc: number, resp: mssql.IResult<object>): number => (acc: number, resp: mssql.IResult<object>): number =>
(acc += resp.rowsAffected.reduce((sum, val) => (sum += val))), (acc += resp.rowsAffected.reduce((sum, val) => (sum += val))),
0, 0,
); );
returnItems = this.helpers.returnJsonArray({ returnItems = this.helpers.returnJsonArray({
rowsAffected, rowsDeleted,
} as IDataObject); } as IDataObject);
} else { } else {
await pool.close(); await pool.close();