From 7fb09a028401476a2e4464ad34b6d1266d7d68d5 Mon Sep 17 00:00:00 2001 From: Leila Lali Date: Wed, 11 Oct 2017 14:48:51 -0700 Subject: [PATCH] Fix/restore db files (#491) * fixed an issue with target database name should replcae the original db name in the db file path --- .../RestoreOperation/RestoreDatabaseTaskDataObject.cs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/RestoreOperation/RestoreDatabaseTaskDataObject.cs b/src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/RestoreOperation/RestoreDatabaseTaskDataObject.cs index 89a3759b..371a6f09 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/RestoreOperation/RestoreDatabaseTaskDataObject.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/RestoreOperation/RestoreDatabaseTaskDataObject.cs @@ -795,10 +795,10 @@ namespace Microsoft.SqlTools.ServiceLayer.DisasterRecovery.RestoreOperation private string GetTargetDbFilePhysicalName(string sourceDbFilePhysicalLocation) { string fileName = Path.GetFileName(sourceDbFilePhysicalLocation); - if (!string.IsNullOrEmpty(this.DefaultSourceDbName) && !string.IsNullOrEmpty(this.targetDbName)) + if (!string.IsNullOrEmpty(this.SourceDatabaseName) && !string.IsNullOrEmpty(this.targetDbName)) { string sourceFilename = fileName; - fileName = sourceFilename.Replace(this.DefaultSourceDbName, this.targetDbName); + fileName = sourceFilename.Replace(this.SourceDatabaseName, this.targetDbName); } return fileName; } @@ -962,9 +962,11 @@ namespace Microsoft.SqlTools.ServiceLayer.DisasterRecovery.RestoreOperation public bool ShouldCreateNewPlan() { - return RestorePlan == null || string.Compare(RestorePlanner.DatabaseName, this.RestoreParams.GetOptionValue(RestoreOptionsHelper.SourceDatabaseName), StringComparison.InvariantCultureIgnoreCase) != 0 || + return RestorePlan == null || + string.Compare(RestorePlanner.DatabaseName, this.RestoreParams.GetOptionValue(RestoreOptionsHelper.SourceDatabaseName), StringComparison.InvariantCultureIgnoreCase) != 0 || RestorePlanner.ReadHeaderFromMedia != this.RestoreParams.ReadHeaderFromMedia || this.RelocateAllFiles != this.RestoreParams.GetOptionValue(RestoreOptionsHelper.RelocateDbFiles) || + string.Compare(TargetDatabaseName, this.RestoreParams.GetOptionValue(RestoreOptionsHelper.TargetDatabaseName), StringComparison.InvariantCultureIgnoreCase) != 0 || string.Compare(this.backupMediaList, RestoreParams.BackupFilePaths, StringComparison.InvariantCultureIgnoreCase) != 0; }