Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Application Intent keyword issue + updated test #585

Merged
merged 2 commits into from
Jun 2, 2020
Merged

Fix Application Intent keyword issue + updated test #585

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1d77693
Fix Application Intent keyword issue
cheenamalhotra Jun 1, 2020
8d23548
Minor edit to instantiate SqlConnection
cheenamalhotra Jun 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/Common/DbConnectionStringCommon.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1124,7 +1124,7 @@ internal static class DbConnectionStringSynonyms
internal const string APP = "app";

//internal const string ApplicationIntent = APPLICATIONINTENT;
internal const string APPLICATIONINTENT = "ApplicationIntent";
internal const string APPLICATIONINTENT = "applicationintent";
cheenamalhotra marked this conversation as resolved.
Show resolved Hide resolved

//internal const string AttachDBFilename = EXTENDEDPROPERTIES+","+INITIALFILENAME;
internal const string EXTENDEDPROPERTIES = "extended properties";
Expand All @@ -1135,10 +1135,10 @@ internal static class DbConnectionStringSynonyms
internal const string TIMEOUT = "timeout";

//internal const string ConnectRetryCount = CONNECTRETRYCOUNT;
internal const string CONNECTRETRYCOUNT = "ConnectRetryCount";
internal const string CONNECTRETRYCOUNT = "connectretrycount";

//internal const string ConnectRetryInterval = CONNECTRETRYINTERVAL;
internal const string CONNECTRETRYINTERVAL = "ConnectRetryInterval";
internal const string CONNECTRETRYINTERVAL = "connectretryinterval";

//internal const string CurrentLanguage = LANGUAGE;
internal const string LANGUAGE = "language";
Expand All @@ -1160,17 +1160,17 @@ internal static class DbConnectionStringSynonyms
internal const string ConnectionLifetime = "connection lifetime";

//internal const string MultipleActiveResultSets = MULTIPLEACTIVERESULTSETS;
internal const string MULTIPLEACTIVERESULTSETS = "MultipleActiveResultSets";
internal const string MULTIPLEACTIVERESULTSETS = "multipleactiveresultsets";

//internal const string MultiSubnetFailover = MULTISUBNETFAILOVER;
internal const string MULTISUBNETFAILOVER = "MultiSubnetFailover";
internal const string MULTISUBNETFAILOVER = "multisubnetfailover";

//internal const string NetworkLibrary = NET+","+NETWORK;
internal const string NET = "net";
internal const string NETWORK = "network";

//internal const string PoolBlockingPeriod = POOLBLOCKINGPERIOD;
internal const string POOLBLOCKINGPERIOD = "PoolBlockingPeriod";
internal const string POOLBLOCKINGPERIOD = "poolblockingperiod";

internal const string WorkaroundOracleBug914652 = "Workaround Oracle Bug 914652";

Expand All @@ -1181,10 +1181,10 @@ internal static class DbConnectionStringSynonyms
internal const string PERSISTSECURITYINFO = "persistsecurityinfo";

//internal const string TrustServerCertificate = TRUSTSERVERCERTIFICATE;
internal const string TRUSTSERVERCERTIFICATE = "TrustServerCertificate";
internal const string TRUSTSERVERCERTIFICATE = "trustservercertificate";

//internal const string TransparentNetworkIPResolution = TRANSPARENTNETWORKIPRESOLUTION;
internal const string TRANSPARENTNETWORKIPRESOLUTION = "TransparentNetworkIPResolution";
internal const string TRANSPARENTNETWORKIPRESOLUTION = "transparentnetworkipresolution";

//internal const string UserID = UID+","+User;
internal const string UID = "uid";
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlConnectionString.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ internal static class KEY
private static class SYNONYM
{
// application intent
internal const string APPLICATIONINTENT = "ApplicationIntent";
internal const string APPLICATIONINTENT = "applicationintent";
// application name
internal const string APP = "app";
internal const string Async = "async";
Expand Down
9 changes: 6 additions & 3 deletions src/Microsoft.Data.SqlClient/tests/FunctionalTests/SqlConnectionStringBuilderTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public class SqlConnectionStringBuilderTest
[InlineData("Enclave Attestation Url = http://dymmyurl")]
[InlineData("Encrypt = true")]
[InlineData("Enlist = false")]
[InlineData("Failover Partner = randomserver.sys.local")]
[InlineData("Initial Catalog = Northwind; Failover Partner = randomserver.sys.local")]
cheenamalhotra marked this conversation as resolved.
Show resolved Hide resolved
[InlineData("Initial Catalog = Northwind")]
[InlineData("Integrated Security = true")]
[InlineData("Trusted_Connection = false")]
Expand Down Expand Up @@ -73,7 +73,7 @@ public void ConnectionStringTests(string connectionString)
[InlineData("Authentication = ActiveDirectoryIntegrated ")]
[InlineData("Authentication = Active Directory Interactive ")]
[InlineData("Authentication = ActiveDirectoryInteractive ")]
[InlineData("Context Connection = true")]
[InlineData("Context Connection = false")]
[InlineData("Network Library = dbmssocn")]
[InlineData("Network = dbnmpntw")]
[InlineData("Net = dbmsrpcn")]
Expand Down Expand Up @@ -147,7 +147,10 @@ private void ExecuteConnectionStringTests(string connectionString)
Assert.Equal(valueBuilder1, valueBuilder2);
Assert.True(builder2.ContainsKey(key));
}
using (SqlConnection connection = new SqlConnection(connectionString))
{
Assert.NotNull(connection);
}
cheenamalhotra marked this conversation as resolved.
Show resolved Hide resolved
}

}
}