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

Reverting Connection URI related changes for stable release (#2042)

Browse Source
This commit is contained in:
Cheena Malhotra
2023-05-05 10:11:54 -07:00
committed by GitHub
parent ddb3ec2bdb
commit 1b5f774741
4 changed files with 10 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -586,21 +586,6 @@ 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>

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

@@ -6,7 +6,6 @@
#nullable disable
using System;
using System.Collections.Generic;
using Microsoft.SqlServer.Management.Common;
using Microsoft.SqlServer.Management.SmoMetadataProvider;
using Microsoft.SqlServer.Management.SqlParser.Binder;
@@ -71,7 +70,7 @@ namespace Microsoft.SqlTools.ServiceLayer.LanguageServices
public ConnectedBindingQueue()
: this(true)
{
{
}
public ConnectedBindingQueue(bool needsMetadata)
@@ -91,7 +90,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",
@@ -109,39 +108,6 @@ 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);
}
@@ -154,7 +120,7 @@ namespace Microsoft.SqlTools.ServiceLayer.LanguageServices
return string.Format("{0}_{1}",
serverName ?? "NULL",
databaseName ?? "NULL");
}
public void CloseConnections(string serverName, string databaseName, int millisecondsTimeout)
@@ -232,7 +198,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);
@@ -244,19 +210,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;

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

@@ -1831,14 +1831,9 @@ 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}{2}", tableParent, tableInfo.Title, advancedOps);
tableInfo.Tooltip = string.Format("{0} - {1}", tableParent, tableInfo.Title);
}
private Dictionary<string, string> GetMetadata(TableInfo tableInfo)

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

@@ -56,7 +56,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_persistSecurityInfo:true", connectedBindingContext);
connectedBindingQueue.BindingContextMap.Add($"{details.ServerName}_{details.DatabaseName}_{details.UserName}_NULL", connectedBindingContext);
connectedBindingQueue.BindingContextTasks.Add(connectedBindingContext, Task.Run(() => null));
mockConnectionOpener = new Mock<SqlConnectionOpener>();
connectedBindingQueue.SetConnectionOpener(mockConnectionOpener.Object);