Fix/restore options issues (#515)

* fixed the bug with tail log option

* fix the bug with the tail gate file name

* closing connections before restore
This commit is contained in:
Leila Lali
2017-10-25 10:22:03 -07:00
committed by GitHub
parent ed5b68bcf9
commit fc3cbe0a69
3 changed files with 35 additions and 17 deletions

View File

@@ -6,6 +6,7 @@
using Microsoft.SqlServer.Management.Smo;
using Microsoft.SqlTools.ServiceLayer.Connection;
using Microsoft.SqlTools.Utility;
using System;
namespace Microsoft.SqlTools.ServiceLayer.TaskServices
{
@@ -83,20 +84,38 @@ namespace Microsoft.SqlTools.ServiceLayer.TaskServices
public bool GainAccessToDatabase()
{
bool result = false;
if (LockedDatabaseManager != null)
{
return LockedDatabaseManager.GainFullAccessToDatabase(ServerName, DatabaseName);
result = LockedDatabaseManager.GainFullAccessToDatabase(ServerName, DatabaseName);
}
return false;
if(result && SourceDatabas != null && string.Compare(DatabaseName , SourceDatabas, StringComparison.InvariantCultureIgnoreCase) != 0)
{
result = LockedDatabaseManager.GainFullAccessToDatabase(ServerName, SourceDatabas);
}
return result;
}
public bool ReleaseAccessToDatabase()
{
bool result = false;
if (LockedDatabaseManager != null)
{
return LockedDatabaseManager.ReleaseAccess(ServerName, DatabaseName);
result = LockedDatabaseManager.ReleaseAccess(ServerName, DatabaseName);
}
if (result && SourceDatabas != null && string.Compare(DatabaseName, SourceDatabas, StringComparison.InvariantCultureIgnoreCase) != 0)
{
result = LockedDatabaseManager.ReleaseAccess(ServerName, SourceDatabas);
}
return result;
}
private string SourceDatabas
{
get
{
return Server?.ConnectionContext.DatabaseName;
}
return false;
}
}
}