ckaczor/sqltoolsservice
1
0
Fork 0
mirror of https://github.com/ckaczor/sqltoolsservice.git synced 2026-01-24 01:25:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Added inner exceptions on connection failure and fixed a param validation bug

Browse Source
This commit is contained in:
Mitchell Sternke
2016-08-22 16:26:02 -07:00
parent 4631f2083e
commit 14399ede65
3 changed files with 31 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -143,7 +143,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection
}
catch(Exception ex)
{
response.Messages = ex.Message;
response.Messages = ex.ToString();
return response;
}
@@ -241,7 +241,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection
}
catch(Exception ex)
{
await requestContext.SendError(ex.Message);
await requestContext.SendError(ex.ToString());
}
}
@@ -261,7 +261,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection
}
catch(Exception ex)
{
await requestContext.SendError(ex.Message);
await requestContext.SendError(ex.ToString());
}
}
@@ -285,7 +285,10 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection
connectionBuilder["Integrated Security"] = false;
connectionBuilder["User Id"] = connectionDetails.UserName;
connectionBuilder["Password"] = connectionDetails.Password;
connectionBuilder["Initial Catalog"] = connectionDetails.DatabaseName;
if( !String.IsNullOrEmpty(connectionDetails.DatabaseName) )
{
connectionBuilder["Initial Catalog"] = connectionDetails.DatabaseName;
}
return connectionBuilder.ToString();
}
}

1
src/Microsoft.SqlTools.ServiceLayer/Connection/Contracts/ConnectParamsExtensions.cs
View File

@@ -20,7 +20,6 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection.Contracts
return !(
String.IsNullOrEmpty(parameters.OwnerUri) ||
parameters.Connection == null ||
String.IsNullOrEmpty(parameters.Connection.DatabaseName) ||
String.IsNullOrEmpty(parameters.Connection.Password) ||
String.IsNullOrEmpty(parameters.Connection.ServerName) ||
String.IsNullOrEmpty(parameters.Connection.UserName)