From 0b55fc2ed7907a3c9b6bb8b9a7963b5016a22e16 Mon Sep 17 00:00:00 2001
From: Ben Hesseldieck <b.hesseldieck@gmail.com>
Date: Wed, 8 Jul 2020 13:48:35 +0200
Subject: [PATCH] :bug: fix insert and update return input

---
 .../nodes/Microsoft/Sql/MicrosoftSql.node.ts  | 30 +++++--------------
 1 file changed, 7 insertions(+), 23 deletions(-)

diff --git a/packages/nodes-base/nodes/Microsoft/Sql/MicrosoftSql.node.ts b/packages/nodes-base/nodes/Microsoft/Sql/MicrosoftSql.node.ts
index 855a4647a0..a13a2425ca 100644
--- a/packages/nodes-base/nodes/Microsoft/Sql/MicrosoftSql.node.ts
+++ b/packages/nodes-base/nodes/Microsoft/Sql/MicrosoftSql.node.ts
@@ -222,7 +222,7 @@ export class MicrosoftSql implements INodeType {
 		const pool = new mssql.ConnectionPool(config);
 		await pool.connect();
 
-		let returnItems: INodeExecutionData[] = [];
+		let returnItems = [];
 
 		const items = this.getInputData();
 		const operation = this.getNodeParameter('operation', 0) as string;
@@ -249,7 +249,7 @@ export class MicrosoftSql implements INodeType {
 				// ----------------------------------
 
 				const tables = createTableStruct(this.getNodeParameter, items);
-				const queriesResults = await executeQueryQueue(
+				await executeQueryQueue(
 					tables,
 					({
 						table,
@@ -274,15 +274,7 @@ export class MicrosoftSql implements INodeType {
 					},
 				);
 
-				const rowsAffected = flatten(queriesResults).reduce(
-					(acc: number, resp: mssql.IResult<object>): number =>
-						(acc += resp.rowsAffected.reduce((sum, val) => (sum += val))),
-					0,
-				);
-
-				returnItems = this.helpers.returnJsonArray({
-					rowsAffected,
-				} as IDataObject);
+				returnItems = items;
 			} else if (operation === 'update') {
 				// ----------------------------------
 				//         update
@@ -297,7 +289,7 @@ export class MicrosoftSql implements INodeType {
 					['updateKey'].concat(updateKeys),
 					'updateKey',
 				);
-				const queriesResults = await executeQueryQueue(
+				await executeQueryQueue(
 					tables,
 					({
 						table,
@@ -326,15 +318,7 @@ export class MicrosoftSql implements INodeType {
 					},
 				);
 
-				const rowsAffected = flatten(queriesResults).reduce(
-					(acc: number, resp: mssql.IResult<object>): number =>
-						(acc += resp.rowsAffected.reduce((sum, val) => (sum += val))),
-					0,
-				);
-
-				returnItems = this.helpers.returnJsonArray({
-					rowsAffected,
-				} as IDataObject);
+				returnItems = items;
 			} else if (operation === '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 += resp.rowsAffected.reduce((sum, val) => (sum += val))),
 					0,
 				);
 
 				returnItems = this.helpers.returnJsonArray({
-					rowsAffected,
+					rowsDeleted,
 				} as IDataObject);
 			} else {
 				await pool.close();