diff --git a/src/sql/platform/connection/common/connectionProfile.ts b/src/sql/platform/connection/common/connectionProfile.ts index 0fb4753566..3839a216c2 100644 --- a/src/sql/platform/connection/common/connectionProfile.ts +++ b/src/sql/platform/connection/common/connectionProfile.ts @@ -284,6 +284,7 @@ export class ConnectionProfile extends ProviderConnectionInfo implements interfa serverName: this.serverName, databaseName: this.databaseName, authenticationType: this.authenticationType, + serverCapabilities: this.serverCapabilities, getOptionsKey: this.getOptionsKey, matches: this.matches, groupId: this.groupId, diff --git a/src/sql/platform/connection/common/interfaces.ts b/src/sql/platform/connection/common/interfaces.ts index f760dd527d..119f9ec6e8 100644 --- a/src/sql/platform/connection/common/interfaces.ts +++ b/src/sql/platform/connection/common/interfaces.ts @@ -4,11 +4,13 @@ *--------------------------------------------------------------------------------------------*/ import * as azdata from 'azdata'; +import { ConnectionProviderProperties } from 'sql/platform/capabilities/common/capabilitiesService'; // Used to allow various methods of matching profiles export type ProfileMatcher = (a: IConnectionProfile, b: IConnectionProfile) => boolean; export interface IConnectionProfile extends azdata.IConnectionProfile { + serverCapabilities: ConnectionProviderProperties | undefined; getOptionsKey(getOriginalOptions?: boolean): string; matches(profile: azdata.IConnectionProfile): boolean; } diff --git a/src/sql/platform/connection/common/providerConnectionInfo.ts b/src/sql/platform/connection/common/providerConnectionInfo.ts index 8dc6ba945e..4b8694a81b 100644 --- a/src/sql/platform/connection/common/providerConnectionInfo.ts +++ b/src/sql/platform/connection/common/providerConnectionInfo.ts @@ -29,7 +29,7 @@ export class ProviderConnectionInfo implements azdata.ConnectionInfo { this.providerName = isString(model) ? model : 'providerName' in model ? model.providerName : model.providerId; if (!isString(model)) { - if (model.options && this.hasServerCapabilities()) { + if (model.options && this.serverCapabilities) { this.serverCapabilities.connectionOptions.forEach(option => { let value = model.options[option.name]; this.options[option.name] = value; @@ -136,7 +136,7 @@ export class ProviderConnectionInfo implements azdata.ConnectionInfo { private getServerInfo() { let title = ''; - if (this.hasServerCapabilities()) { + if (this.serverCapabilities) { title = this.serverName; // Only show database name if the provider supports it. if (this.serverCapabilities.connectionOptions?.find(option => option.specialValueType === ConnectionOptionSpecialType.databaseName)) { @@ -153,7 +153,7 @@ export class ProviderConnectionInfo implements azdata.ConnectionInfo { public get title(): string { let label = ''; - if (this.hasServerCapabilities()) { + if (this.serverCapabilities) { if (this.connectionName) { label = this.connectionName; } else { @@ -169,10 +169,6 @@ export class ProviderConnectionInfo implements azdata.ConnectionInfo { return label; } - public hasServerCapabilities(): boolean { - return (this.serverCapabilities !== undefined); - } - public hasLoaded(): boolean { return Object.keys(this.capabilitiesService.providers).length > 0; } @@ -187,7 +183,7 @@ export class ProviderConnectionInfo implements azdata.ConnectionInfo { public isPasswordRequired(): boolean { // if there is no provider capabilities metadata assume a password is not required - if (!this.hasServerCapabilities()) { + if (!this.serverCapabilities) { return false; } @@ -218,7 +214,7 @@ export class ProviderConnectionInfo implements azdata.ConnectionInfo { public getOptionsKey(getOriginalOptions?: boolean): string { let useFullOptions = false; let idNames = []; - if (this.hasServerCapabilities()) { + if (this.serverCapabilities) { useFullOptions = this.serverCapabilities.useFullOptions; idNames = this.serverCapabilities.connectionOptions.map(o => { // All options enabled, use every property besides password. @@ -299,7 +295,7 @@ export class ProviderConnectionInfo implements azdata.ConnectionInfo { } public getSpecialTypeOptionName(type: string): string | undefined { - if (this.hasServerCapabilities()) { + if (this.serverCapabilities) { let optionMetadata = this.serverCapabilities.connectionOptions.find(o => o.specialValueType === type); return !!optionMetadata ? optionMetadata.name : undefined; } else { @@ -315,7 +311,7 @@ export class ProviderConnectionInfo implements azdata.ConnectionInfo { } public get authenticationTypeDisplayName(): string { - let optionMetadata = this.hasServerCapabilities() ? this.serverCapabilities.connectionOptions.find(o => o.specialValueType === ConnectionOptionSpecialType.authType) : undefined; + let optionMetadata = this.serverCapabilities ? this.serverCapabilities.connectionOptions.find(o => o.specialValueType === ConnectionOptionSpecialType.authType) : undefined; let authType = this.authenticationType; let displayName: string = authType; @@ -361,7 +357,7 @@ export class ProviderConnectionInfo implements azdata.ConnectionInfo { public getConnectionOptionsList(needSpecial: boolean, getNonDefault: boolean): azdata.ConnectionOption[] { let connectionOptions: azdata.ConnectionOption[] = []; - if (this.hasServerCapabilities()) { + if (this.serverCapabilities) { this.serverCapabilities.connectionOptions.forEach(element => { if (((!needSpecial && element.specialValueType !== ConnectionOptionSpecialType.serverName && element.specialValueType !== ConnectionOptionSpecialType.databaseName && diff --git a/src/sql/platform/connection/test/common/connectionConfig.test.ts b/src/sql/platform/connection/test/common/connectionConfig.test.ts index f99fbb5e93..33c69ae22e 100644 --- a/src/sql/platform/connection/test/common/connectionConfig.test.ts +++ b/src/sql/platform/connection/test/common/connectionConfig.test.ts @@ -301,6 +301,7 @@ suite('ConnectionConfig', () => { groupFullName: undefined, groupId: undefined, getOptionsKey: undefined!, + serverCapabilities: undefined, matches: undefined!, providerName: 'MSSQL', options: {}, @@ -333,6 +334,7 @@ suite('ConnectionConfig', () => { savePassword: true, groupFullName: undefined, getOptionsKey: undefined!, + serverCapabilities: undefined, matches: undefined!, providerName: 'MSSQL', options: {}, @@ -365,6 +367,7 @@ suite('ConnectionConfig', () => { groupFullName: 'g2/g2-2', groupId: undefined, getOptionsKey: undefined!, + serverCapabilities: undefined, matches: undefined!, providerName: 'MSSQL', options: {}, @@ -508,6 +511,7 @@ suite('ConnectionConfig', () => { groupFullName: 'g3', groupId: 'g3', getOptionsKey: undefined!, + serverCapabilities: undefined, matches: undefined!, providerName: 'MSSQL', options: {}, @@ -538,6 +542,7 @@ suite('ConnectionConfig', () => { groupFullName: 'g3', groupId: 'g3', getOptionsKey: undefined!, + serverCapabilities: undefined, matches: undefined!, providerName: 'MSSQL', options: {}, @@ -575,6 +580,7 @@ suite('ConnectionConfig', () => { groupFullName: 'g3', groupId: 'newid', getOptionsKey: undefined!, + serverCapabilities: undefined, matches: undefined!, providerName: 'MSSQL', options: {}, @@ -655,6 +661,7 @@ suite('ConnectionConfig', () => { groupFullName: 'g3', groupId: 'g3', getOptionsKey: () => { return 'connectionId'; }, + serverCapabilities: undefined, matches: undefined!, providerName: 'MSSQL', options: {}, @@ -672,6 +679,7 @@ suite('ConnectionConfig', () => { groupFullName: 'test', groupId: 'test', getOptionsKey: () => { return 'connectionId'; }, + serverCapabilities: undefined, matches: undefined!, providerName: 'MSSQL', options: {}, @@ -712,6 +720,7 @@ suite('ConnectionConfig', () => { groupFullName: 'g3', groupId: 'g3', getOptionsKey: () => { return 'connectionId'; }, + serverCapabilities: undefined, matches: undefined!, providerName: 'MSSQL', options: { @@ -732,6 +741,7 @@ suite('ConnectionConfig', () => { groupFullName: 'test', groupId: 'test', getOptionsKey: () => { return 'connectionId'; }, + serverCapabilities: undefined, matches: undefined!, providerName: 'MSSQL', options: { 'testProperty2': '15' }, @@ -770,6 +780,7 @@ suite('ConnectionConfig', () => { groupFullName: 'g3', groupId: 'g3', getOptionsKey: () => { return 'connectionId'; }, + serverCapabilities: undefined, matches: undefined!, providerName: 'MSSQL', options: { @@ -790,6 +801,7 @@ suite('ConnectionConfig', () => { groupFullName: 'test', groupId: 'test', getOptionsKey: () => { return 'connectionId'; }, + serverCapabilities: undefined, matches: undefined!, providerName: 'MSSQL', options: { 'testProperty1': 'nonDefault' }, @@ -831,6 +843,7 @@ suite('ConnectionConfig', () => { groupFullName: 'g3', groupId: 'g3', getOptionsKey: () => { return 'connectionId'; }, + serverCapabilities: undefined, matches: undefined!, providerName: 'MSSQL', options: { @@ -851,6 +864,7 @@ suite('ConnectionConfig', () => { groupFullName: 'test', groupId: 'test', getOptionsKey: () => { return 'connectionId'; }, + serverCapabilities: undefined, matches: undefined!, providerName: 'MSSQL', options: { 'testProperty2': '15' }, @@ -889,6 +903,7 @@ suite('ConnectionConfig', () => { groupFullName: 'g3', groupId: 'g3', getOptionsKey: () => { return 'connectionId'; }, + serverCapabilities: undefined, matches: undefined!, providerName: 'MSSQL', options: {}, @@ -991,6 +1006,7 @@ suite('ConnectionConfig', () => { groupFullName: 'g3', groupId: 'g3', getOptionsKey: () => { return 'connectionId'; }, + serverCapabilities: undefined, matches: undefined!, providerName: 'MSSQL', options: {}, @@ -1008,6 +1024,7 @@ suite('ConnectionConfig', () => { groupFullName: 'test', groupId: 'test', getOptionsKey: () => { return 'connectionId'; }, + serverCapabilities: undefined, matches: undefined!, providerName: 'MSSQL', options: {}, @@ -1025,6 +1042,7 @@ suite('ConnectionConfig', () => { groupFullName: 'test', groupId: 'test', getOptionsKey: () => { return 'connectionId'; }, + serverCapabilities: undefined, matches: undefined!, providerName: 'MSSQL', options: {}, @@ -1059,6 +1077,7 @@ suite('ConnectionConfig', () => { groupFullName: 'test', groupId: 'test', getOptionsKey: () => { return 'connectionId'; }, + serverCapabilities: undefined, matches: undefined!, providerName: 'MSSQL', options: {}, @@ -1076,6 +1095,7 @@ suite('ConnectionConfig', () => { groupFullName: 'test', groupId: 'test', getOptionsKey: () => { return 'connectionId'; }, + serverCapabilities: undefined, matches: undefined!, providerName: 'MSSQL', options: {}, @@ -1093,6 +1113,7 @@ suite('ConnectionConfig', () => { groupFullName: 'test', groupId: 'test', getOptionsKey: () => { return 'connectionId'; }, + serverCapabilities: undefined, matches: undefined!, providerName: 'MSSQL', options: {}, diff --git a/src/sql/platform/connection/test/common/connectionProfile.test.ts b/src/sql/platform/connection/test/common/connectionProfile.test.ts index 539db0781e..090e845686 100644 --- a/src/sql/platform/connection/test/common/connectionProfile.test.ts +++ b/src/sql/platform/connection/test/common/connectionProfile.test.ts @@ -26,6 +26,7 @@ suite('SQL ConnectionProfileInfo tests', () => { groupFullName: 'g2/g2-2', groupId: 'group id', getOptionsKey: undefined!, + serverCapabilities: undefined, matches: undefined!, providerName: mssqlProviderName, options: {}, @@ -282,4 +283,10 @@ suite('SQL ConnectionProfileInfo tests', () => { test('an empty connection profile does not cause issues', () => { assert.doesNotThrow(() => new ConnectionProfile(capabilitiesService, {} as IConnectionProfile)); }); + + test('getOptionsKey should produce the same optionsKey after converting to IConnectionProfile', () => { + let conn = new ConnectionProfile(capabilitiesService, iConnectionProfile); + const myIConnectionProfile = conn.toIConnectionProfile(); + assert.equal(conn.getOptionsKey(), myIConnectionProfile.getOptionsKey()); + }); }); diff --git a/src/sql/platform/connection/test/common/connectionStore.test.ts b/src/sql/platform/connection/test/common/connectionStore.test.ts index cd23b4cdc2..0b78249efa 100644 --- a/src/sql/platform/connection/test/common/connectionStore.test.ts +++ b/src/sql/platform/connection/test/common/connectionStore.test.ts @@ -32,6 +32,7 @@ suite('ConnectionStore', () => { groupId: '', groupFullName: '', getOptionsKey: undefined!, + serverCapabilities: undefined, matches: () => false, providerName: mssqlProviderName, options: {}, diff --git a/src/sql/platform/connection/test/common/providerConnectionInfo.test.ts b/src/sql/platform/connection/test/common/providerConnectionInfo.test.ts index 777b50d55f..e0c6e83857 100644 --- a/src/sql/platform/connection/test/common/providerConnectionInfo.test.ts +++ b/src/sql/platform/connection/test/common/providerConnectionInfo.test.ts @@ -25,6 +25,7 @@ suite('SQL ProviderConnectionInfo tests', () => { groupFullName: 'g2/g2-2', groupId: undefined, getOptionsKey: undefined!, + serverCapabilities: undefined, matches: undefined!, providerName: mssqlProviderName, options: undefined!, diff --git a/src/sql/platform/connection/test/node/connectionStatusManager.test.ts b/src/sql/platform/connection/test/node/connectionStatusManager.test.ts index b49f676b27..e75d991ee2 100644 --- a/src/sql/platform/connection/test/node/connectionStatusManager.test.ts +++ b/src/sql/platform/connection/test/node/connectionStatusManager.test.ts @@ -27,6 +27,7 @@ let connectionProfile: IConnectionProfile = { groupFullName: 'g2/g2-2', groupId: 'group id', getOptionsKey: () => 'connection1', + serverCapabilities: undefined, matches: undefined!, providerName: mssqlProviderName, options: {}, @@ -44,6 +45,7 @@ let editorConnectionProfile: IConnectionProfile = { groupFullName: 'g2/g2-2', groupId: 'group id', getOptionsKey: () => 'connection2', + serverCapabilities: undefined, matches: undefined!, providerName: mssqlProviderName, options: {}, @@ -61,6 +63,7 @@ let connectionProfileWithoutDbName: IConnectionProfile = { groupFullName: 'g2/g2-2', groupId: 'group id', getOptionsKey: () => 'connection1', + serverCapabilities: undefined, matches: undefined!, providerName: mssqlProviderName, options: {}, diff --git a/src/sql/workbench/services/connection/test/browser/connectionManagementService.test.ts b/src/sql/workbench/services/connection/test/browser/connectionManagementService.test.ts index 87cfe9ebaf..d3b97c466c 100644 --- a/src/sql/workbench/services/connection/test/browser/connectionManagementService.test.ts +++ b/src/sql/workbench/services/connection/test/browser/connectionManagementService.test.ts @@ -68,6 +68,7 @@ suite('SQL ConnectionManagementService tests', () => { groupFullName: 'g2/g2-2', groupId: 'group id', getOptionsKey: () => { return 'connectionId'; }, + serverCapabilities: undefined, matches: undefined, providerName: 'MSSQL', options: {}, @@ -2059,6 +2060,7 @@ test('getEditorConnectionProfileTitle should return a correctly formatted title groupFullName: 'g2/g2-2', groupId: 'group id', getOptionsKey: () => { return ''; }, + serverCapabilities: undefined, matches: undefined, providerName: 'MSSQL', options: {}, diff --git a/src/sql/workbench/services/insights/test/browser/insightsDialogController.test.ts b/src/sql/workbench/services/insights/test/browser/insightsDialogController.test.ts index f8294c9df0..61902fb317 100644 --- a/src/sql/workbench/services/insights/test/browser/insightsDialogController.test.ts +++ b/src/sql/workbench/services/insights/test/browser/insightsDialogController.test.ts @@ -75,6 +75,7 @@ suite('Insights Dialog Controller Tests', () => { groupFullName: '', groupId: '', getOptionsKey: () => '', + serverCapabilities: undefined, matches: undefined, providerName: '', saveProfile: true, diff --git a/src/sql/workbench/services/objectExplorer/browser/treeUpdateUtils.ts b/src/sql/workbench/services/objectExplorer/browser/treeUpdateUtils.ts index 6d2ae54489..5f893fa05a 100644 --- a/src/sql/workbench/services/objectExplorer/browser/treeUpdateUtils.ts +++ b/src/sql/workbench/services/objectExplorer/browser/treeUpdateUtils.ts @@ -405,7 +405,7 @@ export class TreeUpdateUtils { // Map the indices of profiles that share the same connection name. for (let i = 0; i < inputList.length; i++) { // do not add if the profile is still loading as that will result in erroneous entries. - if (inputList[i].hasServerCapabilities && inputList[i].hasLoaded()) { + if (inputList[i].serverCapabilities && inputList[i].hasLoaded()) { let titleKey = inputList[i].getOriginalTitle(); if (profileListMap.has(titleKey)) { let profilesForKey = profileListMap.get(titleKey); diff --git a/src/sql/workbench/services/objectExplorer/test/browser/asyncServerTreeDragAndDrop.test.ts b/src/sql/workbench/services/objectExplorer/test/browser/asyncServerTreeDragAndDrop.test.ts index dd36db9005..965e76a24d 100644 --- a/src/sql/workbench/services/objectExplorer/test/browser/asyncServerTreeDragAndDrop.test.ts +++ b/src/sql/workbench/services/objectExplorer/test/browser/asyncServerTreeDragAndDrop.test.ts @@ -36,6 +36,7 @@ suite('AsyncServerTreeDragAndDrop', () => { groupFullName: 'g2/g2-2', groupId: 'group id', getOptionsKey: undefined!, + serverCapabilities: undefined, matches: undefined!, providerName: mssqlProviderName, options: {}, diff --git a/src/sql/workbench/services/objectExplorer/test/browser/dragAndDropController.test.ts b/src/sql/workbench/services/objectExplorer/test/browser/dragAndDropController.test.ts index 17bd29a7b3..e5feaffc6a 100644 --- a/src/sql/workbench/services/objectExplorer/test/browser/dragAndDropController.test.ts +++ b/src/sql/workbench/services/objectExplorer/test/browser/dragAndDropController.test.ts @@ -41,6 +41,7 @@ suite('SQL Drag And Drop Controller tests', () => { groupFullName: 'g2/g2-2', groupId: 'group id', getOptionsKey: undefined!, + serverCapabilities: undefined, matches: undefined!, providerName: mssqlProviderName, options: {}, @@ -59,6 +60,7 @@ suite('SQL Drag And Drop Controller tests', () => { groupFullName: 'g2/g2-2', groupId: 'group id', getOptionsKey: undefined!, + serverCapabilities: undefined, matches: undefined!, providerName: pgsqlProviderName, options: {}, diff --git a/src/sql/workbench/services/objectExplorer/test/browser/treeUpdateUtils.test.ts b/src/sql/workbench/services/objectExplorer/test/browser/treeUpdateUtils.test.ts index 0cf18a20d7..eb6b895bb7 100644 --- a/src/sql/workbench/services/objectExplorer/test/browser/treeUpdateUtils.test.ts +++ b/src/sql/workbench/services/objectExplorer/test/browser/treeUpdateUtils.test.ts @@ -83,6 +83,7 @@ suite('treeUpdateUtils alterConnection', () => { groupFullName: 'g3', groupId: 'g3', getOptionsKey: undefined!, + serverCapabilities: undefined, matches: undefined!, providerName: 'MSSQL', options: { testOption3: 'default', testOption2: '10' }, @@ -101,6 +102,7 @@ suite('treeUpdateUtils alterConnection', () => { groupFullName: 'g3', groupId: 'g3', getOptionsKey: undefined!, + serverCapabilities: undefined, matches: undefined!, providerName: 'MSSQL', options: { testOption3: 'nonDefault' }, @@ -135,6 +137,7 @@ suite('treeUpdateUtils alterConnection', () => { groupFullName: 'g3', groupId: 'g3', getOptionsKey: undefined!, + serverCapabilities: undefined, matches: undefined!, providerName: 'MSSQL', options: { testOption2: '15', testOption1: 'test string 1', testOption3: 'nonDefault' }, @@ -153,6 +156,7 @@ suite('treeUpdateUtils alterConnection', () => { groupFullName: 'g3', groupId: 'g3', getOptionsKey: undefined!, + serverCapabilities: undefined, matches: undefined!, providerName: 'MSSQL', options: { testOption2: '50', testOption1: 'test string 1', testOption3: 'nonDefault' }, @@ -171,6 +175,7 @@ suite('treeUpdateUtils alterConnection', () => { groupFullName: 'g3', groupId: 'g3', getOptionsKey: undefined!, + serverCapabilities: undefined, matches: undefined!, providerName: 'MSSQL', options: { testOption2: '15', testOption1: 'test string 2', testOption3: 'nonDefault' }, @@ -189,6 +194,7 @@ suite('treeUpdateUtils alterConnection', () => { groupFullName: 'g3', groupId: 'g3', getOptionsKey: undefined!, + serverCapabilities: undefined, matches: undefined!, providerName: 'MSSQL', options: { testOption2: '50', testOption1: 'test string 2', testOption3: 'nonDefault' }, @@ -207,6 +213,7 @@ suite('treeUpdateUtils alterConnection', () => { groupFullName: 'g3', groupId: 'g3', getOptionsKey: undefined!, + serverCapabilities: undefined, matches: undefined!, providerName: 'MSSQL', options: { testOption3: 'nonDefault' }, @@ -248,6 +255,7 @@ suite('treeUpdateUtils alterConnection', () => { groupFullName: 'g3', groupId: 'g3', getOptionsKey: undefined!, + serverCapabilities: undefined, matches: undefined!, providerName: 'MSSQL', options: {}, @@ -266,6 +274,7 @@ suite('treeUpdateUtils alterConnection', () => { groupFullName: 'g3-1', groupId: 'g3-1', getOptionsKey: undefined!, + serverCapabilities: undefined, matches: undefined!, providerName: 'MSSQL', options: {}, @@ -284,6 +293,7 @@ suite('treeUpdateUtils alterConnection', () => { groupFullName: 'g3-2', groupId: 'g3-2', getOptionsKey: undefined!, + serverCapabilities: undefined, matches: undefined!, providerName: 'MSSQL', options: {}, @@ -328,6 +338,7 @@ suite('treeUpdateUtils alterConnection', () => { groupFullName: 'g3', groupId: 'g3', getOptionsKey: undefined!, + serverCapabilities: undefined, matches: undefined!, providerName: 'MSSQL', options: { testOption1: 'value1' }, @@ -346,6 +357,7 @@ suite('treeUpdateUtils alterConnection', () => { groupFullName: 'g3', groupId: 'g3', getOptionsKey: undefined!, + serverCapabilities: undefined, matches: undefined!, providerName: 'MSSQL', options: { testOption1: 'value2' }, @@ -364,6 +376,7 @@ suite('treeUpdateUtils alterConnection', () => { groupFullName: 'g3-1', groupId: 'g3-1', getOptionsKey: undefined!, + serverCapabilities: undefined, matches: undefined!, providerName: 'MSSQL', options: {}, @@ -404,6 +417,7 @@ suite('treeUpdateUtils alterConnection', () => { groupFullName: 'g3', groupId: 'g3', getOptionsKey: undefined!, + serverCapabilities: undefined, matches: undefined!, providerName: 'MSSQL', options: {}, @@ -422,6 +436,7 @@ suite('treeUpdateUtils alterConnection', () => { groupFullName: 'g3', groupId: 'g3', getOptionsKey: undefined!, + serverCapabilities: undefined, matches: undefined!, providerName: 'MSSQL', options: { testOption1: 'value1', testOption2: '15' }, @@ -456,6 +471,7 @@ suite('treeUpdateUtils alterConnection', () => { groupFullName: 'g3', groupId: 'g3', getOptionsKey: undefined!, + serverCapabilities: undefined, matches: undefined!, providerName: 'MSSQL', options: { testOption1: 'value1', testOption2: '15' }, @@ -474,6 +490,7 @@ suite('treeUpdateUtils alterConnection', () => { groupFullName: 'g3', groupId: 'g3', getOptionsKey: undefined!, + serverCapabilities: undefined, matches: undefined!, providerName: 'MSSQL', options: { testOption1: 'value2', testOption2: '30' }, @@ -541,6 +558,7 @@ suite('treeUpdateUtils alterConnection', () => { groupFullName: 'g3a', groupId: 'g3a', getOptionsKey: undefined!, + serverCapabilities: undefined, matches: undefined!, providerName: 'MSSQL', options: {}, @@ -559,6 +577,7 @@ suite('treeUpdateUtils alterConnection', () => { groupFullName: 'g3a', groupId: 'g3a', getOptionsKey: undefined!, + serverCapabilities: undefined, matches: undefined!, providerName: 'MSSQL', options: { testOption1: 'value2', testOption2: '30' }, diff --git a/src/sql/workbench/services/resourceProvider/test/browser/firewallRuleDialogController.test.ts b/src/sql/workbench/services/resourceProvider/test/browser/firewallRuleDialogController.test.ts index 64e1e0d8a3..52ebf70af0 100644 --- a/src/sql/workbench/services/resourceProvider/test/browser/firewallRuleDialogController.test.ts +++ b/src/sql/workbench/services/resourceProvider/test/browser/firewallRuleDialogController.test.ts @@ -89,6 +89,7 @@ suite('Firewall rule dialog controller tests', () => { groupFullName: 'g2/g2-2', groupId: 'group id', getOptionsKey: () => '', + serverCapabilities: undefined, matches: () => false, providerName: mssqlProviderName, options: {},