ckaczor/sqltoolsservice
1
0
Fork 0
mirror of https://github.com/ckaczor/sqltoolsservice.git synced 2026-02-17 02:51:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

Refactor error messages (#122)

Browse Source
This commit is contained in:
Sharon Ravindran
2016-10-28 12:26:31 -07:00
committed by GitHub
parent 96c3e746ad
commit 931235c604
4 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Contracts/SaveResultsRequest.cs
View File

@@ -84,6 +84,17 @@ namespace Microsoft.SqlTools.ServiceLayer.QueryExecution.Contracts
public string Messages { get; set; } public string Messages { get; set; }
} }
/// <summary>
/// Error object for save result
/// </summary>
public class SaveResultRequestError
{
/// <summary>
/// Error message
/// </summary>
public string message { get; set; }
}
/// <summary> /// <summary>
/// Request type to save results as CSV /// Request type to save results as CSV
/// </summary> /// </summary>

4
src/Microsoft.SqlTools.ServiceLayer/QueryExecution/QueryExecutionService.cs
View File

@@ -280,7 +280,7 @@ namespace Microsoft.SqlTools.ServiceLayer.QueryExecution
SaveResults.AsyncSaveEventHandler errorHandler = async message => SaveResults.AsyncSaveEventHandler errorHandler = async message =>
{ {
selectedResultSet.RemoveSaveTask(saveParams.FilePath); selectedResultSet.RemoveSaveTask(saveParams.FilePath);
await requestContext.SendError(message); await requestContext.SendError(new SaveResultRequestError { message = message });
}; };
saveAsCsv.SaveFailed += errorHandler; saveAsCsv.SaveFailed += errorHandler;
@@ -323,7 +323,7 @@ namespace Microsoft.SqlTools.ServiceLayer.QueryExecution
SaveResults.AsyncSaveEventHandler errorHandler = async message => SaveResults.AsyncSaveEventHandler errorHandler = async message =>
{ {
selectedResultSet.RemoveSaveTask(saveParams.FilePath); selectedResultSet.RemoveSaveTask(saveParams.FilePath);
await requestContext.SendError(message); await requestContext.SendError(new SaveResultRequestError { message = message });
}; };
saveAsJson.SaveFailed += errorHandler; saveAsJson.SaveFailed += errorHandler;

2
src/Microsoft.SqlTools.ServiceLayer/QueryExecution/SaveResults.cs
View File

@@ -222,7 +222,7 @@ namespace Microsoft.SqlTools.ServiceLayer.QueryExecution
} }
if (SaveFailed != null) if (SaveFailed != null)
{ {
await SaveFailed(ex.ToString()); await SaveFailed(ex.Message);
} }
} }
}); });

8
test/Microsoft.SqlTools.ServiceLayer.Test/QueryExecution/SaveResultsTests.cs
View File

@@ -137,8 +137,8 @@ namespace Microsoft.SqlTools.ServiceLayer.Test.QueryExecution
FilePath = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? "G:\\test.csv" : "/test.csv" FilePath = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? "G:\\test.csv" : "/test.csv"
}; };
string errMessage = null; SaveResultRequestError errMessage = null;
var saveRequest = GetSaveResultsContextMock( null, err => errMessage = (string) err); var saveRequest = GetSaveResultsContextMock( null, err => errMessage = (SaveResultRequestError) err);
queryService.ActiveQueries[Common.OwnerUri].Batches[0] = Common.GetBasicExecutedBatch(); queryService.ActiveQueries[Common.OwnerUri].Batches[0] = Common.GetBasicExecutedBatch();
// Call save results and wait on the save task // Call save results and wait on the save task
@@ -296,8 +296,8 @@ namespace Microsoft.SqlTools.ServiceLayer.Test.QueryExecution
}; };
string errMessage = null; SaveResultRequestError errMessage = null;
var saveRequest = GetSaveResultsContextMock( null, err => errMessage = (string) err); var saveRequest = GetSaveResultsContextMock( null, err => errMessage = (SaveResultRequestError) err);
queryService.ActiveQueries[Common.OwnerUri].Batches[0] = Common.GetBasicExecutedBatch(); queryService.ActiveQueries[Common.OwnerUri].Batches[0] = Common.GetBasicExecutedBatch();
// Call save results and wait on the save task // Call save results and wait on the save task