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

Load connection from publish profile (#11263)

Browse Source 
* initial changes for reading connection from profile

* connection string can now be read from publish.xml

* fix build errors and update test

* move publish profile tests to their own file

* cleanup

* update message

* fix string

* remove apiWrapper
This commit is contained in:
Kim Santiago
2020-07-15 17:03:25 -07:00
committed by GitHub
parent aae013d498
commit 0a1c2583cc
13 changed files with 247 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
extensions/sql-database-projects/src/dialogs/publishDatabaseDialog.ts
View File

@@ -31,7 +31,7 @@ export class PublishDatabaseDialog {
private sqlCmdVariablesTable: azdata.TableComponent | undefined;
private formBuilder: azdata.FormBuilder | undefined;
private connection: azdata.connection.Connection | undefined;
private connectionId: string | undefined;
private connectionIsDataSource: boolean | undefined;
private profileSqlCmdVars: Record<string, string> | undefined;
@@ -155,20 +155,7 @@ export class PublishDatabaseDialog {
if (this.connectionIsDataSource) {
const dataSource = (this.dataSourcesDropDown!.value! as DataSourceDropdownValue).dataSource;
const connProfile: azdata.IConnectionProfile = {
serverName: dataSource.server,
databaseName: dataSource.database,
connectionName: dataSource.name,
userName: dataSource.username,
password: dataSource.password,
authenticationType: dataSource.integratedSecurity ? 'Integrated' : 'SqlAuth',
savePassword: false,
providerName: 'MSSQL',
saveProfile: true,
id: dataSource.name + '-dataSource',
options: []
};
const connProfile: azdata.IConnectionProfile = dataSource.getConnectionProfile();
if (dataSource.integratedSecurity) {
connId = (await azdata.connection.connect(connProfile, false, false)).connectionId;
@@ -178,11 +165,11 @@ export class PublishDatabaseDialog {
}
}
else {
if (!this.connection) {
if (!this.connectionId) {
throw new Error('Connection not defined.');
}
connId = this.connection?.connectionId;
connId = this.connectionId;
}
return await azdata.connection.getUriForConnection(connId);
@@ -359,18 +346,19 @@ export class PublishDatabaseDialog {
}).component();
editConnectionButton.onDidClick(async () => {
this.connection = await azdata.connection.openConnectionDialog();
let connection = await azdata.connection.openConnectionDialog();
this.connectionId = connection.connectionId;
// show connection name if there is one, otherwise show connection string
if (this.connection.options['connectionName']) {
this.targetConnectionTextBox!.value = this.connection.options['connectionName'];
if (connection.options['connectionName']) {
this.targetConnectionTextBox!.value = connection.options['connectionName'];
} else {
this.targetConnectionTextBox!.value = await azdata.connection.getConnectionString(this.connection.connectionId, false);
this.targetConnectionTextBox!.value = await azdata.connection.getConnectionString(connection.connectionId, false);
}
// change the database inputbox value to the connection's database if there is one
if (this.connection.options.database && this.connection.options.database !== constants.master) {
this.targetDatabaseTextBox!.value = this.connection.options.database;
if (connection.options.database && connection.options.database !== constants.master) {
this.targetDatabaseTextBox!.value = connection.options.database;
}
});
@@ -419,6 +407,10 @@ export class PublishDatabaseDialog {
if (this.readPublishProfile) {
const result = await this.readPublishProfile(fileUris[0]);
(<azdata.InputBoxComponent>this.targetDatabaseTextBox).value = result.databaseName;
this.connectionId = result.connectionId;
(<azdata.InputBoxComponent>this.targetConnectionTextBox).value = result.connectionString;
this.profileSqlCmdVars = result.sqlCmdVariables;
const data = this.convertSqlCmdVarsToTableFormat(this.getSqlCmdVariablesForPublish());