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

Merge pull request #27 from Microsoft/feature/connectionInnerExceptions

Browse Source 
Added inner exceptions on connection failure and fixed a param validation bug
This commit is contained in:
Mitchell Sternke
2016-08-23 10:25:58 -07:00
committed by GitHub
parent a6bdf62d85 14399ede65
commit aac9f40ad2
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)

26
test/Microsoft.SqlTools.ServiceLayer.Test/Connection/ConnectionServiceTests.cs
View File

@@ -19,6 +19,30 @@ namespace Microsoft.SqlTools.ServiceLayer.Test.Connection
/// </summary>
public class ConnectionServiceTests
{
/// <summary>
/// Verify that we can connect to the default database when no database name is
/// provided as a parameter.
/// </summary>
[Theory]
[InlineDataAttribute(null)]
[InlineDataAttribute("")]
public void CanConnectWithEmptyDatabaseName(string databaseName)
{
// Connect
var connectionDetails = TestObjects.GetTestConnectionDetails();
connectionDetails.DatabaseName = databaseName;
var connectionResult =
TestObjects.GetTestConnectionService()
.Connect(new ConnectParams()
{
OwnerUri = "file:///my/test/file.sql",
Connection = connectionDetails
});
// check that a connection was created
Assert.NotEmpty(connectionResult.ConnectionId);
}
/// <summary>
/// Verify that when a connection is started for a URI with an already existing
/// connection, we disconnect first before connecting.
@@ -99,12 +123,10 @@ namespace Microsoft.SqlTools.ServiceLayer.Test.Connection
[Theory]
[InlineDataAttribute(null, "my-server", "test", "sa", "123456")]
[InlineDataAttribute("file://my/sample/file.sql", null, "test", "sa", "123456")]
[InlineDataAttribute("file://my/sample/file.sql", "my-server", null, "sa", "123456")]
[InlineDataAttribute("file://my/sample/file.sql", "my-server", "test", null, "123456")]
[InlineDataAttribute("file://my/sample/file.sql", "my-server", "test", "sa", null)]
[InlineDataAttribute("", "my-server", "test", "sa", "123456")]
[InlineDataAttribute("file://my/sample/file.sql", "", "test", "sa", "123456")]
[InlineDataAttribute("file://my/sample/file.sql", "my-server", "", "sa", "123456")]
[InlineDataAttribute("file://my/sample/file.sql", "my-server", "test", "", "123456")]
[InlineDataAttribute("file://my/sample/file.sql", "my-server", "test", "sa", "")]
public void ConnectingWithInvalidParametersYieldsErrorMessage(string ownerUri, string server, string database, string userName, string password)