Fix numerous Azure property issues (#511)

* Avoid crashing if azure edition is System.

* Add new Azure-specific options to the prototype and return through the service calls

* Send azure properties over database info request

* IsCloud should include Azure SQL DW
- Fixed references to this feature flag
- Updated edition handling to include ManagedInstance and removed AzureV1 check since it's never used and it's been retired.
This commit is contained in:
Kevin Cunnane
2017-10-19 22:08:33 -07:00
committed by Karl Burtram
parent 49f0221dc8
commit d222af7824
16 changed files with 145 additions and 79 deletions

View File

@@ -3309,6 +3309,22 @@ namespace Microsoft.SqlTools.ServiceLayer
}
}
public static string Error_InvalidDirectoryName
{
get
{
return Keys.GetString(Keys.Error_InvalidDirectoryName);
}
}
public static string Error_ExistingDirectoryName
{
get
{
return Keys.GetString(Keys.Error_ExistingDirectoryName);
}
}
public static string BackupTaskName
{
get
@@ -4915,6 +4931,12 @@ namespace Microsoft.SqlTools.ServiceLayer
public const string NeverBackedUp = "NeverBackedUp";
public const string Error_InvalidDirectoryName = "Error_InvalidDirectoryName";
public const string Error_ExistingDirectoryName = "Error_ExistingDirectoryName";
public const string BackupTaskName = "BackupTaskName";

View File

@@ -1827,6 +1827,14 @@
<value>Never</value>
<comment></comment>
</data>
<data name="Error_InvalidDirectoryName" xml:space="preserve">
<value>Path {0} is not a valid directory </value>
<comment></comment>
</data>
<data name="Error_ExistingDirectoryName" xml:space="preserve">
<value>For directory {0} a file with name {1} already exists</value>
<comment></comment>
</data>
<data name="BackupTaskName" xml:space="preserve">
<value>Backup Database</value>
<comment></comment>

View File

@@ -808,6 +808,8 @@ general_containmentType_Partial = Partial
filegroups_filestreamFiles = FILESTREAM Files
prototype_file_noApplicableFileGroup = No Applicable Filegroup
NeverBackedUp = Never
Error_InvalidDirectoryName = Path {0} is not a valid directory
Error_ExistingDirectoryName = For directory {0} a file with name {1} already exists
############################################################################
# Backup Service

View File

@@ -2295,6 +2295,16 @@
<target state="new">Azure SQL Stretch Database</target>
<note></note>
</trans-unit>
<trans-unit id="Error_InvalidDirectoryName">
<source>Path {0} is not a valid directory </source>
<target state="new">Path {0} is not a valid directory </target>
<note></note>
</trans-unit>
<trans-unit id="Error_ExistingDirectoryName">
<source>For directory {0} a file with name {1} already exists</source>
<target state="new">For directory {0} a file with name {1} already exists</target>
<note></note>
</trans-unit>
</body>
</file>
</xliff>