added restore errors to resx (#407)

* added restore errors to resx

* including the restore error messages in the result

* added more error handling and tests
This commit is contained in:
Leila Lali
2017-07-12 10:20:47 -07:00
committed by GitHub
parent 11097f9cc5
commit 64e671ca2a
10 changed files with 233 additions and 36 deletions

View File

@@ -3301,6 +3301,54 @@ namespace Microsoft.SqlTools.ServiceLayer
}
}
public static string ConflictWithNoRecovery
{
get
{
return Keys.GetString(Keys.ConflictWithNoRecovery);
}
}
public static string InvalidPathForDatabaseFile
{
get
{
return Keys.GetString(Keys.InvalidPathForDatabaseFile);
}
}
public static string Log
{
get
{
return Keys.GetString(Keys.Log);
}
}
public static string RestorePlanFailed
{
get
{
return Keys.GetString(Keys.RestorePlanFailed);
}
}
public static string RestoreNotSupported
{
get
{
return Keys.GetString(Keys.RestoreNotSupported);
}
}
public static string RestoreTaskName
{
get
{
return Keys.GetString(Keys.RestoreTaskName);
}
}
public static string ConnectionServiceListDbErrorNotConnected(string uri)
{
return Keys.GetString(Keys.ConnectionServiceListDbErrorNotConnected, uri);
@@ -4648,6 +4696,24 @@ namespace Microsoft.SqlTools.ServiceLayer
public const string Task_Completed = "Task_Completed";
public const string ConflictWithNoRecovery = "ConflictWithNoRecovery";
public const string InvalidPathForDatabaseFile = "InvalidPathForDatabaseFile";
public const string Log = "Log";
public const string RestorePlanFailed = "RestorePlanFailed";
public const string RestoreNotSupported = "RestoreNotSupported";
public const string RestoreTaskName = "RestoreTaskName";
private Keys()
{ }

View File

@@ -1823,4 +1823,28 @@
<value>Completed</value>
<comment></comment>
</data>
<data name="ConflictWithNoRecovery" xml:space="preserve">
<value>Specifying this option when restoring a backup with the NORECOVERY option is not permitted.</value>
<comment></comment>
</data>
<data name="InvalidPathForDatabaseFile" xml:space="preserve">
<value>Invalid path for database file: '{0}'</value>
<comment></comment>
</data>
<data name="Log" xml:space="preserve">
<value>Log</value>
<comment></comment>
</data>
<data name="RestorePlanFailed" xml:space="preserve">
<value>Failed to create restore plan</value>
<comment></comment>
</data>
<data name="RestoreNotSupported" xml:space="preserve">
<value>Restore database is not supported</value>
<comment></comment>
</data>
<data name="RestoreTaskName" xml:space="preserve">
<value>Restore Database</value>
<comment></comment>
</data>
</root>

View File

@@ -820,3 +820,4 @@ InvalidPathForDatabaseFile = Invalid path for database file: '{0}'
Log = Log
RestorePlanFailed = Failed to create restore plan
RestoreNotSupported = Restore database is not supported
RestoreTaskName = Restore Database

View File

@@ -2129,6 +2129,36 @@
<target state="new">Parameterization</target>
<note></note>
</trans-unit>
<trans-unit id="ConflictWithNoRecovery">
<source>Specifying this option when restoring a backup with the NORECOVERY option is not permitted.</source>
<target state="new">Specifying this option when restoring a backup with the NORECOVERY option is not permitted.</target>
<note></note>
</trans-unit>
<trans-unit id="InvalidPathForDatabaseFile">
<source>Invalid path for database file: '{0}'</source>
<target state="new">Invalid path for database file: '{0}'</target>
<note></note>
</trans-unit>
<trans-unit id="Log">
<source>Log</source>
<target state="new">Log</target>
<note></note>
</trans-unit>
<trans-unit id="RestorePlanFailed">
<source>Failed to create restore plan</source>
<target state="new">Failed to create restore plan</target>
<note></note>
</trans-unit>
<trans-unit id="RestoreNotSupported">
<source>Restore database is not supported</source>
<target state="new">Restore database is not supported</target>
<note></note>
</trans-unit>
<trans-unit id="RestoreTaskName">
<source>Restore Database</source>
<target state="new">Restore Database</target>
<note></note>
</trans-unit>
</body>
</file>
</xliff>