ckaczor/sqltoolsservice
1
0
Fork 0
mirror of https://github.com/ckaczor/sqltoolsservice.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add more specific URI strings to Object Explorer (#1881)

Browse Source 
* Added all non null properties to URI generator

* Added all options to URI for session

* added documentation comments

* added generated nodeTypes file

* added updated uri to connection store

* Added debug message for integrated test failure

* Revert "Added debug message for integrated test failure"

This reverts commit 026c53d1ed3fb16b0f37b7b6e0775402a2ef9281.

* added advanced options to table designer table

* removed connectionName from uri generation

* Revert "removed connectionName from uri generation"

This reverts commit 88eedbbc593a0279872edc6d4cbd1b7ca3d72ad0.

* added connectionname to connection details

* added connection name to near front of key
This commit is contained in:
Alex Ma
2023-04-17 14:24:12 -07:00
committed by GitHub
parent c15108808f
commit add216cc1e
4 changed files with 61 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
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;
@@ -70,7 +71,7 @@ namespace Microsoft.SqlTools.ServiceLayer.LanguageServices
public ConnectedBindingQueue()
: this(true)
{
{
}
public ConnectedBindingQueue(bool needsMetadata)
@@ -90,7 +91,7 @@ namespace Microsoft.SqlTools.ServiceLayer.LanguageServices
/// </summary>
/// <param name="connInfo"></param>
internal static string GetConnectionContextKey(ConnectionDetails details)
{
{
string key = string.Format("{0}_{1}_{2}_{3}",
details.ServerName ?? "NULL",
details.DatabaseName ?? "NULL",
@@ -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);
}
@@ -120,7 +154,7 @@ namespace Microsoft.SqlTools.ServiceLayer.LanguageServices
return string.Format("{0}_{1}",
serverName ?? "NULL",
databaseName ?? "NULL");
}
public void CloseConnections(string serverName, string databaseName, int millisecondsTimeout)
@@ -198,7 +232,7 @@ namespace Microsoft.SqlTools.ServiceLayer.LanguageServices
try
{
bindingContext.BindingLock.Reset();
// populate the binding context to work with the SMO metadata provider
bindingContext.ServerConnection = connectionOpener.OpenServerConnection(connInfo, featureName);
@@ -210,19 +244,19 @@ namespace Microsoft.SqlTools.ServiceLayer.LanguageServices
this.CurrentSettings.SqlTools.IntelliSense.LowerCaseSuggestions.Value
? CasingStyle.Lowercase : CasingStyle.Uppercase;
bindingContext.Binder = BinderProvider.CreateBinder(bindingContext.SmoMetadataProvider);
}
}
bindingContext.BindingTimeout = ConnectedBindingQueue.DefaultBindingTimeout;
bindingContext.IsConnected = true;
}
catch (Exception)
{
bindingContext.IsConnected = false;
}
}
finally
{
bindingContext.BindingLock.Set();
}
}
}
return connectionKey;