ckaczor/sqltoolsservice
1
0
Fork 0
mirror of https://github.com/ckaczor/sqltoolsservice.git synced 2026-02-16 18:47:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

Removing unused code (#1229)

Browse Source 
and adding a null check
This commit is contained in:
Aasim Khan
2021-08-06 20:11:58 -07:00
committed by GitHub
parent 609194d66f
commit c5cbcf02a2
1 changed files with 2 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/Microsoft.SqlTools.ServiceLayer/Migration/MigrationService.cs
View File

@@ -120,20 +120,6 @@ namespace Microsoft.SqlTools.ServiceLayer.Migration
await ConnectionService.Connect(connectParams); await ConnectionService.Connect(connectParams);
var connection = await ConnectionService.Instance.GetOrOpenConnection(randomUri, ConnectionType.Default); var connection = await ConnectionService.Instance.GetOrOpenConnection(randomUri, ConnectionType.Default);
var serverInfo = ReliableConnectionHelper.GetServerVersion(connection);
var hostInfo = ReliableConnectionHelper.GetServerHostInfo(connection);
var server = new SqlObjectLocator
{
Connection = connection,
EngineEdition = SqlAssessmentService.GetEngineEdition(serverInfo.EngineEditionId),
Name = serverInfo.ServerName,
ServerName = serverInfo.ServerName,
Type = SqlObjectType.Server,
Urn = serverInfo.ServerName,
Version = Version.Parse(serverInfo.ServerVersion),
Platform = hostInfo.Platform
};
var connectionStrings = new List<string>(); var connectionStrings = new List<string>();
if (parameters.Databases != null) if (parameters.Databases != null)
{ {
@@ -192,9 +178,10 @@ namespace Microsoft.SqlTools.ServiceLayer.Migration
SqlAssessmentConfiguration.AssessmentReportAndLogsRootFolderPath = Path.GetDirectoryName(Logger.LogFileFullPath); SqlAssessmentConfiguration.AssessmentReportAndLogsRootFolderPath = Path.GetDirectoryName(Logger.LogFileFullPath);
DmaEngine engine = new DmaEngine(connectionStrings); DmaEngine engine = new DmaEngine(connectionStrings);
ISqlMigrationAssessmentModel contextualizedAssessmentResult = await engine.GetTargetAssessmentResultsList(System.Threading.CancellationToken.None); ISqlMigrationAssessmentModel contextualizedAssessmentResult = await engine.GetTargetAssessmentResultsList(System.Threading.CancellationToken.None);
var server = (contextualizedAssessmentResult.Servers.Count > 0)? ParseServerAssessmentInfo(contextualizedAssessmentResult.Servers[0], engine): null;
return new MigrationAssessmentResult() return new MigrationAssessmentResult()
{ {
AssessmentResult = ParseServerAssessmentInfo(contextualizedAssessmentResult.Servers[0], engine), AssessmentResult = server,
Errors = ParseAssessmentError(contextualizedAssessmentResult.Errors), Errors = ParseAssessmentError(contextualizedAssessmentResult.Errors),
StartTime = contextualizedAssessmentResult.StartedOn.ToString(), StartTime = contextualizedAssessmentResult.StartedOn.ToString(),
EndedTime = contextualizedAssessmentResult.EndedOn.ToString(), EndedTime = contextualizedAssessmentResult.EndedOn.ToString(),