mirror of
https://github.com/ckaczor/sqltoolsservice.git
synced 2026-01-14 01:25:40 -05:00
This is a small API addition that allows us to execute queries directly as strings. This will make it easier to execute queries outside the confines of a workspace like VS Code.
* Refactor execution requests and events are now named less redundantly and moved into a separate namespace for organization. This is the bulk of the changes.
* QueryExecuteBatchNotification -> ExecuteRequests/BatchEvents
* QueryExecuteMessageNotification -> ExecuteRequests/MessageEvent
* QueryExecuteCompleteNotification -> ExecuteRequests/QueryCompleteEvent
* QueryExecuteResultSetCompleteNotification -> ExecuteRequests/ResultSetEvents
* QueryExecuteSubsetRequest -> SubsetRequest.cs
* Creating an inheritance pattern where
* `ExecuteRequestParamsBase` has execution options and ID for a query execute request
* `ExecuteDocumentSelectionParams` inherits from `ExecuteRequestParamsBase` and provides a document selection
* `ExecuteStringParams` inherits from `ExecuteRequestParamsBase` and provides the query text
* Adding a helper method to get SQL text based on request type
* Through the AWESOME POWER OF POLYMORPHISM, we are able to create a request for executing straight SQL basically for free.
* **Breaking change:** query/execute => query/executeDocumentSelection to make it more obvious what is expected.
* Adding unit tests for the code that gets SQL text
* Refactoring of execute contracts into their own namespace
* Refactoring application
* Adding new request for executing queries as strings
* Adding forgotten string request
* Changing the logic for checking the request param types
* Removing redundant declarations
96 lines
4.3 KiB
C#
96 lines
4.3 KiB
C#
//
|
|
// Copyright (c) Microsoft. All rights reserved.
|
|
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
|
|
//
|
|
|
|
using System.Threading.Tasks;
|
|
using Microsoft.SqlTools.ServiceLayer.QueryExecution.Contracts;
|
|
using Microsoft.SqlTools.ServiceLayer.QueryExecution.Contracts.ExecuteRequests;
|
|
using Microsoft.SqlTools.ServiceLayer.SqlContext;
|
|
using Microsoft.SqlTools.ServiceLayer.Test.Utility;
|
|
using Microsoft.SqlTools.ServiceLayer.Workspace;
|
|
using Moq;
|
|
using Xunit;
|
|
|
|
namespace Microsoft.SqlTools.ServiceLayer.Test.QueryExecution
|
|
{
|
|
public class CancelTests
|
|
{
|
|
[Fact]
|
|
public async Task CancelInProgressQueryTest()
|
|
{
|
|
// If:
|
|
// ... I request a query (doesn't matter what kind) and execute it
|
|
var workspaceService = Common.GetPrimedWorkspaceService(Common.StandardQuery);
|
|
var queryService = Common.GetPrimedExecutionService(null, true, false, workspaceService);
|
|
var executeParams = new ExecuteDocumentSelectionParams { QuerySelection = Common.WholeDocument, OwnerUri = Common.OwnerUri };
|
|
var executeRequest = RequestContextMocks.Create<ExecuteRequestResult>(null);
|
|
|
|
await queryService.HandleExecuteRequest(executeParams, executeRequest.Object);
|
|
await queryService.ActiveQueries[Common.OwnerUri].ExecutionTask;
|
|
queryService.ActiveQueries[Common.OwnerUri].HasExecuted = false; // Fake that it hasn't completed execution
|
|
|
|
// ... And then I request to cancel the query
|
|
var cancelParams = new QueryCancelParams {OwnerUri = Common.OwnerUri};
|
|
var cancelRequest = new EventFlowValidator<QueryCancelResult>()
|
|
.AddResultValidation(r =>
|
|
{
|
|
Assert.Null(r.Messages);
|
|
}).Complete();
|
|
await queryService.HandleCancelRequest(cancelParams, cancelRequest.Object);
|
|
|
|
// Then:
|
|
// ... The query should not have been disposed
|
|
Assert.Equal(1, queryService.ActiveQueries.Count);
|
|
cancelRequest.Validate();
|
|
}
|
|
|
|
[Fact]
|
|
public async Task CancelExecutedQueryTest()
|
|
{
|
|
// If:
|
|
// ... I request a query (doesn't matter what kind) and wait for execution
|
|
var workspaceService = Common.GetPrimedWorkspaceService(Common.StandardQuery);
|
|
var queryService = Common.GetPrimedExecutionService(null, true, false, workspaceService);
|
|
var executeParams = new ExecuteDocumentSelectionParams {QuerySelection = Common.WholeDocument, OwnerUri = Common.OwnerUri};
|
|
var executeRequest = RequestContextMocks.Create<ExecuteRequestResult>(null);
|
|
|
|
await queryService.HandleExecuteRequest(executeParams, executeRequest.Object);
|
|
await queryService.ActiveQueries[Common.OwnerUri].ExecutionTask;
|
|
|
|
// ... And then I request to cancel the query
|
|
var cancelParams = new QueryCancelParams {OwnerUri = Common.OwnerUri};
|
|
var cancelRequest = new EventFlowValidator<QueryCancelResult>()
|
|
.AddResultValidation(r =>
|
|
{
|
|
Assert.False(string.IsNullOrWhiteSpace(r.Messages));
|
|
}).Complete();
|
|
|
|
await queryService.HandleCancelRequest(cancelParams, cancelRequest.Object);
|
|
|
|
// Then:
|
|
// ... The query should not have been disposed
|
|
Assert.NotEmpty(queryService.ActiveQueries);
|
|
cancelRequest.Validate();
|
|
}
|
|
|
|
[Fact]
|
|
public async Task CancelNonExistantTest()
|
|
{
|
|
// If:
|
|
// ... I request to cancel a query that doesn't exist
|
|
var workspaceService = new Mock<WorkspaceService<SqlToolsSettings>>();
|
|
var queryService = Common.GetPrimedExecutionService(null, false, false, workspaceService.Object);
|
|
|
|
var cancelParams = new QueryCancelParams { OwnerUri = "Doesn't Exist" };
|
|
var cancelRequest = new EventFlowValidator<QueryCancelResult>()
|
|
.AddResultValidation(r =>
|
|
{
|
|
Assert.False(string.IsNullOrWhiteSpace(r.Messages));
|
|
}).Complete();
|
|
await queryService.HandleCancelRequest(cancelParams, cancelRequest.Object);
|
|
cancelRequest.Validate();
|
|
}
|
|
}
|
|
}
|