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

Remove SELECT * from edit/initialize Query (#288)

Browse Source 
* Major refactor of EditDataMetadata providers

* EditMetadataFactory generates "basic" EditTableMetadata objects based entirely on SMO metadata
* SmoEditTableMetadata no longer depends on SMO, making it unecessary to mock it
* Renamed SmoEditTableMetadata to EditTableMetadata
* EditTableMetadata can be extended with DbColumnWrappers

* Moving logic for extending a EditColumnMetadata into that class

* I *think* this will work for async execution of initialize tasks

* Fixing unit tests for new Edit(Table|Column)Metadata classes

* Async stuff that works! And passes unit tests

* Adding unit tests
Adding .idea to gitignore

* Adding message to the EditSessionReadyEvent

* Fixes from dev merge

* Fixing unit tests that Rider didn't catch as failing
May have been a bit heavy-handed with the async/await stuff

* Couple changes as per PR comments
This commit is contained in:
Benjamin Russell
2017-03-22 10:53:24 -07:00
committed by GitHub
parent d7ecfb1a87
commit 16b3874f28
30 changed files with 2325 additions and 1417 deletions
Download Patch File Download Diff File Expand all files Collapse all files

124
test/Microsoft.SqlTools.ServiceLayer.UnitTests/EditData/ServiceIntegrationTests.cs
View File

@@ -50,7 +50,7 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.EditData
// Setup:
// ... Create an edit data service with a session
var eds = new EditDataService(null, null, null);
eds.ActiveSessions[Common.OwnerUri] = GetDefaultSession();
eds.ActiveSessions[Common.OwnerUri] = await GetDefaultSession();
// ... Create a session param that returns the common owner uri
var mockParams = new EditCreateRowParams { OwnerUri = Common.OwnerUri };
@@ -94,7 +94,7 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.EditData
{
// Setup: Create an edit data service with a session
var eds = new EditDataService(null, null, null);
eds.ActiveSessions[Common.OwnerUri] = GetDefaultSession();
eds.ActiveSessions[Common.OwnerUri] = await GetDefaultSession();
// If: I ask to dispose of an existing session
var efv = new EventFlowValidator<EditDisposeResult>()
@@ -117,7 +117,7 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.EditData
{
// Setup: Create an edit data service with a session
var eds = new EditDataService(null, null, null);
eds.ActiveSessions[Constants.OwnerUri] = GetDefaultSession();
eds.ActiveSessions[Constants.OwnerUri] = await GetDefaultSession();
// If: I validly ask to delete a row
var efv = new EventFlowValidator<EditDeleteRowResult>()
@@ -139,7 +139,7 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.EditData
{
// Setup: Create an edit data service with a session
var eds = new EditDataService(null, null, null);
eds.ActiveSessions[Constants.OwnerUri] = GetDefaultSession();
eds.ActiveSessions[Constants.OwnerUri] = await GetDefaultSession();
// If: I ask to create a row from a non existant session
var efv = new EventFlowValidator<EditCreateRowResult>()
@@ -161,7 +161,7 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.EditData
{
// Setup: Create an edit data service with a session that has an pending edit
var eds = new EditDataService(null, null, null);
var session = GetDefaultSession();
var session = await GetDefaultSession();
session.EditCache[0] = new Mock<RowEditBase>().Object;
eds.ActiveSessions[Constants.OwnerUri] = session;
@@ -185,7 +185,7 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.EditData
{
// Setup: Create an edit data service with a session
var eds = new EditDataService(null, null, null);
var session = GetDefaultSession();
var session = await GetDefaultSession();
eds.ActiveSessions[Constants.OwnerUri] = session;
var edit = new Mock<RowEditBase>();
edit.Setup(e => e.SetCell(It.IsAny<int>(), It.IsAny<string>())).Returns(new EditUpdateCellResult
@@ -223,7 +223,7 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.EditData
// Setup: Create an edit data service with a session
// Setup: Create an edit data service with a session
var eds = new EditDataService(null, null, null);
var session = GetDefaultSession();
var session = await GetDefaultSession();
eds.ActiveSessions[Constants.OwnerUri] = session;
// If: I validly ask for rows
@@ -277,119 +277,15 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.EditData
// ... There should not be a session
Assert.Empty(eds.ActiveSessions);
// ... There should not be a wait handler
Assert.Empty(eds.InitializeWaitHandles);
}
[Fact]
public async Task InitializeInProgress()
{
// Setup: Create an edit data service with an "in-progress initialize"
var eds = new EditDataService(null, null, null);
eds.InitializeWaitHandles[Common.OwnerUri] = new TaskCompletionSource<bool>();
// If:
// ... I ask to initialize a session when an initialize task is already in progress
var initParams = new EditInitializeParams
{
ObjectName = "table",
OwnerUri = Common.OwnerUri,
ObjectType = "table"
};
var efv = new EventFlowValidator<EditInitializeResult>()
.AddErrorValidation<string>(Assert.NotNull)
.Complete();
await eds.HandleInitializeRequest(initParams, efv.Object);
// Then:
// ... An error event should have been raised
efv.Validate();
// ... There should not be a session
Assert.Empty(eds.ActiveSessions);
}
[Fact]
public async Task InitializeQueryCreateFailed()
{
// Setup:
// ... Create a query execution service that will throw on creation of the query
var qes = QueryExecution.Common.GetPrimedExecutionService(null, false, false, null);
// ... Create an edit data service that uses the mocked up query service
var eds = new EditDataService(qes, null, null);
// If:
// ... I initialize a session
var initParams = new EditInitializeParams
{
ObjectName = "table",
OwnerUri = Common.OwnerUri,
ObjectType = "table"
};
var efv = new EventFlowValidator<EditInitializeResult>()
.AddErrorValidation<string>(Assert.NotEmpty)
.Complete();
await eds.HandleInitializeRequest(initParams, efv.Object);
// Then:
// ... We should have gotten an error back
efv.Validate();
// ... There should not be any sessions created
Assert.Empty(eds.ActiveSessions);
// ... There should not be a wait handle
Assert.Empty(eds.InitializeWaitHandles);
}
[Fact]
public async Task InitializeQueryExecutionFails()
{
// Setup:
// ... Create a query execution service that will throw on execution of the query
var qes = QueryExecution.Common.GetPrimedExecutionService(null, true, true, null);
// ... Create an edit data service that uses the mocked up query service
var eds = new EditDataService(qes, null, null);
// If:
// ... I initialize a session
var initParams = new EditInitializeParams
{
ObjectName = "table",
OwnerUri = Common.OwnerUri,
ObjectType = "table"
};
var efv = new EventFlowValidator<EditInitializeResult>()
.AddResultValidation(Assert.NotNull)
.AddEventValidation(EditSessionReadyEvent.Type, esrp =>
{
Assert.NotNull(esrp);
Assert.False(esrp.Success);
}).Complete();
await eds.HandleInitializeRequest(initParams, efv.Object);
await eds.InitializeWaitHandles[Common.OwnerUri].Task;
// Then:
// ... We should have started execution, but failed
efv.Validate();
// ... There should not be any sessions created
Assert.Empty(eds.ActiveSessions);
// ... There should not be a wait handle. It should have been cleaned up by now
Assert.Empty(eds.InitializeWaitHandles);
}
private static EditSession GetDefaultSession()
private static async Task<EditSession> GetDefaultSession()
{
// ... Create a session with a proper query and metadata
Query q = QueryExecution.Common.GetBasicExecutedQuery();
ResultSet rs = q.Batches[0].ResultSets[0];
IEditTableMetadata etm = Common.GetStandardMetadata(rs.Columns);
EditSession s = new EditSession(rs, etm);
EditTableMetadata etm = Common.GetStandardMetadata(rs.Columns);
EditSession s = await Common.GetCustomSession(q, etm);
return s;
}
}