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

Fix for issue 3133 (#3375)

Browse Source 
* Fix for issue 3133

* fix test error
This commit is contained in:
Alan Ren
2018-11-30 15:53:36 -08:00
committed by GitHub
parent 385c48dcad
commit 08d2f3125e
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/sql/parts/commandLine/common/commandLineService.ts
View File

@@ -63,7 +63,7 @@ export class CommandLineService implements ICommandLineProcessing {
// prompt the user for a new connection on startup if no profiles are registered // prompt the user for a new connection on startup if no profiles are registered
this._connectionManagementService.showConnectionDialog(); this._connectionManagementService.showConnectionDialog();
} else if (this._connectionProfile) { } else if (this._connectionProfile) {
this._connectionManagementService.connectIfNotConnected(this._connectionProfile, 'connection') this._connectionManagementService.connectIfNotConnected(this._connectionProfile, 'connection', true)
.then(result => TaskUtilities.newQuery(this._connectionProfile, .then(result => TaskUtilities.newQuery(this._connectionProfile,
this._connectionManagementService, this._connectionManagementService,
this._queryEditorService, this._queryEditorService,

2
src/sql/parts/connection/common/connectionManagement.ts
View File

@@ -121,7 +121,7 @@ export interface IConnectionManagementService {
* otherwise tries to make a connection and returns the owner uri when connection is complete * otherwise tries to make a connection and returns the owner uri when connection is complete
* The purpose is connection by default * The purpose is connection by default
*/ */
connectIfNotConnected(connection: IConnectionProfile, purpose?: 'dashboard' | 'insights' | 'connection'): Promise<string>; connectIfNotConnected(connection: IConnectionProfile, purpose?: 'dashboard' | 'insights' | 'connection', saveConnection?: boolean): Promise<string>;
/** /**
* Adds the successful connection to MRU and send the connection error back to the connection handler for failed connections * Adds the successful connection to MRU and send the connection error back to the connection handler for failed connections

4
src/sql/parts/connection/common/connectionManagementService.ts
View File

@@ -380,14 +380,14 @@ export class ConnectionManagementService extends Disposable implements IConnecti
* otherwise tries to make a connection and returns the owner uri when connection is complete * otherwise tries to make a connection and returns the owner uri when connection is complete
* The purpose is connection by default * The purpose is connection by default
*/ */
public connectIfNotConnected(connection: IConnectionProfile, purpose?: 'dashboard' | 'insights' | 'connection'): Promise<string> { public connectIfNotConnected(connection: IConnectionProfile, purpose?: 'dashboard' | 'insights' | 'connection', saveConnection: boolean = false): Promise<string> {
return new Promise<string>((resolve, reject) => { return new Promise<string>((resolve, reject) => {
let ownerUri: string = Utils.generateUri(connection, purpose); let ownerUri: string = Utils.generateUri(connection, purpose);
if (this._connectionStatusManager.isConnected(ownerUri)) { if (this._connectionStatusManager.isConnected(ownerUri)) {
resolve(this._connectionStatusManager.getOriginalOwnerUri(ownerUri)); resolve(this._connectionStatusManager.getOriginalOwnerUri(ownerUri));
} else { } else {
const options: IConnectionCompletionOptions = { const options: IConnectionCompletionOptions = {
saveTheConnection: false, saveTheConnection: saveConnection,
showConnectionDialogOnError: true, showConnectionDialogOnError: true,
showDashboard: purpose === 'dashboard', showDashboard: purpose === 'dashboard',
params: undefined, params: undefined,

2
src/sqltest/parts/commandLine/commandLineService.test.ts
View File

@@ -164,7 +164,7 @@ suite('commandLineService tests', () => {
environmentService.setup(e => e.args).returns(() => args).verifiable(TypeMoq.Times.atLeastOnce()); environmentService.setup(e => e.args).returns(() => args).verifiable(TypeMoq.Times.atLeastOnce());
connectionManagementService.setup((c) => c.showConnectionDialog()).verifiable(TypeMoq.Times.never()); connectionManagementService.setup((c) => c.showConnectionDialog()).verifiable(TypeMoq.Times.never());
connectionManagementService.setup(c => c.hasRegisteredServers()).returns(() => true).verifiable(TypeMoq.Times.atMostOnce()); connectionManagementService.setup(c => c.hasRegisteredServers()).returns(() => true).verifiable(TypeMoq.Times.atMostOnce());
connectionManagementService.setup(c => c.connectIfNotConnected(TypeMoq.It.isAny(), 'connection')) connectionManagementService.setup(c => c.connectIfNotConnected(TypeMoq.It.isAny(), 'connection', true))
.returns(() => new Promise<string>((resolve, reject) => { reject('unused');})) .returns(() => new Promise<string>((resolve, reject) => { reject('unused');}))
.verifiable(TypeMoq.Times.once()); .verifiable(TypeMoq.Times.once());
let service = getCommandLineService(connectionManagementService.object, environmentService.object, capabilitiesService); let service = getCommandLineService(connectionManagementService.object, environmentService.object, capabilitiesService);

2
src/sqltest/stubs/connectionManagementService.test.ts
View File

@@ -234,7 +234,7 @@ export class TestConnectionManagementService implements IConnectionManagementSer
return []; return [];
} }
connectIfNotConnected(connection: IConnectionProfile, purpose?: 'dashboard' | 'insights' | 'connection'): Promise<string> { connectIfNotConnected(connection: IConnectionProfile, purpose?: 'dashboard' | 'insights' | 'connection', saveConnection: boolean = false): Promise<string> {
return undefined; return undefined;
} }