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 connection when changing kernel from Kusto to SQL (#12881) (#12887)

Browse Source 
* Fix Kusto to SQL kernel connection change

* Updated Fix - removes kernel alias mapping while ensuring multi kusto notebooks work properly

* Fix tests
This commit is contained in:
Vasu Bhog
2020-10-12 12:52:24 -05:00
committed by GitHub
parent e60b01ac00
commit 05615c796d
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/sql/workbench/services/notebook/browser/models/notebookModel.ts
View File

@@ -846,6 +846,15 @@ export class NotebookModel extends Disposable implements INotebookModel {
if (newConnection) { if (newConnection) {
if (newConnection.serverCapabilities?.notebookKernelAlias) { if (newConnection.serverCapabilities?.notebookKernelAlias) {
this._currentKernelAlias = newConnection.serverCapabilities.notebookKernelAlias; this._currentKernelAlias = newConnection.serverCapabilities.notebookKernelAlias;
// Removes SQL kernel to Kernel Alias Connection Provider map
let sqlConnectionProvider = this._kernelDisplayNameToConnectionProviderIds.get('SQL');
if (sqlConnectionProvider) {
let index = sqlConnectionProvider.indexOf(newConnection.serverCapabilities.notebookKernelAlias.toUpperCase());
if (index > -1) {
sqlConnectionProvider.splice(index, 1);
}
this._kernelDisplayNameToConnectionProviderIds.set('SQL', sqlConnectionProvider);
}
this._kernelDisplayNameToConnectionProviderIds.set(newConnection.serverCapabilities.notebookKernelAlias, [newConnection.providerName]); this._kernelDisplayNameToConnectionProviderIds.set(newConnection.serverCapabilities.notebookKernelAlias, [newConnection.providerName]);
} }
this._activeConnection = newConnection; this._activeConnection = newConnection;
@@ -973,7 +982,13 @@ export class NotebookModel extends Disposable implements INotebookModel {
private async loadActiveContexts(kernelChangedArgs: nb.IKernelChangedArgs): Promise<void> { private async loadActiveContexts(kernelChangedArgs: nb.IKernelChangedArgs): Promise<void> {
if (kernelChangedArgs && kernelChangedArgs.newValue && kernelChangedArgs.newValue.name) { if (kernelChangedArgs && kernelChangedArgs.newValue && kernelChangedArgs.newValue.name) {
let kernelDisplayName = this.getDisplayNameFromSpecName(kernelChangedArgs.newValue); let kernelDisplayName = this.getDisplayNameFromSpecName(kernelChangedArgs.newValue);
let context = NotebookContexts.getContextForKernel(this._activeConnection, this.getApplicableConnectionProviderIds(kernelDisplayName)); if (this.context?.serverCapabilities?.notebookKernelAlias && this.selectedKernelDisplayName === this.context?.serverCapabilities?.notebookKernelAlias) {
kernelDisplayName = this.context.serverCapabilities?.notebookKernelAlias;
}
let context;
if (this._activeConnection) {
context = NotebookContexts.getContextForKernel(this._activeConnection, this.getApplicableConnectionProviderIds(kernelDisplayName));
}
if (context !== undefined && context.serverName !== undefined && context.title !== undefined) { if (context !== undefined && context.serverName !== undefined && context.title !== undefined) {
await this.changeContext(context.title, context); await this.changeContext(context.title, context);
} }