Add getOptionKeyIdNames to IConnectionProfile (#23262) (#23268)

microsoft · May 31, 2023 · cdf76a9 · cdf76a9
1 parent a3fc0eb
commit cdf76a9
Show file tree

Hide file tree

Showing 12 changed files with 23 additions and 0 deletions.
diff --git a/src/sql/platform/connection/common/connectionProfile.ts b/src/sql/platform/connection/common/connectionProfile.ts
@@ -254,6 +254,7 @@ export class ConnectionProfile extends ProviderConnectionInfo implements interfa
 			databaseName: this.databaseName,
 			authenticationType: this.authenticationType,
 			getOptionsKey: this.getOptionsKey,
+			getOptionKeyIdNames: this.getOptionKeyIdNames,
 			matches: this.matches,
 			groupId: this.groupId,
 			groupFullName: this.groupFullName,

diff --git a/src/sql/platform/connection/common/interfaces.ts b/src/sql/platform/connection/common/interfaces.ts
@@ -10,6 +10,7 @@ export type ProfileMatcher = (a: IConnectionProfile, b: IConnectionProfile) => b
 
 export interface IConnectionProfile extends azdata.IConnectionProfile {
 	getOptionsKey(): string;
+	getOptionKeyIdNames(): string[];
 	matches(profile: azdata.IConnectionProfile): boolean;
 }
 

diff --git a/src/sql/platform/connection/test/common/connectionConfig.test.ts b/src/sql/platform/connection/test/common/connectionConfig.test.ts
@@ -277,6 +277,7 @@ suite('ConnectionConfig', () => {
 			groupFullName: undefined,
 			groupId: undefined,
 			getOptionsKey: undefined!,
+			getOptionKeyIdNames: undefined!,
 			matches: undefined!,
 			providerName: 'MSSQL',
 			options: {},
@@ -309,6 +310,7 @@ suite('ConnectionConfig', () => {
 			savePassword: true,
 			groupFullName: undefined,
 			getOptionsKey: undefined!,
+			getOptionKeyIdNames: undefined!,
 			matches: undefined!,
 			providerName: 'MSSQL',
 			options: {},
@@ -341,6 +343,7 @@ suite('ConnectionConfig', () => {
 			groupFullName: 'g2/g2-2',
 			groupId: undefined,
 			getOptionsKey: undefined!,
+			getOptionKeyIdNames: undefined!,
 			matches: undefined!,
 			providerName: 'MSSQL',
 			options: {},
@@ -484,6 +487,7 @@ suite('ConnectionConfig', () => {
 			groupFullName: 'g3',
 			groupId: 'g3',
 			getOptionsKey: undefined!,
+			getOptionKeyIdNames: undefined!,
 			matches: undefined!,
 			providerName: 'MSSQL',
 			options: {},
@@ -514,6 +518,7 @@ suite('ConnectionConfig', () => {
 			groupFullName: 'g3',
 			groupId: 'g3',
 			getOptionsKey: undefined!,
+			getOptionKeyIdNames: undefined!,
 			matches: undefined!,
 			providerName: 'MSSQL',
 			options: {},
@@ -551,6 +556,7 @@ suite('ConnectionConfig', () => {
 			groupFullName: 'g3',
 			groupId: 'newid',
 			getOptionsKey: undefined!,
+			getOptionKeyIdNames: undefined!,
 			matches: undefined!,
 			providerName: 'MSSQL',
 			options: {},
@@ -631,6 +637,7 @@ suite('ConnectionConfig', () => {
 			groupFullName: 'g3',
 			groupId: 'g3',
 			getOptionsKey: () => { return 'connectionId'; },
+			getOptionKeyIdNames: undefined!,
 			matches: undefined!,
 			providerName: 'MSSQL',
 			options: {},
@@ -648,6 +655,7 @@ suite('ConnectionConfig', () => {
 			groupFullName: 'test',
 			groupId: 'test',
 			getOptionsKey: () => { return 'connectionId'; },
+			getOptionKeyIdNames: undefined!,
 			matches: undefined!,
 			providerName: 'MSSQL',
 			options: {},
@@ -688,6 +696,7 @@ suite('ConnectionConfig', () => {
 			groupFullName: 'g3',
 			groupId: 'g3',
 			getOptionsKey: () => { return 'connectionId'; },
+			getOptionKeyIdNames: 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
@@ -26,6 +26,7 @@ suite('SQL ConnectionProfileInfo tests', () => {
 		groupFullName: 'g2/g2-2',
 		groupId: 'group id',
 		getOptionsKey: undefined!,
+		getOptionKeyIdNames: undefined!,
 		matches: undefined!,
 		providerName: mssqlProviderName,
 		options: {},

diff --git 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!,
+		getOptionKeyIdNames: 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
@@ -25,6 +25,7 @@ suite('SQL ProviderConnectionInfo tests', () => {
 		groupFullName: 'g2/g2-2',
 		groupId: undefined,
 		getOptionsKey: undefined!,
+		getOptionKeyIdNames: 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
@@ -27,6 +27,7 @@ let connectionProfile: IConnectionProfile = {
 	groupFullName: 'g2/g2-2',
 	groupId: 'group id',
 	getOptionsKey: () => 'connection1',
+	getOptionKeyIdNames: undefined!,
 	matches: undefined!,
 	providerName: mssqlProviderName,
 	options: {},
@@ -44,6 +45,7 @@ let editorConnectionProfile: IConnectionProfile = {
 	groupFullName: 'g2/g2-2',
 	groupId: 'group id',
 	getOptionsKey: () => 'connection2',
+	getOptionKeyIdNames: undefined!,
 	matches: undefined!,
 	providerName: mssqlProviderName,
 	options: {},
@@ -61,6 +63,7 @@ let connectionProfileWithoutDbName: IConnectionProfile = {
 	groupFullName: 'g2/g2-2',
 	groupId: 'group id',
 	getOptionsKey: () => 'connection1',
+	getOptionKeyIdNames: 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
@@ -68,6 +68,7 @@ suite('SQL ConnectionManagementService tests', () => {
 		groupFullName: 'g2/g2-2',
 		groupId: 'group id',
 		getOptionsKey: () => { return 'connectionId'; },
+		getOptionKeyIdNames: 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
@@ -75,6 +75,7 @@ suite('Insights Dialog Controller Tests', () => {
 			groupFullName: '',
 			groupId: '',
 			getOptionsKey: () => '',
+			getOptionKeyIdNames: undefined!,
 			matches: undefined,
 			providerName: '',
 			saveProfile: true,

diff --git 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!,
+		getOptionKeyIdNames: 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
@@ -41,6 +41,7 @@ suite('SQL Drag And Drop Controller tests', () => {
 		groupFullName: 'g2/g2-2',
 		groupId: 'group id',
 		getOptionsKey: undefined!,
+		getOptionKeyIdNames: 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!,
+		getOptionKeyIdNames: undefined!,
 		matches: undefined!,
 		providerName: pgsqlProviderName,
 		options: {},

diff --git a/...sql/workbench/services/resourceProvider/test/browser/firewallRuleDialogController.test.ts b/...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: () => '',
+			getOptionKeyIdNames: undefined!,
 			matches: () => false,
 			providerName: mssqlProviderName,
 			options: {},