Merge pull request #503 from KxSystems/KXI-58865-2

fix abnormal count of rows
KxSystems · Jan 23, 2025 · b012300 · b012300
2 parents 212f92a + 525980a
commit b012300
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/src/commands/serverCommand.ts b/src/commands/serverCommand.ts
@@ -1264,7 +1264,7 @@ export async function writeScratchpadResult(
   let errorMsg;
 
   if (result.error) {
-    errorMsg = result.errorMsg;
+    errorMsg = "Error: " + result.errorMsg;
 
     if (result.stacktrace) {
       errorMsg =

diff --git a/src/services/resultsPanelProvider.ts b/src/services/resultsPanelProvider.ts
@@ -191,14 +191,24 @@ export class KdbResultsViewProvider implements WebviewViewProvider {
   }
 
   updatedExtractRowData(results: StructuredTextResults) {
-    const { columns, count } = results;
+    const { columns } = results;
+    const columnsArray = Array.isArray(columns) ? columns : [columns];
+
+    let dataLength = 0;
+    if (columnsArray.length > 0) {
+      const firstColumnValues = columnsArray[0].values;
+      if (Array.isArray(firstColumnValues)) {
+        dataLength = firstColumnValues.length;
+      } else {
+        dataLength = 1;
+      }
+    }
+
     const rowData: { [key: string]: any }[] = Array.from(
-      { length: count },
+      { length: dataLength },
       () => ({}),
     );
 
-    const columnsArray = Array.isArray(columns) ? columns : [columns];
-
     columnsArray.forEach((column) => {
       const { name, values } = column;
       values.forEach((value, index) => {