Changed so the execution time only runs on the first execute call

Author: RobertNash1

src/views/results/html.ts

@@ -379,7 +379,12 @@ export function generateScroller(basicSelect: string, isCL: boolean, withCancel?
                   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 + ' rows in ' + data.executionTime + 'ms. End of data.') : ('Loaded ' + totalRows + ' rows in ' + data.executionTime + 'ms. More available.')) + ' ' + (updateTable ? 'Updatable.' : '');
+                    if (data.executionTime > 0) {
+                      document.getElementById(statusId).innerText = (noMoreRows ? ('Loaded ' + totalRows + ' rows in ' + data.executionTime + 'ms. End of data.') : ('Loaded ' + totalRows + ' rows in ' + data.executionTime + 'ms. More available.')) + ' ' + (updateTable ? 'Updatable.' : '');
+                    }
+                    else {
+                      document.getElementById(statusId).innerText = (noMoreRows ? ('Loaded ' + totalRows + ' rows. End of data.') : ('Loaded ' + totalRows + ' rows. More available.')) + ' ' + (updateTable ? 'Updatable.' : '');
+                    }
                     document.getElementById(jobId).innerText = data.jobId ? data.jobId : '';
                     document.getElementById(messageSpanId).style.visibility = "hidden";
                   }

src/views/results/resultSetPanelProvider.ts

@@ -99,9 +99,17 @@ export class ResultSetPanelProvider implements WebviewViewProvider {
 
               if (this.currentQuery.getState() !== "RUN_DONE") {
                 setCancelButtonVisibility(true);
-                const startTime = performance.now();
-                let queryResults = this.currentQuery.getState() == "RUN_MORE_DATA_AVAILABLE" ? await this.currentQuery.fetchMore() : await this.currentQuery.execute();
-                const endTime = performance.now();
+                let queryResults = undefined;
+                let startTime = 0;
+                let endTime = 0;
+                if (this.currentQuery.getState() == "RUN_MORE_DATA_AVAILABLE") {
+                  queryResults = await this.currentQuery.fetchMore();
+                }
+                else {
+                  startTime = performance.now();
+                  queryResults = await this.currentQuery.execute();
+                  endTime = performance.now();
+                }
                 const jobId = this.currentQuery.getHostJob().id;
 
                 this._view.webview.postMessage({