closing the default connections that are opned just for validating the connections. Added the feature to application name in the connection (#483)

src/Microsoft.SqlTools.ServiceLayer/Connection/ConnectionService.cs

@@ -75,7 +75,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection
         {
             get
             {
-                return this.ownerToConnectionMap;   
+                return this.ownerToConnectionMap;
             }
         }
 
@@ -264,6 +264,9 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection
                 return validationResults;
             }
 
+            TrySetConnectionType(connectionParams);
+
+            connectionParams.Connection.ApplicationName = GetApplicationNameWithFeature(connectionParams.Connection.ApplicationName, connectionParams.Type);
             // If there is no ConnectionInfo in the map, create a new ConnectionInfo, 
             // but wait until later when we are connected to add it to the map.
             ConnectionInfo connectionInfo;
@@ -305,16 +308,63 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection
             // Invoke callback notifications          
             InvokeOnConnectionActivities(connectionInfo, connectionParams);
 
-            if(connectionParams.Type == ConnectionType.ObjectExplorer)
+            TryCloseConnectionTemporaryConnection(connectionParams, connectionInfo);
+
+            return completeParams;
+        }
+
+        private void TryCloseConnectionTemporaryConnection(ConnectParams connectionParams, ConnectionInfo connectionInfo)
+        {
+            try
             {
-                DbConnection connection;
-                if (connectionInfo.TryGetConnection(ConnectionType.ObjectExplorer, out connection))
+                if (connectionParams.Type == ConnectionType.ObjectExplorer || connectionParams.Type == ConnectionType.Dashboard || connectionParams.Type == ConnectionType.ConnectionValidation)
                 {
-                    // OE doesn't need to keep the connection open
-                    connection.Close();
+                    DbConnection connection;
+                    string type = connectionParams.Type;
+                    if (connectionInfo.TryGetConnection(type, out connection))
+                    {
+                        // OE doesn't need to keep the connection open
+                        connection.Close();
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                Logger.Write(LogLevel.Normal, "Failed to close temporary connections. error: " + ex.Message);
+            }
+        }
+
+        private static string GetApplicationNameWithFeature(string applicationName, string featureName)
+        {
+            string appNameWithFeature = applicationName;
+
+            if (!string.IsNullOrWhiteSpace(applicationName) && !string.IsNullOrWhiteSpace(featureName))
+            {
+                int index = applicationName.IndexOf('-');
+                string appName = applicationName;
+                if (index > 0)
+                {
+                    appName = applicationName.Substring(0, index - 1);
+                }
+                appNameWithFeature = $"{appName}-{featureName}";
+            }
+
+            return appNameWithFeature;
+        }
+
+        private void TrySetConnectionType(ConnectParams connectionParams)
+        {
+            if (connectionParams != null && connectionParams.Type == ConnectionType.Default && !string.IsNullOrWhiteSpace(connectionParams.OwnerUri))
+            {
+                if (connectionParams.OwnerUri.ToLowerInvariant().StartsWith("dashboard://"))
+                {
+                    connectionParams.Type = ConnectionType.Dashboard;
+                }
+                else if (connectionParams.OwnerUri.ToLowerInvariant().StartsWith("connection://"))
+                {
+                    connectionParams.Type = ConnectionType.ConnectionValidation;
                 }
             }
-            return completeParams;
         }
 
         private bool IsConnectionChanged(ConnectParams connectionParams, ConnectionInfo connectionInfo)
@@ -1159,7 +1209,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection
         /// </summary>
         private void InvokeOnConnectionActivities(ConnectionInfo connectionInfo, ConnectParams connectParams)
         {
-            if (connectParams.Type != ConnectionType.Default)
+            if (connectParams.Type != ConnectionType.Default && connectParams.Type != ConnectionType.ConnectionValidation)
             {
                 return;
             }
@@ -1219,7 +1269,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection
         /// Note: we need to audit all uses of this method to determine why we're
         /// bypassing normal ConnectionService connection management
         /// </summary>
-        internal static SqlConnection OpenSqlConnection(ConnectionInfo connInfo)
+        internal static SqlConnection OpenSqlConnection(ConnectionInfo connInfo, string featureName = null)
         {
             try
             {
@@ -1234,6 +1284,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection
                 connInfo.ConnectionDetails.PersistSecurityInfo = true;
                 // turn off connection pool to avoid hold locks on server resources after calling SqlConnection Close method
                 connInfo.ConnectionDetails.Pooling = false;
+                connInfo.ConnectionDetails.ApplicationName = GetApplicationNameWithFeature(connInfo.ConnectionDetails.ApplicationName, featureName);
 
                 // generate connection string
                 string connectionString = ConnectionService.BuildConnectionString(connInfo.ConnectionDetails);

src/Microsoft.SqlTools.ServiceLayer/Connection/ConnectionType.cs

@@ -17,5 +17,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection
         public const string Query = "Query";
         public const string Edit = "Edit";
         public const string ObjectExplorer = "ObjectExplorer";
+        public const string Dashboard = "Dashboard";
+        public const string ConnectionValidation = "ConnectionValidation";
     }
 }

src/Microsoft.SqlTools.ServiceLayer/Connection/DatabaseLocksManager.cs

@@ -31,7 +31,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection
 
         private Dictionary<string, ManualResetEvent> databaseAccessEvents = new Dictionary<string, ManualResetEvent>();
         private object databaseAccessLock = new object();
-        public const int DefaultWaitToGetFullAccess = 60000;
+        public const int DefaultWaitToGetFullAccess = 10000;
         public int waitToGetFullAccess = DefaultWaitToGetFullAccess;
 
         private ManualResetEvent GetResetEvent(string serverName, string databaseName)
@@ -53,6 +53,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection
         public bool GainFullAccessToDatabase(string serverName, string databaseName)
         {
             /*
+             * TODO: add the lock so not two process can get full access at the same time
             ManualResetEvent resetEvent = GetResetEvent(serverName, databaseName);
             if (resetEvent.WaitOne(this.waitToGetFullAccess))
             {
@@ -71,7 +72,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection
             */
             foreach (IConnectedBindingQueue item in ConnectionService.ConnectedQueues)
             {
-                item.CloseConnections(serverName, databaseName);
+                item.CloseConnections(serverName, databaseName, DefaultWaitToGetFullAccess);
             }
             return true;
 
@@ -91,7 +92,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection
             */
             foreach (IConnectedBindingQueue item in ConnectionService.ConnectedQueues)
             {
-                item.OpenConnections(serverName, databaseName);
+                item.OpenConnections(serverName, databaseName, DefaultWaitToGetFullAccess);
             }
             return true;