ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-18 09:35:39 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add connection API method to get URI (#2021)

Browse Source
This commit is contained in:
Matt Irvine
2018-07-30 10:52:24 -07:00
committed by GitHub
parent e9ef95ef1f
commit d2b6f6844d
10 changed files with 61 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/sql/workbench/api/node/mainThreadConnectionManagement.ts
View File

@@ -51,14 +51,13 @@ export class MainThreadConnectionManagement implements MainThreadConnectionManag
public async $listDatabases(connectionId: string): Promise<string[]> {
let connection = this._connectionManagementService.getActiveConnections().find(profile => profile.id === connectionId);
let connectionUri = this._connectionManagementService.getConnectionId(connection);
let connectionUri = this._connectionManagementService.getConnectionUri(connection);
let result = await this._connectionManagementService.listDatabases(connectionUri);
return result.databaseNames;
}
public $getUriForConnection(connectionId: string): Thenable<string> {
let connection = this._connectionManagementService.getActiveConnections().find(profile => profile.id === connectionId);
return Promise.resolve(this._connectionManagementService.getConnectionId(connection));
return Promise.resolve(this._connectionManagementService.getConnectionUriFromId(connectionId));
}
private convertConnection(profile: IConnectionProfile): sqlops.connection.Connection {

2
src/sql/workbench/common/taskUtilities.ts
View File

@@ -108,7 +108,7 @@ export function GetScriptOperationName(operation: ScriptOperation) {
export function connectIfNotAlreadyConnected(connectionProfile: IConnectionProfile, connectionService: IConnectionManagementService): Promise<void> {
return new Promise<void>((resolve, reject) => {
let connectionID = connectionService.getConnectionId(connectionProfile);
let connectionID = connectionService.getConnectionUri(connectionProfile);
let uri: string = connectionService.getFormattedUri(connectionID, connectionProfile);
if (!connectionService.isConnected(uri)) {
let options: IConnectionCompletionOptions = {