ckaczor/sqltoolsservice
1
0
Fork 0
mirror of https://github.com/ckaczor/sqltoolsservice.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix build error

Browse Source
This commit is contained in:
Amir Omidi
2020-02-26 11:46:23 -08:00
parent e407d87fce
commit f5a6f6f714
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Microsoft.SqlTools.ServiceLayer/Connection/ConnectionService.cs
View File

@@ -1160,7 +1160,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection
{ {
if (string.IsNullOrEmpty(connectionDetails.ColumnEncryptionSetting) || connectionDetails.ColumnEncryptionSetting.ToUpper() == "DISABLED") if (string.IsNullOrEmpty(connectionDetails.ColumnEncryptionSetting) || connectionDetails.ColumnEncryptionSetting.ToUpper() == "DISABLED")
{ {
throw new ArgumentException(SR.ConnectionServiceConnStringInvalidAlwaysEncryptedOptionCombination()); throw new ArgumentException(SR.ConnectionServiceConnStringInvalidAlwaysEncryptedOptionCombination);
} }
switch (connectionDetails.EnclaveAttestationProtocol.ToUpper()) switch (connectionDetails.EnclaveAttestationProtocol.ToUpper())
@@ -1179,7 +1179,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection
{ {
if (string.IsNullOrEmpty(connectionDetails.ColumnEncryptionSetting) || connectionDetails.ColumnEncryptionSetting.ToUpper() == "DISABLED") if (string.IsNullOrEmpty(connectionDetails.ColumnEncryptionSetting) || connectionDetails.ColumnEncryptionSetting.ToUpper() == "DISABLED")
{ {
throw new ArgumentException(SR.ConnectionServiceConnStringInvalidAlwaysEncryptedOptionCombination()); throw new ArgumentException(SR.ConnectionServiceConnStringInvalidAlwaysEncryptedOptionCombination);
} }
connectionBuilder.EnclaveAttestationUrl = connectionDetails.EnclaveAttestationUrl; connectionBuilder.EnclaveAttestationUrl = connectionDetails.EnclaveAttestationUrl;

15
src/Microsoft.SqlTools.ServiceLayer/Localization/sr.cs
View File

@@ -2972,6 +2972,15 @@ namespace Microsoft.SqlTools.ServiceLayer
} }
} }
public static string ConnectionServiceConnStringInvalidAlwaysEncryptedOptionCombination
{
get
{
return Keys.GetString(Keys.ConnectionServiceConnStringInvalidAlwaysEncryptedOptionCombination);
}
}
public static string ConnectionServiceListDbErrorNotConnected(string uri) public static string ConnectionServiceListDbErrorNotConnected(string uri)
{ {
return Keys.GetString(Keys.ConnectionServiceListDbErrorNotConnected, uri); return Keys.GetString(Keys.ConnectionServiceListDbErrorNotConnected, uri);
@@ -2997,10 +3006,6 @@ namespace Microsoft.SqlTools.ServiceLayer
return Keys.GetString(Keys.ConnectionServiceConnStringInvalidEnclaveAttestationProtocol, enclaveAttestationProtocol); return Keys.GetString(Keys.ConnectionServiceConnStringInvalidEnclaveAttestationProtocol, enclaveAttestationProtocol);
} }
public static string ConnectionServiceConnStringInvalidAlwaysEncryptedOptionCombination()
{
return Keys.GetString(Keys.ConnectionServiceConnStringInvalidAlwaysEncryptedOptionCombination);
}
public static string ConnectionServiceConnStringInvalidIntent(string intent) public static string ConnectionServiceConnStringInvalidIntent(string intent)
{ {
@@ -3318,7 +3323,7 @@ namespace Microsoft.SqlTools.ServiceLayer
public const string QueryServiceExecutionPlanNotFound = "QueryServiceExecutionPlanNotFound"; public const string QueryServiceExecutionPlanNotFound = "QueryServiceExecutionPlanNotFound";
public const string SqlCmdExitOnError = "SqlCmdExitOnError"; public const string SqlCmdExitOnError = "SqlCmdExitOnError";