From 3315214435ca146c0b6cce72809b5bd198e30844 Mon Sep 17 00:00:00 2001 From: Alan Ren Date: Tue, 15 Jun 2021 21:10:41 -0700 Subject: [PATCH] fix more issues related to query cancel (#15727) * fix more issues related to query cancel * comments --- src/sql/workbench/contrib/query/browser/gridPanel.ts | 4 ++-- src/sql/workbench/contrib/query/browser/queryResultsView.ts | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/sql/workbench/contrib/query/browser/gridPanel.ts b/src/sql/workbench/contrib/query/browser/gridPanel.ts index 0b56f27bea..e197409031 100644 --- a/src/sql/workbench/contrib/query/browser/gridPanel.ts +++ b/src/sql/workbench/contrib/query/browser/gridPanel.ts @@ -125,9 +125,9 @@ export class GridPanel extends Disposable { })); this.addResultSet(this.runner.batchSets.reduce((p, e) => { if (this.configurationService.getValue('queryEditor').results.streaming) { - p = p.concat(e.resultSetSummaries); + p = p.concat(e.resultSetSummaries ?? []); } else { - p = p.concat(e.resultSetSummaries.filter(c => c.complete)); + p = p.concat(e.resultSetSummaries?.filter(c => c.complete) ?? []); } return p; }, [])); diff --git a/src/sql/workbench/contrib/query/browser/queryResultsView.ts b/src/sql/workbench/contrib/query/browser/queryResultsView.ts index 6244a6b871..0c22def526 100644 --- a/src/sql/workbench/contrib/query/browser/queryResultsView.ts +++ b/src/sql/workbench/contrib/query/browser/queryResultsView.ts @@ -238,9 +238,9 @@ export class QueryResultsView extends Disposable { this._panelView.showTab(this.messagesTab.identifier); } // Currently we only need to support visualization options for the first result set. - if (runner.batchSets[0]?.resultSetSummaries[0]?.visualization) { - const batchSet = runner.batchSets[0]; - const resultSet = batchSet.resultSetSummaries[0]; + const batchSet = runner.batchSets[0]; + const resultSet = batchSet?.resultSetSummaries?.[0]; + if (resultSet?.visualization) { this.chartData({ resultId: batchSet.id, batchId: resultSet.batchId