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

If the connectionProfile was undefined, then return undefined (#10899)

Browse Source
This commit is contained in:
Amir Omidi
2020-06-12 12:46:34 -07:00
committed by GitHub
parent 535e9d012a
commit 83a8b13750
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/sql/workbench/api/browser/mainThreadConnectionManagement.ts
View File

@@ -128,7 +128,7 @@ export class MainThreadConnectionManagement extends Disposable implements MainTh
return Promise.resolve(this._connectionManagementService.getServerInfo(connectionId)); return Promise.resolve(this._connectionManagementService.getServerInfo(connectionId));
} }
public async $openConnectionDialog(providers: string[], initialConnectionProfile?: IConnectionProfile, connectionCompletionOptions?: azdata.IConnectionCompletionOptions): Promise<azdata.connection.Connection> { public async $openConnectionDialog(providers: string[], initialConnectionProfile?: IConnectionProfile, connectionCompletionOptions?: azdata.IConnectionCompletionOptions): Promise<azdata.connection.Connection | undefined> {
// Here we default to ConnectionType.editor which saves the connecton in the connection store by default // Here we default to ConnectionType.editor which saves the connecton in the connection store by default
let connectionType = ConnectionType.editor; let connectionType = ConnectionType.editor;
@@ -139,9 +139,12 @@ export class MainThreadConnectionManagement extends Disposable implements MainTh
} }
let connectionProfile = await this._connectionDialogService.openDialogAndWait(this._connectionManagementService, let connectionProfile = await this._connectionDialogService.openDialogAndWait(this._connectionManagementService,
{ connectionType: connectionType, providers: providers }, initialConnectionProfile, undefined); { connectionType: connectionType, providers: providers }, initialConnectionProfile, undefined);
if (connectionProfile) {
connectionProfile.options.savePassword = connectionProfile.savePassword; if (!connectionProfile) {
return undefined;
} }
connectionProfile.options.savePassword = connectionProfile.savePassword;
const connection = connectionProfile ? { const connection = connectionProfile ? {
connectionId: connectionProfile.id, connectionId: connectionProfile.id,
options: connectionProfile.options, options: connectionProfile.options,