ckaczor/sqltoolsservice
1
0
Fork 0
mirror of https://github.com/ckaczor/sqltoolsservice.git synced 2026-01-16 01:25:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update restore service to return default backup folder (#475)

Browse Source 
* Fix restore to return default backup folder

* fix break

* fix tests

* fix file validator for invalid filepath
This commit is contained in:
Kate Shin
2017-10-03 16:11:30 -07:00
committed by GitHub
parent 05702182ab
commit d30b9c870d
8 changed files with 34 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/DisasterRecoveryFileValidator.cs
View File

@@ -85,18 +85,25 @@ namespace Microsoft.SqlTools.ServiceLayer.DisasterRecovery
#region private methods
/// <summary>
/// Check if the folder path exists
/// </summary>
/// <param name="connection">sql connection</param>
/// <param name="filePath">full file path</param>
/// <returns></returns>
internal static string IsFolderPathExisting(SqlConnection connection, string filePath)
{
// If the file path doesn't exist, check if the folder exists
string folderPath = PathWrapper.GetDirectoryName(filePath);
string errorMessage = string.Empty;
if (string.Compare(GetMachineName(connection.DataSource), Environment.MachineName, StringComparison.OrdinalIgnoreCase) == 0)
if (string.IsNullOrEmpty(folderPath))
{
if (!string.IsNullOrEmpty(folderPath) && !Directory.Exists(folderPath))
{
errorMessage = SR.InvalidBackupPathError;
}
errorMessage = SR.InvalidBackupPathError;
}
else if (string.Compare(GetMachineName(connection.DataSource), Environment.MachineName, StringComparison.OrdinalIgnoreCase) == 0
&& !Directory.Exists(folderPath))
{
errorMessage = SR.InvalidBackupPathError;
}
else
{