allow multiple result sets for sap and mssql

alfateam · Jan 17, 2024 · 6d19dc6 · 6d19dc6
1 parent d0f3211
commit 6d19dc6
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 33 deletions.
diff --git a/src/mssql/wrapQuery.js b/src/mssql/wrapQuery.js
@@ -7,16 +7,24 @@ function wrapQuery(connection) {
 	function runQuery(query, onCompleted) {
 		var params = query.parameters;
 		var sql = query.sql();
-		log.emitQuery({sql, parameters: params});
+		log.emitQuery({ sql, parameters: params });
 
 		runOriginalQuery.call(connection, sql, params, onInnerCompleted);
+		let result = [];
 
-		function onInnerCompleted(err, rows) {
+		function onInnerCompleted(err, rows, hasMore) {
 			if (err) {
 				onCompleted(err);
+				return;
+			}
+			result.push(rows);
+			if (!hasMore) {
+
+				if (result.length === 1)
+					onCompleted(null, result[0]);
+				else
+					onCompleted(null, result);
 			}
-			else
-				onCompleted(null, rows);
 		}
 	}
 

diff --git a/src/sap/wrapQuery.js b/src/sap/wrapQuery.js
diff --git a/src/table/executeQueries/resolveExecuteQuery.js b/src/table/executeQueries/resolveExecuteQuery.js
@@ -20,12 +20,9 @@ function resolveExecuteQuery(query) {
 		}
 
 		function onCompleted(err, rows) {
-			if (!err) {
-				var lastIndex = rows.length - 1;
-				if (!Array.isArray(rows[0]) && Array.isArray(rows[lastIndex]))
-					rows = rows[lastIndex];
+			if (!err)
 				success(rows);
-			} else
+			else
 				failed(err);
 		}
 	}