ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Setup files for workbench/services to be strict compiled (#9168)

Browse Source 
* setup services to be strict compiled. fix some of the issues

* fix compile

* fix compile

* revert some undefined changes
This commit is contained in:
Anthony Dresser
2020-02-19 16:07:57 -08:00
committed by GitHub
parent cec7753e3d
commit 1d0f76d26a
17 changed files with 204 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/sql/workbench/services/restore/browser/restoreServiceImpl.ts
View File

@@ -155,12 +155,7 @@ export class RestoreDialogController implements IRestoreDialogController {
}
private handleOnRestore(isScriptOnly: boolean = false): void {
let restoreOption = this.setRestoreOption();
if (isScriptOnly) {
restoreOption.taskExecutionMode = TaskExecutionMode.script;
} else {
restoreOption.taskExecutionMode = TaskExecutionMode.executeAndScript;
}
let restoreOption = this.setRestoreOption(isScriptOnly ? TaskExecutionMode.script : TaskExecutionMode.executeAndScript);
this._restoreService.restore(this._ownerUri, restoreOption).then(result => {
const self = this;
@@ -192,7 +187,7 @@ export class RestoreDialogController implements IRestoreDialogController {
private handleMssqlOnValidateFile(overwriteTargetDatabase: boolean = false): void {
let restoreDialog = this._restoreDialogs[this._currentProvider] as RestoreDialog;
this._restoreService.getRestorePlan(this._ownerUri, this.setRestoreOption(overwriteTargetDatabase)).then(restorePlanResponse => {
this._restoreService.getRestorePlan(this._ownerUri, this.setRestoreOption(TaskExecutionMode.execute, overwriteTargetDatabase)).then(restorePlanResponse => {
this._sessionId = restorePlanResponse.sessionId;
if (restorePlanResponse.errorMessage) {
@@ -237,12 +232,12 @@ export class RestoreDialogController implements IRestoreDialogController {
});
}
private setRestoreOption(overwriteTargetDatabase: boolean = false): azdata.RestoreInfo {
private setRestoreOption(taskExecutionMode: TaskExecutionMode, overwriteTargetDatabase: boolean = false): azdata.RestoreInfo {
let restoreInfo = undefined;
let providerId: string = this.getCurrentProviderId();
if (providerId === ConnectionConstants.mssqlProviderName) {
restoreInfo = new MssqlRestoreInfo();
restoreInfo = new MssqlRestoreInfo(taskExecutionMode);
if (this._sessionId) {
restoreInfo.sessionId = this._sessionId;
@@ -287,7 +282,7 @@ export class RestoreDialogController implements IRestoreDialogController {
}
private handleOnCancel(): void {
let restoreInfo = new MssqlRestoreInfo();
let restoreInfo = new MssqlRestoreInfo(TaskExecutionMode.execute);
restoreInfo.sessionId = this._sessionId;
this._restoreService.cancelRestorePlan(this._ownerUri, restoreInfo).then(() => {
this._connectionService.disconnect(this._ownerUri);

5
src/sql/workbench/services/restore/common/mssqlRestoreInfo.ts
View File

@@ -8,9 +8,8 @@ import * as azdata from 'azdata';
export class MssqlRestoreInfo implements azdata.RestoreInfo {
options: { [name: string]: any };
taskExecutionMode: azdata.TaskExecutionMode;
public constructor() {
public constructor(public taskExecutionMode: azdata.TaskExecutionMode) {
this.options = {};
}
@@ -93,4 +92,4 @@ export class MssqlRestoreInfo implements azdata.RestoreInfo {
public set overwriteTargetDatabase(value: boolean) {
this.options['overwriteTargetDatabase'] = value;
}
}
}