SQL Kernel Improvements/Removing Spark Code from Core/Attach to Changes (#3790)

* Scenarios work besides loading saved kernel

* Fix compilation issue

* Save and load functional

* Fix loading kernesl issue when sql kernel is not enabled

* Fix language mapping to not be hardcoded any longer

* Remove unnecessary comment

* PR Comments vol. 1

* Code cleanup, use ConnectionProfile instead of IConnectionProfile when accessing serverName

* PR changes vol. 2

* One final comment for PR

* Fix linting issue
This commit is contained in:
Chris LaFreniere
2019-01-25 18:54:04 -08:00
committed by GitHub
parent ea67859de7
commit 43be88a37c
29 changed files with 768 additions and 627 deletions

View File

@@ -13,7 +13,9 @@ import { Emitter, Event } from 'vs/base/common/event';
import URI from 'vs/base/common/uri';
import { IContextKeyService, ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
import * as resources from 'vs/base/common/resources';
import * as sqlops from 'sqlops';
import { IStandardKernelWithProvider } from 'sql/parts/notebook/notebookUtils';
import { INotebookService, INotebookEditor } from 'sql/workbench/services/notebook/common/notebookService';
import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
import Severity from 'vs/base/common/severity';
@@ -27,10 +29,13 @@ export class NotebookInputModel extends EditorModel {
private dirty: boolean;
private readonly _onDidChangeDirty: Emitter<void> = this._register(new Emitter<void>());
private _providerId: string;
private _standardKernels: IStandardKernelWithProvider[];
private _defaultKernel: sqlops.nb.IKernelSpec;
constructor(public readonly notebookUri: URI, private readonly handle: number, private _isTrusted: boolean = false, private saveHandler?: ModeViewSaveHandler, provider?: string, private _providers?: string[]) {
super();
this.dirty = false;
this._providerId = provider;
this._standardKernels = [];
}
public get providerId(): string {
@@ -49,6 +54,28 @@ export class NotebookInputModel extends EditorModel {
this._providers = value;
}
public get standardKernels(): IStandardKernelWithProvider[] {
return this._standardKernels;
}
public set standardKernels(value: IStandardKernelWithProvider[]) {
value.forEach(kernel => {
this._standardKernels.push({
connectionProviderIds: kernel.connectionProviderIds,
name: kernel.name,
notebookProvider: kernel.notebookProvider
});
});
}
public get defaultKernel(): sqlops.nb.IKernelSpec {
return this._defaultKernel;
}
public set defaultKernel(kernel: sqlops.nb.IKernelSpec) {
this._defaultKernel = kernel;
}
get isTrusted(): boolean {
return this._isTrusted;
}
@@ -116,6 +143,14 @@ export class NotebookInput extends EditorInput {
return this._model.providers;
}
public get standardKernels(): IStandardKernelWithProvider[] {
return this._model.standardKernels;
}
public get defaultKernel(): sqlops.nb.IKernelSpec {
return this._model.defaultKernel;
}
public getTypeId(): string {
return NotebookInput.ID;
}