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

Fixes for sql db projects dashboard (#15100)

Browse Source 
* Fix ID assignment for sql db projects dashboard

* Update with new fixes

* Fix tests

* Fix test
This commit is contained in:
Sakshi Sharma
2021-05-05 19:00:22 -07:00
committed by GitHub
parent 8c08c79d67
commit 3b3df2c3fc
9 changed files with 84 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/sql-database-projects/src/models/IPublishSettings.ts
View File

@@ -7,6 +7,7 @@ import { DeploymentOptions } from '../../../mssql/src/mssql';
export interface IPublishSettings {
databaseName: string;
serverName: string;
connectionUri: string;
upgradeExisting: boolean;
sqlCmdVariables?: Record<string, string>;
@@ -16,6 +17,7 @@ export interface IPublishSettings {
export interface IGenerateScriptSettings {
databaseName: string;
serverName: string;
connectionUri: string;
sqlCmdVariables?: Record<string, string>;
deploymentOptions?: DeploymentOptions;

11
extensions/sql-database-projects/src/models/dashboardData/dashboardData.ts
View File

@@ -19,6 +19,17 @@ export class DashboardData {
}
}
export class PublishData extends DashboardData {
public targetServer: string;
public targetDatabase: string;
constructor(projectFile: string, status: Status, target: string, startDate: string, targetDatabase: string, targetServer: string) {
super(projectFile, status, target, startDate);
this.targetDatabase = targetDatabase;
this.targetServer = targetServer;
}
}
export enum Status {
success,
failed,

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

@@ -16,6 +16,7 @@ import { SqlConnectionDataSource } from '../dataSources/sqlConnectionStringSourc
// only reading db name, connection string, and SQLCMD vars from profile for now
export interface PublishProfile {
databaseName: string;
serverName: string;
connectionId: string;
connection: string;
sqlCmdVariables: Record<string, string>;
@@ -45,6 +46,7 @@ export async function load(profileUri: Uri, dacfxService: mssql.IDacFxService):
return {
databaseName: targetDbName,
serverName: connectionInfo.server,
connectionId: connectionInfo.connectionId,
connection: connectionInfo.connection,
sqlCmdVariables: sqlCmdVariables,
@@ -52,14 +54,14 @@ export async function load(profileUri: Uri, dacfxService: mssql.IDacFxService):
};
}
async function readConnectionString(xmlDoc: any): Promise<{ connectionId: string, connection: string }> {
async function readConnectionString(xmlDoc: any): Promise<{ connectionId: string, connection: string, server: string }> {
let targetConnection: string = '';
let connId: string = '';
let server: string = '';
if (xmlDoc.documentElement.getElementsByTagName(constants.targetConnectionString).length > 0) {
const targetConnectionString = xmlDoc.documentElement.getElementsByTagName(constants.TargetConnectionString)[0].textContent;
const dataSource = new SqlConnectionDataSource('', targetConnectionString);
let server: string = '';
let username: string = '';
const connectionProfile = dataSource.getConnectionProfile();
@@ -86,6 +88,7 @@ async function readConnectionString(xmlDoc: any): Promise<{ connectionId: string
return {
connectionId: connId,
connection: targetConnection
connection: targetConnection,
server: server
};
}