ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-22 09:35:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix IConnectionProfile to have same options key when generated from ConnectionProfile (#22840)

Browse Source
This commit is contained in:
Charles Gagnon
2023-04-25 09:52:51 -07:00
committed by GitHub
parent a887bb199e
commit 64dd4f0904
15 changed files with 71 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/sql/workbench/services/objectExplorer/browser/treeUpdateUtils.ts
View File

@@ -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);

1
src/sql/workbench/services/objectExplorer/test/browser/asyncServerTreeDragAndDrop.test.ts
View File

@@ -36,6 +36,7 @@ suite('AsyncServerTreeDragAndDrop', () => {
groupFullName: 'g2/g2-2',
groupId: 'group id',
getOptionsKey: undefined!,
serverCapabilities: undefined,
matches: undefined!,
providerName: mssqlProviderName,
options: {},

2
src/sql/workbench/services/objectExplorer/test/browser/dragAndDropController.test.ts
View File

@@ -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: {},

19
src/sql/workbench/services/objectExplorer/test/browser/treeUpdateUtils.test.ts
View File

@@ -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' },