From 57d5d94c467ab49ebb949e1dc4beb225a2a57a4b Mon Sep 17 00:00:00 2001 From: Alan Ren Date: Fri, 11 Feb 2022 18:49:29 -0800 Subject: [PATCH] fix connection error scenario (#18335) * fix connection error scenario * pr comments --- .../platform/connection/common/connectionStatusManager.ts | 5 +++++ .../connection/browser/connectionManagementService.ts | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/sql/platform/connection/common/connectionStatusManager.ts b/src/sql/platform/connection/common/connectionStatusManager.ts index 91d37c0e60..4883bc3d1c 100644 --- a/src/sql/platform/connection/common/connectionStatusManager.ts +++ b/src/sql/platform/connection/common/connectionStatusManager.ts @@ -16,6 +16,7 @@ import * as azdata from 'azdata'; import * as nls from 'vs/nls'; import { INotificationService, Severity } from 'vs/platform/notification/common/notification'; import { values } from 'vs/base/common/collections'; +import { Schemas } from 'vs/base/common/network'; export class ConnectionStatusManager { @@ -225,6 +226,10 @@ export class ConnectionStatusManager { 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 { let providerId: string = ''; let connection = this.findConnection(ownerUri); diff --git a/src/sql/workbench/services/connection/browser/connectionManagementService.ts b/src/sql/workbench/services/connection/browser/connectionManagementService.ts index a2b11c528f..b3c2f56be1 100644 --- a/src/sql/workbench/services/connection/browser/connectionManagementService.ts +++ b/src/sql/workbench/services/connection/browser/connectionManagementService.ts @@ -347,7 +347,7 @@ export class ConnectionManagementService extends Disposable implements IConnecti options?: IConnectionCompletionOptions): Promise { if (options && options.showConnectionDialogOnError) { 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, runQueryOnCompletion: RunQueryOnConnectionMode.none, showDashboard: options.showDashboard