ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-27 17:23:21 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix a memory leak on listener (#10294)

Browse Source 
* Fix leak

* We don't need the full connection profiles for drag drop control

* Remove unused code

* Change test definition

* Change test definition

* Change equality check
This commit is contained in:
Amir Omidi
2020-06-16 19:36:10 -07:00
committed by GitHub
parent fb4e400919
commit 21fd8b22e7
2 changed files with 38 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/sql/platform/connection/common/connectionConfig.ts
View File

@@ -183,12 +183,7 @@ export class ConnectionConfig {
return changed;
}
/**
* Get a list of all connections in the connection config. Connections returned
* are sorted first by whether they were found in the user/workspace settings,
* and next alphabetically by profile/server name.
*/
public getConnections(getWorkspaceConnections: boolean): ConnectionProfile[] {
public getIConnectionProfileStores(getWorkspaceConnections: boolean): IConnectionProfileStore[] {
let profiles: IConnectionProfileStore[] = [];
//TODO: have to figure out how to sort connections for all provider
// Read from user settings
@@ -207,7 +202,16 @@ export class ConnectionConfig {
}
}
let connectionProfiles = profiles.map(p => {
return profiles;
}
/**
* Get a list of all connections in the connection config. Connections returned
* are sorted first by whether they were found in the user/workspace settings,
* and next alphabetically by profile/server name.
*/
public getConnections(getWorkspaceConnections: boolean): ConnectionProfile[] {
let connectionProfiles = this.getIConnectionProfileStores(getWorkspaceConnections).map(p => {
return ConnectionProfile.createFromStoredProfile(p, this._capabilitiesService);
});
@@ -277,9 +281,14 @@ export class ConnectionConfig {
* Returns true if connection can be moved to another group
*/
public canChangeConnectionConfig(profile: ConnectionProfile, newGroupID: string): boolean {
let profiles = this.getConnections(true);
let existingProfile = find(profiles, p => p.getConnectionInfoId() === profile.getConnectionInfoId()
&& p.groupId === newGroupID);
let profiles = this.getIConnectionProfileStores(true);
let existingProfile = find(profiles, p =>
p.providerName === profile.providerName &&
p.options.authenticationType === profile.options.authenticationType &&
p.options.database === profile.options.database &&
p.options.server === profile.options.server &&
p.options.user === profile.options.user &&
p.groupId === newGroupID);
return existingProfile === undefined;
}
@@ -295,8 +304,7 @@ export class ConnectionConfig {
profiles.push(ConnectionProfile.convertToProfileStore(this._capabilitiesService, profile));
} else {
profiles.forEach((value) => {
let configProf = ConnectionProfile.createFromStoredProfile(value, this._capabilitiesService);
if (configProf.getOptionsKey() === profile.getOptionsKey()) {
if (value.id === profile.id) {
value.groupId = newGroupID;
}
});