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

Restore new connection string for multiple similar connections (#2067)

Browse Source
This commit is contained in:
Alex Ma
2023-06-15 23:31:40 -07:00
committed by GitHub
parent cef3564011
commit 6fe0b300e5
5 changed files with 79 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/Microsoft.SqlTools.ServiceLayer/Connection/ConnectionService.cs
View File

@@ -1044,7 +1044,29 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection
{
try
{
connection.Close();
bool disconnect = false;
if (connection.ConnectionString != null){
int totalCount = 0;
foreach (KeyValuePair<string, ConnectionInfo> entry in OwnerToConnectionMap)
{
foreach (DbConnection value in entry.Value.AllConnections) {
if(value.ConnectionString == connection.ConnectionString) {
totalCount++;
}
}
}
if(totalCount == 1) {
disconnect = true;
}
}
else {
disconnect = true;
}
if(disconnect) {
connection.Close();
}
}
catch (Exception)
{

15
src/Microsoft.SqlTools.ServiceLayer/Connection/Contracts/ConnectionDetails.cs
View File

@@ -586,6 +586,21 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection.Contracts
}
}
/// <summary>
/// Gets or sets the connection name
/// </summary>
public string ConnectionName
{
get
{
return GetOptionValue<string>("connectionName");
}
set
{
SetOptionValue("connectionName", value);
}
}
/// <summary>
/// Gets or sets the database display name
/// </summary>

34
src/Microsoft.SqlTools.ServiceLayer/LanguageServices/ConnectedBindingQueue.cs
View File

@@ -6,6 +6,7 @@
#nullable disable
using System;
using System.Collections.Generic;
using Microsoft.SqlServer.Management.Common;
using Microsoft.SqlServer.Management.SmoMetadataProvider;
using Microsoft.SqlServer.Management.SqlParser.Binder;
@@ -108,6 +109,39 @@ namespace Microsoft.SqlTools.ServiceLayer.LanguageServices
key += "_" + details.GroupId;
}
if (!string.IsNullOrEmpty(details.ConnectionName))
{
key += "_" + details.ConnectionName;
}
// Additional properties that are used to distinguish the connection (besides password)
// These are so that multiple connections can connect to the same target, with different settings.
foreach (KeyValuePair<string, object> entry in details.Options)
{
// Filter out properties we already have or don't want (password)
if (entry.Key != "server" && entry.Key != "database" && entry.Key != "user"
&& entry.Key != "authenticationType" && entry.Key != "databaseDisplayName"
&& entry.Key != "groupId" && entry.Key != "password" && entry.Key != "connectionName")
{
// Boolean values are explicitly labeled true or false instead of undefined.
if (entry.Value is bool)
{
if ((bool)entry.Value)
{
key += "_" + entry.Key + ":true";
}
else
{
key += "_" + entry.Key + ":false";
}
}
else if (!string.IsNullOrEmpty(entry.Value as String))
{
key += "_" + entry.Key + ":" + entry.Value;
}
}
}
return Uri.EscapeUriString(key);
}

7
src/Microsoft.SqlTools.ServiceLayer/TableDesigner/TableDesignerService.cs
View File

@@ -1833,9 +1833,14 @@ namespace Microsoft.SqlTools.ServiceLayer.TableDesigner
private void UpdateTableTitleInfo(TableInfo tableInfo)
{
var td = GetTableDesigner(tableInfo);
var advancedOpsIndex = tableInfo.Tooltip.LastIndexOf('[');
var advancedOps = "";
if(advancedOpsIndex > -1){
advancedOps = " " + tableInfo.Tooltip.Substring(advancedOpsIndex);
}
tableInfo.Title = td.TableViewModel.FullName;
var tableParent = tableInfo.Server == null ? tableInfo.ProjectFilePath : string.Format("{0} - {1}", tableInfo.Server, tableInfo.Database);
tableInfo.Tooltip = string.Format("{0} - {1}", tableParent, tableInfo.Title);
tableInfo.Tooltip = string.Format("{0} - {1}{2}", tableParent, tableInfo.Title, advancedOps);
}
private Dictionary<string, string> GetMetadata(TableInfo tableInfo)

2
test/Microsoft.SqlTools.ServiceLayer.UnitTests/ObjectExplorer/ObjectExplorerServiceTests.cs
View File

@@ -57,7 +57,7 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.ObjectExplorer
ConnectedBindingContext connectedBindingContext = new ConnectedBindingContext();
connectedBindingContext.ServerConnection = new ServerConnection(new SqlConnection(fakeConnectionString));
connectedBindingQueue = new ConnectedBindingQueue(false);
connectedBindingQueue.BindingContextMap.Add($"{details.ServerName}_{details.DatabaseName}_{details.UserName}_NULL", connectedBindingContext);
connectedBindingQueue.BindingContextMap.Add($"{details.ServerName}_{details.DatabaseName}_{details.UserName}_NULL_persistSecurityInfo:true", connectedBindingContext);
connectedBindingQueue.BindingContextTasks.Add(connectedBindingContext, Task.Run(() => null));
mockConnectionOpener = new Mock<SqlConnectionOpener>();
connectedBindingQueue.SetConnectionOpener(mockConnectionOpener.Object);