ckaczor/sqltoolsservice
1
0
Fork 0
mirror of https://github.com/ckaczor/sqltoolsservice.git synced 2026-01-18 17:23:52 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix backup file validation error message (#472)

Browse Source 
* Fix backup error message

* check for file existence for restore

* chang error message

* address pr comment

* cleanup
This commit is contained in:
Kate Shin
2017-10-02 15:45:28 -07:00
committed by GitHub
parent e7756b0bf1
commit 8e78ecf9a4
5 changed files with 66 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -44,64 +44,40 @@ namespace Microsoft.SqlTools.ServiceLayer.DisasterRecovery
connection = ReliableConnectionHelper.GetAsSqlConnection(dbConnection);
}
}
if (connection != null)
{
bool isLocal = false;
if (string.Compare(GetMachineName(connection.DataSource), Environment.MachineName, StringComparison.OrdinalIgnoreCase) == 0)
{
isLocal = true;
}
foreach (string filePath in args.FilePaths)
{
bool isFolder;
bool existing = IsPathExisting(connection, filePath, out isFolder);
if (existing)
{
if (isFolder)
{
errorMessage = string.Format(SR.BackupPathIsFolderError, filePath);
result = false;
break;
}
}
else
{
// If the file path doesn't exist, check if the folder exists
string folderPath = PathWrapper.GetDirectoryName(filePath);
if (isLocal)
{
if (!string.IsNullOrEmpty(folderPath) && !Directory.Exists(folderPath))
{
errorMessage = string.Format(SR.InvalidBackupPathError, folderPath);
result = false;
break;
}
}
else
{
bool isFolderOnRemote;
bool existsOnRemote = IsPathExisting(connection, folderPath, out isFolderOnRemote);
if (!existsOnRemote)
{
errorMessage = string.Format(SR.InvalidBackupPathError, folderPath);
result = false;
break;
}
}
}
}
}
else
{
result = false;
}
}
else
if (connection != null)
{
result = false;
foreach (string filePath in args.FilePaths)
{
bool isFolder;
bool existing = IsPathExisting(connection, filePath, out isFolder);
if (existing)
{
if (isFolder)
{
errorMessage = SR.BackupPathIsFolderError;
}
}
else
{
if (args.ServiceType == FileValidationServiceConstants.Backup)
{
errorMessage = IsFolderPathExisting(connection, filePath);
}
else if (args.ServiceType == FileValidationServiceConstants.Restore)
{
errorMessage = SR.InvalidBackupPathError;
}
}
if (!string.IsNullOrEmpty(errorMessage))
{
result = false;
break;
}
}
}
return result;
@@ -109,6 +85,32 @@ namespace Microsoft.SqlTools.ServiceLayer.DisasterRecovery
#region private methods
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) && !Directory.Exists(folderPath))
{
errorMessage = SR.InvalidBackupPathError;
}
}
else
{
bool isFolderOnRemote;
bool existsOnRemote = IsPathExisting(connection, folderPath, out isFolderOnRemote);
if (!existsOnRemote)
{
errorMessage = SR.InvalidBackupPathError;
}
}
return errorMessage;
}
internal static bool IsPathExisting(SqlConnection connection, string path, out bool isFolder)
{
Request req = new Request