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 sql projects vscode extension not activating because of not finding azdata (#20814)

Browse Source
This commit is contained in:
Kim Santiago
2022-10-11 16:22:38 -07:00
committed by GitHub
parent 3005d5435f
commit 1f1ea1ab59
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
extensions/sql-database-projects/src/models/connections/connectionService.ts
View File

@@ -3,11 +3,11 @@
* Licensed under the Source EULA. See License.txt in the project root for license information. * Licensed under the Source EULA. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/ *--------------------------------------------------------------------------------------------*/
import * as azdata from 'azdata'; import type * as azdataType from 'azdata';
import * as constants from '../../common/constants'; import * as constants from '../../common/constants';
import * as utils from '../../common/utils'; import * as utils from '../../common/utils';
import * as vscode from 'vscode'; import * as vscode from 'vscode';
import { IFireWallRuleError } from 'vscode-mssql'; import { IFireWallRuleError, AuthenticationType } from 'vscode-mssql';
import { ISqlConnectionProperties } from 'sqldbproj'; import { ISqlConnectionProperties } from 'sqldbproj';
/** /**
@@ -28,7 +28,7 @@ export class ConnectionService {
* @param database database name * @param database database name
* @returns * @returns
*/ */
private async connectToDatabase(profile: ISqlConnectionProperties, saveConnectionAndPassword: boolean, database: string): Promise<azdata.ConnectionResult | string | undefined> { private async connectToDatabase(profile: ISqlConnectionProperties, saveConnectionAndPassword: boolean, database: string): Promise<azdataType.ConnectionResult | string | undefined> {
const azdataApi = utils.getAzdataApi(); const azdataApi = utils.getAzdataApi();
const vscodeMssqlApi = azdataApi ? undefined : await utils.getVscodeMssqlApi(); const vscodeMssqlApi = azdataApi ? undefined : await utils.getVscodeMssqlApi();
if (azdataApi) { if (azdataApi) {
@@ -43,7 +43,7 @@ export class ConnectionService {
id: '', id: '',
connectionName: profile.profileName, connectionName: profile.profileName,
options: [], options: [],
authenticationType: azdata.connection.AuthenticationType.SqlLogin authenticationType: azdataApi.connection.AuthenticationType.SqlLogin
}; };
return await azdataApi.connection.connect(connectionProfile, saveConnectionAndPassword, false); return await azdataApi.connection.connect(connectionProfile, saveConnectionAndPassword, false);
} else if (vscodeMssqlApi) { } else if (vscodeMssqlApi) {
@@ -54,7 +54,7 @@ export class ConnectionService {
database: database, database: database,
savePassword: saveConnectionAndPassword, savePassword: saveConnectionAndPassword,
user: profile.userName, user: profile.userName,
authenticationType: azdata.connection.AuthenticationType.SqlLogin, authenticationType: AuthenticationType.SqlLogin,
encrypt: false, encrypt: false,
connectTimeout: 30, connectTimeout: 30,
applicationName: 'SQL Database Project', applicationName: 'SQL Database Project',
@@ -112,12 +112,12 @@ export class ConnectionService {
* @param connection connection result or connection Id * @param connection connection result or connection Id
* @returns validation result * @returns validation result
*/ */
private async validateConnection(connection: azdata.ConnectionResult | string | undefined): Promise<utils.ValidationResult> { private async validateConnection(connection: azdataType.ConnectionResult | string | undefined): Promise<utils.ValidationResult> {
const azdataApi = utils.getAzdataApi(); const azdataApi = utils.getAzdataApi();
if (!connection) { if (!connection) {
return { validated: false, errorMessage: constants.connectionFailedError('No result returned') }; return { validated: false, errorMessage: constants.connectionFailedError('No result returned') };
} else if (azdataApi) { } else if (azdataApi) {
const connectionResult = <azdata.ConnectionResult>connection; const connectionResult = <azdataType.ConnectionResult>connection;
if (connectionResult) { if (connectionResult) {
const connected = connectionResult !== undefined && connectionResult.connected && connectionResult.connectionId !== undefined; const connected = connectionResult !== undefined && connectionResult.connected && connectionResult.connectionId !== undefined;
return { validated: connected, errorMessage: connected ? '' : constants.connectionFailedError(connectionResult?.errorMessage!) }; return { validated: connected, errorMessage: connected ? '' : constants.connectionFailedError(connectionResult?.errorMessage!) };
@@ -134,9 +134,9 @@ export class ConnectionService {
* @param connection connection result or connection Id * @param connection connection result or connection Id
* @returns formatted connection result * @returns formatted connection result
*/ */
private async formatConnectionResult(connection: azdata.ConnectionResult | string | undefined): Promise<string> { private async formatConnectionResult(connection: azdataType.ConnectionResult | string | undefined): Promise<string> {
const azdataApi = utils.getAzdataApi(); const azdataApi = utils.getAzdataApi();
const connectionResult = connection !== undefined && azdataApi ? <azdata.ConnectionResult>connection : undefined; const connectionResult = connection !== undefined && azdataApi ? <azdataType.ConnectionResult>connection : undefined;
return connectionResult?.connected ? connectionResult.connectionId! : <string>connection; return connectionResult?.connected ? connectionResult.connectionId! : <string>connection;
} }
@@ -160,7 +160,7 @@ export class ConnectionService {
this.defaultSqlNumberOfRetries, profile.connectionRetryTimeout || this.defaultSqlRetryTimeoutInSec); this.defaultSqlNumberOfRetries, profile.connectionRetryTimeout || this.defaultSqlRetryTimeoutInSec);
if (connection) { if (connection) {
const connectionResult = <azdata.ConnectionResult>connection; const connectionResult = <azdataType.ConnectionResult>connection;
if (azdataApi) { if (azdataApi) {
utils.throwIfNotConnected(connectionResult); utils.throwIfNotConnected(connectionResult);
return azdataApi.connection.getUriForConnection(connectionResult.connectionId!); return azdataApi.connection.getUriForConnection(connectionResult.connectionId!);