ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-17 02:51:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix more issues related to query cancel (#15727)

Browse Source 
* fix more issues related to query cancel

* comments
This commit is contained in:
Alan Ren
2021-06-15 21:10:41 -07:00
committed by GitHub
parent e4e703151f
commit 3315214435
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/sql/workbench/contrib/query/browser/gridPanel.ts
View File

@@ -125,9 +125,9 @@ export class GridPanel extends Disposable {
})); }));
this.addResultSet(this.runner.batchSets.reduce<ResultSetSummary[]>((p, e) => { this.addResultSet(this.runner.batchSets.reduce<ResultSetSummary[]>((p, e) => {
if (this.configurationService.getValue<IQueryEditorConfiguration>('queryEditor').results.streaming) { if (this.configurationService.getValue<IQueryEditorConfiguration>('queryEditor').results.streaming) {
p = p.concat(e.resultSetSummaries); p = p.concat(e.resultSetSummaries ?? []);
} else { } else {
p = p.concat(e.resultSetSummaries.filter(c => c.complete)); p = p.concat(e.resultSetSummaries?.filter(c => c.complete) ?? []);
} }
return p; return p;
}, [])); }, []));

4
src/sql/workbench/contrib/query/browser/queryResultsView.ts
View File

@@ -238,9 +238,9 @@ export class QueryResultsView extends Disposable {
this._panelView.showTab(this.messagesTab.identifier); this._panelView.showTab(this.messagesTab.identifier);
} }
// Currently we only need to support visualization options for the first result set. // 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 batchSet = runner.batchSets[0];
const resultSet = batchSet.resultSetSummaries[0]; const resultSet = batchSet?.resultSetSummaries?.[0];
if (resultSet?.visualization) {
this.chartData({ this.chartData({
resultId: batchSet.id, resultId: batchSet.id,
batchId: resultSet.batchId batchId: resultSet.batchId