From 852ec4456720593eab32a9361fb2fb6311ebb5fb Mon Sep 17 00:00:00 2001 From: Karl Burtram Date: Mon, 10 Dec 2018 16:26:06 -0800 Subject: [PATCH] Fix DataTier wizard null ref looking up provider with no active connection (#3528) --- .../import/src/wizard/dataTierApplicationWizard.ts | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/extensions/import/src/wizard/dataTierApplicationWizard.ts b/extensions/import/src/wizard/dataTierApplicationWizard.ts index 1af7254046..e91ff59381 100644 --- a/extensions/import/src/wizard/dataTierApplicationWizard.ts +++ b/extensions/import/src/wizard/dataTierApplicationWizard.ts @@ -202,7 +202,7 @@ export class DataTierApplicationWizard { } private async deploy() { - let service = await DataTierApplicationWizard.getService(); + let service = await DataTierApplicationWizard.getService(this.model.server.providerName); let ownerUri = await sqlops.connection.getUriForConnection(this.model.server.connectionId); let result = await service.deployDacpac(this.model.filePath, this.model.database, this.model.upgradeExisting, ownerUri, sqlops.TaskExecutionMode.execute); @@ -213,7 +213,7 @@ export class DataTierApplicationWizard { } private async extract() { - let service = await DataTierApplicationWizard.getService(); + let service = await DataTierApplicationWizard.getService(this.model.server.providerName); let ownerUri = await sqlops.connection.getUriForConnection(this.model.server.connectionId); let result = await service.extractDacpac(this.model.database, this.model.filePath, this.model.database, this.model.version, ownerUri, sqlops.TaskExecutionMode.execute); @@ -224,7 +224,7 @@ export class DataTierApplicationWizard { } private async export() { - let service = await DataTierApplicationWizard.getService(); + let service = await DataTierApplicationWizard.getService(this.model.server.providerName); let ownerUri = await sqlops.connection.getUriForConnection(this.model.server.connectionId); let result = await service.exportBacpac(this.model.database, this.model.filePath, ownerUri, sqlops.TaskExecutionMode.execute); @@ -235,7 +235,7 @@ export class DataTierApplicationWizard { } private async import() { - let service = await DataTierApplicationWizard.getService(); + let service = await DataTierApplicationWizard.getService(this.model.server.providerName); let ownerUri = await sqlops.connection.getUriForConnection(this.model.server.connectionId); let result = await service.importBacpac(this.model.filePath, this.model.database, ownerUri, sqlops.TaskExecutionMode.execute); @@ -245,9 +245,8 @@ export class DataTierApplicationWizard { } } - public static async getService(): Promise { - let currentConnection = await sqlops.connection.getCurrentConnection(); - let service = sqlops.dataprotocol.getProvider(currentConnection.providerName, sqlops.DataProviderType.DacFxServicesProvider); + private static async getService(providerName: string): Promise { + let service = sqlops.dataprotocol.getProvider(providerName, sqlops.DataProviderType.DacFxServicesProvider); return service; } }