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

Fix/restore scripting issue (#521)

Browse Source 
* fixed the bug with setting server execution mode before creating restore plan
This commit is contained in:
Leila Lali
2017-10-25 10:23:28 -07:00
committed by GitHub
parent fc3cbe0a69
commit 09dd0579d0
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/RestoreOperation/RestoreDatabaseTaskDataObject.cs
View File

@@ -256,7 +256,12 @@ namespace Microsoft.SqlTools.ServiceLayer.DisasterRecovery.RestoreOperation
public override void Execute(TaskExecutionMode mode) public override void Execute(TaskExecutionMode mode)
{ {
RestorePlanToExecute = null;
UpdateRestoreTaskObject(); UpdateRestoreTaskObject();
if (IsValid && RestorePlan.RestoreOperations != null && RestorePlan.RestoreOperations.Any())
{
GetRestorePlanForExecutionAndScript();
}
base.Execute(mode); base.Execute(mode);
} }
@@ -291,19 +296,17 @@ namespace Microsoft.SqlTools.ServiceLayer.DisasterRecovery.RestoreOperation
{ {
try try
{ {
if (IsValid && RestorePlan.RestoreOperations != null && RestorePlan.RestoreOperations.Any()) if (RestorePlanToExecute != null)
{ {
// Restore Plan should be already created and updated at this point // Restore Plan should be already created and updated at this point
RestorePlan restorePlan = GetRestorePlanForExecutionAndScript(); if (RestorePlanToExecute != null && RestorePlanToExecute.RestoreOperations.Count > 0)
if (restorePlan != null && restorePlan.RestoreOperations.Count > 0)
{ {
restorePlan.PercentComplete += (object sender, PercentCompleteEventArgs e) => RestorePlanToExecute.PercentComplete += (object sender, PercentCompleteEventArgs e) =>
{ {
OnMessageAdded(new TaskMessage { Description = $"{e.Percent}%", Status = SqlTaskStatus.InProgress }); OnMessageAdded(new TaskMessage { Description = $"{e.Percent}%", Status = SqlTaskStatus.InProgress });
}; };
restorePlan.Execute(); RestorePlanToExecute.Execute();
} }
} }
else else