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 connection error scenario (#18335)

Browse Source 
* fix connection error scenario

* pr comments
This commit is contained in:
Alan Ren
2022-02-11 18:49:29 -08:00
committed by GitHub
parent d76f239ae2
commit 57d5d94c46
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/sql/platform/connection/common/connectionStatusManager.ts
View File

@@ -16,6 +16,7 @@ import * as azdata from 'azdata';
import * as nls from 'vs/nls'; import * as nls from 'vs/nls';
import { INotificationService, Severity } from 'vs/platform/notification/common/notification'; import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
import { values } from 'vs/base/common/collections'; import { values } from 'vs/base/common/collections';
import { Schemas } from 'vs/base/common/network';
export class ConnectionStatusManager { export class ConnectionStatusManager {
@@ -225,6 +226,10 @@ export class ConnectionStatusManager {
return !!(uri && uri.startsWith(Utils.uriPrefixes.default)); return !!(uri && uri.startsWith(Utils.uriPrefixes.default));
} }
public isEditorTypeUri(uri: string): boolean {
return !!(uri && (uri.startsWith(Schemas.untitled) || uri.startsWith(Schemas.file)));
}
public getProviderIdFromUri(ownerUri: string): string { public getProviderIdFromUri(ownerUri: string): string {
let providerId: string = ''; let providerId: string = '';
let connection = this.findConnection(ownerUri); let connection = this.findConnection(ownerUri);

2
src/sql/workbench/services/connection/browser/connectionManagementService.ts
View File

@@ -347,7 +347,7 @@ export class ConnectionManagementService extends Disposable implements IConnecti
options?: IConnectionCompletionOptions): Promise<IConnectionResult> { options?: IConnectionCompletionOptions): Promise<IConnectionResult> {
if (options && options.showConnectionDialogOnError) { if (options && options.showConnectionDialogOnError) {
let params: INewConnectionParams = options && options.params ? options.params : { let params: INewConnectionParams = options && options.params ? options.params : {
connectionType: this._connectionStatusManager.isDefaultTypeUri(owner.uri) ? ConnectionType.default : ConnectionType.editor, connectionType: this._connectionStatusManager.isEditorTypeUri(owner.uri) ? ConnectionType.editor : ConnectionType.default,
input: owner, input: owner,
runQueryOnCompletion: RunQueryOnConnectionMode.none, runQueryOnCompletion: RunQueryOnConnectionMode.none,
showDashboard: options.showDashboard showDashboard: options.showDashboard