ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 18:46:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix schema compare display name having username (#15357)

Browse Source 
* fix schema compare display name having username

* reuse variable

* fix previous selection for server not being selected in dialog

* fix tests
This commit is contained in:
Kim Santiago
2021-05-07 12:46:06 -07:00
committed by GitHub
parent 24f29ca0a7
commit 9d8660749a
5 changed files with 32 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
extensions/schema-compare/src/utils.ts
View File

@@ -49,14 +49,17 @@ export function getEndpointName(endpoint: mssql.SchemaCompareEndpointInfo): stri
}
if (endpoint.endpointType === mssql.SchemaCompareEndpointType.Database) {
if (!endpoint.serverDisplayName && endpoint.connectionDetails) {
endpoint.serverDisplayName = endpoint.connectionDetails['serverName'];
if (!endpoint.serverName && endpoint.connectionDetails) {
endpoint.serverName = endpoint.connectionDetails['serverName'];
}
if (!endpoint.databaseName && endpoint.connectionDetails) {
endpoint.databaseName = endpoint.connectionDetails['databaseName'];
}
if (endpoint.serverDisplayName && endpoint.databaseName) {
return `${endpoint.serverDisplayName}.${endpoint.databaseName}`;
if (endpoint.connectionName && endpoint.databaseName) {
return `${endpoint.connectionName}.${endpoint.databaseName}`;
}
if (endpoint.serverName && endpoint.databaseName) {
return `${endpoint.serverName}.${endpoint.databaseName}`;
} else {
return ' ';
}