ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-23 01:25:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

Handle no azdata API in sql db proj extension gracefully (#15873)

Browse Source 
* Update db proj ext to handle not having azdata API available

* Fixes

* Fix compile
This commit is contained in:
Charles Gagnon
2021-06-22 23:34:01 -07:00
committed by GitHub
parent c636e24d03
commit 4707c1601c
12 changed files with 192 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
extensions/sql-database-projects/src/models/dataSources/sqlConnectionStringSource.ts
View File

@@ -3,7 +3,7 @@
* 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 { DataSource } from './dataSources';
import * as constants from '../../common/constants';
@@ -87,8 +87,8 @@ export class SqlConnectionDataSource extends DataSource {
return new SqlConnectionDataSource(json.name, (json.data as unknown as SqlConnectionDataSourceJson).connectionString);
}
public getConnectionProfile(): azdata.IConnectionProfile {
const connProfile: azdata.IConnectionProfile = {
public getConnectionProfile(): azdataType.IConnectionProfile {
const connProfile: azdataType.IConnectionProfile = {
serverName: this.server,
databaseName: this.database,
connectionName: this.name,

5
extensions/sql-database-projects/src/models/publishProfile/publishProfile.ts
View File

@@ -3,7 +3,6 @@
* Licensed under the Source EULA. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import * as azdata from 'azdata';
import * as xmldom from 'xmldom';
import * as constants from '../../common/constants';
import * as utils from '../../common/utils';
@@ -67,13 +66,13 @@ async function readConnectionString(xmlDoc: any): Promise<{ connectionId: string
try {
if (dataSource.integratedSecurity) {
const connection = await azdata.connection.connect(connectionProfile, false, false);
const connection = await utils.getAzdataApi()!.connection.connect(connectionProfile, false, false);
connId = connection.connectionId;
server = dataSource.server;
username = constants.defaultUser;
}
else {
const connection = await azdata.connection.openConnectionDialog(undefined, connectionProfile);
const connection = await utils.getAzdataApi()!.connection.openConnectionDialog(undefined, connectionProfile);
connId = connection.connectionId;
server = connection.options['server'];
username = connection.options['user'];