Improved TDS Endpoint support

MarkMpn · Jan 28, 2022 · 51b1066 · 51b1066
1 parent 9d1d8c9
commit 51b1066
Show file tree

Hide file tree

Showing 5 changed files with 71 additions and 4 deletions.
diff --git a/MarkMpn.Sql4Cds.Engine/Ado/Sql4CdsCommand.cs b/MarkMpn.Sql4Cds.Engine/Ado/Sql4CdsCommand.cs
@@ -126,6 +126,9 @@ public override void Prepare()
             if (_plan != null)
                 return;
 
+            if (_connection.Options.UseTDSEndpoint)
+                _planBuilder.TDSEndpointAvailable = _connection.TDSEndpointEnabled;
+
             _plan = _planBuilder.Build(CommandText, ((Sql4CdsParameterCollection)Parameters).GetParameterTypes());
         }
 

diff --git a/MarkMpn.Sql4Cds.Engine/Ado/Sql4CdsConnection.cs b/MarkMpn.Sql4Cds.Engine/Ado/Sql4CdsConnection.cs
@@ -191,5 +191,21 @@ protected override DbCommand CreateDbCommand()
         {
             return new Sql4CdsCommand(this);
         }
+
+        public bool TDSEndpointEnabled
+        {
+            get
+            {
+#if NETCOREAPP
+                if (!(DataSources[Database].Connection is ServiceClient svc))
+                    return false;
+#else
+                if (!(DataSources[Database].Connection is CrmServiceClient svc))
+                    return false;
+#endif
+
+                return TSqlEndpoint.IsEnabled(svc);
+            }
+        }
     }
 }
diff --git a/MarkMpn.Sql4Cds.Engine/ExecutionPlan/SqlNode.cs b/MarkMpn.Sql4Cds.Engine/ExecutionPlan/SqlNode.cs
@@ -84,6 +84,23 @@ public DataTable Execute(IDictionary<string, DataSource> dataSources, IQueryExec
                     {
                         cmd.CommandTimeout = (int)TimeSpan.FromMinutes(2).TotalSeconds;
                         cmd.CommandText = Sql;
+
+                        foreach (var paramValue in parameterValues)
+                        {
+                            if (paramValue.Key.StartsWith("@@"))
+                                continue;
+
+                            var param = cmd.CreateParameter();
+                            param.ParameterName = paramValue.Key;
+
+                            if (paramValue.Value is SqlEntityReference er)
+                                param.Value = (SqlGuid)er;
+                            else
+                                param.Value = paramValue.Value;
+
+                            cmd.Parameters.Add(param);
+                        }
+
                         var result = new DataTable();
 
                         using (var adapter = new SqlDataAdapter(cmd))

diff --git a/MarkMpn.Sql4Cds.Engine/TSqlEndpoint.cs b/MarkMpn.Sql4Cds.Engine/TSqlEndpoint.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Xml;
 using Microsoft.Xrm.Sdk.Query;
+using System.Net.Sockets;
 #if NETCOREAPP
 using Microsoft.PowerPlatform.Dataverse.Client;
 #else
@@ -13,7 +14,7 @@ namespace MarkMpn.Sql4Cds.Engine
 {
     public static class TSqlEndpoint
     {
-        private static IDictionary<string, bool> _cache = new Dictionary<string, bool>();
+        private static readonly IDictionary<string, bool> _cache = new Dictionary<string, bool>();
 
 #if NETCOREAPP
         public static bool IsEnabled(ServiceClient svc)
@@ -36,7 +37,7 @@ public static bool IsEnabled(CrmServiceClient svc)
 
             if (String.IsNullOrEmpty(orgSettings))
             {
-                enabled = false;
+                enabled = TestConnection(svc);
             }
             else
             {
@@ -45,14 +46,44 @@ public static bool IsEnabled(CrmServiceClient svc)
 
                 var enabledNode = xml.SelectSingleNode("//EnableTDSEndpoint/text()");
 
-                enabled = enabledNode?.Value == "true";
+                if (enabledNode != null)
+                    enabled = enabledNode.Value == "true";
+                else
+                    enabled = TestConnection(svc);
             }
 
             _cache[host] = enabled;
 
             return enabled;
         }
 
+#if NETCOREAPP
+        private static bool TestConnection(ServiceClient svc)
+#else
+        private static bool TestConnection(CrmServiceClient svc)
+#endif
+        {
+            var socket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
+
+#if NETCOREAPP
+            var result = socket.BeginConnect(svc.ConnectedOrgUriActual.Host, 1433, null, null);
+#else
+            var result = socket.BeginConnect(svc.CrmConnectOrgUriActual.Host, 1433, null, null);
+#endif
+            var success = result.AsyncWaitHandle.WaitOne(1000, true);
+
+            if (socket.Connected)
+            {
+                socket.EndConnect(result);
+                return true;
+            }
+            else
+            {
+                socket.Close();
+                return false;
+            }
+        }
+
 #if NETCOREAPP
         public static void Enable(ServiceClient svc)
 #else

diff --git a/MarkMpn.Sql4Cds.SSMS/DmlExecute.cs b/MarkMpn.Sql4Cds.SSMS/DmlExecute.cs
@@ -142,7 +142,7 @@ private void OnExecuteQuery(string Guid, int ID, object CustomIn, object CustomO
                         try
                         {
                             _ai.TrackEvent("Execute", new Dictionary<string, string> { ["QueryType"] = query.GetType().Name, ["Source"] = "SSMS" });
-                            var msg = query.Execute(new Dictionary<string, DataSource>(StringComparer.OrdinalIgnoreCase) { [dataSource.Name] = dataSource }, options, null, null);
+                            var msg = query.Execute(new Dictionary<string, DataSource>(StringComparer.OrdinalIgnoreCase) { [dataSource.Name] = dataSource }, options, null, null, out _);
 
                             sqlScriptEditorControl.Results.AddStringToMessages(msg + "\r\n\r\n");