ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-13 11:38:36 -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

20
extensions/schema-compare/src/dialogs/schemaCompareDialog.ts
View File

@@ -100,16 +100,18 @@ export class SchemaCompareDialog {
connectionDetails: undefined
};
} else {
let ownerUri = await azdata.connection.getUriForConnection((this.sourceServerDropdown.value as ConnectionDropdownValue).connection.connectionId);
const sourceServerDropdownValue = this.sourceServerDropdown.value as ConnectionDropdownValue;
const ownerUri = await azdata.connection.getUriForConnection(sourceServerDropdownValue.connection.connectionId);
this.schemaCompareMainWindow.sourceEndpointInfo = {
endpointType: mssql.SchemaCompareEndpointType.Database,
serverDisplayName: (this.sourceServerDropdown.value as ConnectionDropdownValue).displayName,
serverName: (this.sourceServerDropdown.value as ConnectionDropdownValue).name,
serverDisplayName: sourceServerDropdownValue.displayName,
serverName: sourceServerDropdownValue.name,
databaseName: this.sourceDatabaseDropdown.value.toString(),
ownerUri: ownerUri,
packageFilePath: '',
connectionDetails: undefined
connectionDetails: undefined,
connectionName: sourceServerDropdownValue.connection.options.connectionName
};
}
@@ -124,16 +126,18 @@ export class SchemaCompareDialog {
connectionDetails: undefined
};
} else {
let ownerUri = await azdata.connection.getUriForConnection((this.targetServerDropdown.value as ConnectionDropdownValue).connection.connectionId);
const targetServerDropdownValue = this.targetServerDropdown.value as ConnectionDropdownValue;
const ownerUri = await azdata.connection.getUriForConnection(targetServerDropdownValue.connection.connectionId);
this.schemaCompareMainWindow.targetEndpointInfo = {
endpointType: mssql.SchemaCompareEndpointType.Database,
serverDisplayName: (this.targetServerDropdown.value as ConnectionDropdownValue).displayName,
serverName: (this.targetServerDropdown.value as ConnectionDropdownValue).name,
serverDisplayName: targetServerDropdownValue.displayName,
serverName: targetServerDropdownValue.name,
databaseName: this.targetDatabaseDropdown.value.toString(),
ownerUri: ownerUri,
packageFilePath: '',
connectionDetails: undefined
connectionDetails: undefined,
connectionName: targetServerDropdownValue.connection.options.connectionName
};
}