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

Merge branch 'dev' into feature/listDatabases

Browse Source
This commit is contained in:
Mitchell Sternke
2016-08-25 16:52:35 -07:00
parent b4df9de238 02518e022e
commit 015bb26d9a
26 changed files with 967 additions and 378 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -145,7 +145,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection
}
catch(Exception ex)
{
response.Messages = ex.Message;
response.Messages = ex.ToString();
return response;
}
@@ -289,7 +289,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection
}
catch(Exception ex)
{
await requestContext.SendError(ex.Message);
await requestContext.SendError(ex.ToString());
}
}
@@ -309,7 +309,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection
}
catch(Exception ex)
{
await requestContext.SendError(ex.Message);
await requestContext.SendError(ex.ToString());
}
}
@@ -353,7 +353,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();
}
}