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

Change back to existing identity design (#20991)

Browse Source
This commit is contained in:
Cheena Malhotra
2022-10-26 16:44:29 -07:00
committed by GitHub
parent 88cc7b333e
commit 4b4c5d8ffe
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/sql/platform/connection/common/providerConnectionInfo.ts
View File

@@ -215,7 +215,7 @@ export class ProviderConnectionInfo extends Disposable implements azdata.Connect
let idNames = []; let idNames = [];
if (this.serverCapabilities) { if (this.serverCapabilities) {
idNames = this.serverCapabilities.connectionOptions.map(o => { idNames = this.serverCapabilities.connectionOptions.map(o => {
if ((o.specialValueType || o.isIdentity || o.showOnConnectionDialog) if ((o.specialValueType || o.isIdentity)
&& o.specialValueType !== ConnectionOptionSpecialType.password && o.specialValueType !== ConnectionOptionSpecialType.password
&& o.specialValueType !== ConnectionOptionSpecialType.connectionName) { && o.specialValueType !== ConnectionOptionSpecialType.connectionName) {
return o.name; return o.name;

3
src/sql/platform/connection/test/common/providerConnectionInfo.test.ts
View File

@@ -216,10 +216,11 @@ suite('SQL ProviderConnectionInfo tests', () => {
test('getOptionsKey should create a valid unique id', () => { test('getOptionsKey should create a valid unique id', () => {
let options: { [key: string]: string } = {}; let options: { [key: string]: string } = {};
// Setting custom options are not yet considered for profile identity
options['encrypt'] = 'true'; options['encrypt'] = 'true';
connectionProfile.options = options; connectionProfile.options = options;
let conn = new ProviderConnectionInfo(capabilitiesService, connectionProfile); let conn = new ProviderConnectionInfo(capabilitiesService, connectionProfile);
let expectedId = 'providerName:MSSQL|authenticationType:|databaseName:database|encrypt:true|serverName:new server|userName:user'; let expectedId = 'providerName:MSSQL|authenticationType:|databaseName:database|serverName:new server|userName:user';
let id = conn.getOptionsKey(); let id = conn.getOptionsKey();
assert.strictEqual(id, expectedId); assert.strictEqual(id, expectedId);
}); });