Add job id to result set footer

Signed-off-by: worksofliam <[email protected]>

Author: worksofliam

src/connection/query.ts

@@ -152,6 +152,10 @@ export class Query<T> {
     }
   }
 
+  public getHostJob(): SQLJob {
+    return this.job;
+  }
+
   public getId(): string {
     return this.correlationId;
   }

src/views/results/html.ts

@@ -54,6 +54,7 @@ export function generateScroller(basicSelect: string, isCL: boolean): string {
           const basicSelect = ${JSON.stringify(basicSelect)};
           const htmlTableId = 'resultset';
           const statusId = 'status';
+          const jobId = 'jobId';
           const messageSpanId = 'messageSpan';
 
           let myQueryId = '';
@@ -96,10 +97,15 @@ export function generateScroller(basicSelect: string, isCL: boolean): string {
                     appendRows(data.rows);
                   }
 
+                  if (data.jobId) {
+
+                  }
+
                   if (data.rows === undefined && totalRows === 0) {
                     document.getElementById(messageSpanId).innerText = 'Statement executed with no result set returned. Rows affected: ' + data.update_count;
                   } else {
-                    document.getElementById(statusId).innerText = noMoreRows ? ('Loaded ' + totalRows + '. End of data') : ('Loaded ' + totalRows + '. More available.');
+                    document.getElementById(statusId).innerText = noMoreRows ? ('Loaded ' + totalRows + '. End of data.') : ('Loaded ' + totalRows + '. More available.');
+                    document.getElementById(jobId).innerText = data.jobId ? data.jobId : '';
                     document.getElementById(messageSpanId).style.visibility = "hidden";
                   }
                   break;
@@ -135,10 +141,20 @@ export function generateScroller(basicSelect: string, isCL: boolean): string {
             // Initialize the footer
             var footer = document.getElementById(htmlTableId).getElementsByTagName('tfoot')[0];
             footer.innerHTML = '';
-            var newCell = footer.insertRow().insertCell();
-            newCell.colSpan = columns.length;
-            newCell.id = statusId;
-            newCell.appendChild(document.createTextNode(' '));
+            const newRow = footer.insertRow();
+
+            const statusCell = newRow.insertCell();
+            statusCell.id = statusId;
+            statusCell.appendChild(document.createTextNode(' '));
+
+            const jobIdCell = newRow.insertCell();
+            jobIdCell.id = jobId;
+            jobIdCell.appendChild(document.createTextNode(' '));
+
+            if (columns.length > 2) {
+              statusCell.colSpan = 2;
+              jobIdCell.colSpan = columns.length - 2;
+            }
           }
 
           function appendRows(rows) {

src/views/results/resultSetPanelProvider.ts

@@ -41,9 +41,12 @@ export class ResultSetPanelProvider implements WebviewViewProvider {
 
           let queryResults = queryObject.getState() == QueryState.RUN_MORE_DATA_AVAILABLE ? await queryObject.fetchMore() : await queryObject.run();
 
+          const jobId = queryObject.getHostJob().id;
+
           data = queryResults.data;
           this._view.webview.postMessage({
             command: `rows`,
+            jobId,
             rows: queryResults.data,
             columnList: queryResults.metadata ? queryResults.metadata.columns.map(x => x.name) : undefined, // Query.fetchMore() doesn't return the metadata
             queryId: queryObject.getId(),