Skip to content

Commit b3a3205

Browse files
Fix Application Intent keyword issue + updated test (#585)
1 parent 245db93 commit b3a3205

File tree

3 files changed

+15
-12
lines changed

3 files changed

+15
-12
lines changed

src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/Common/DbConnectionStringCommon.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1124,7 +1124,7 @@ internal static class DbConnectionStringSynonyms
11241124
internal const string APP = "app";
11251125

11261126
//internal const string ApplicationIntent = APPLICATIONINTENT;
1127-
internal const string APPLICATIONINTENT = "ApplicationIntent";
1127+
internal const string APPLICATIONINTENT = "applicationintent";
11281128

11291129
//internal const string AttachDBFilename = EXTENDEDPROPERTIES+","+INITIALFILENAME;
11301130
internal const string EXTENDEDPROPERTIES = "extended properties";
@@ -1135,10 +1135,10 @@ internal static class DbConnectionStringSynonyms
11351135
internal const string TIMEOUT = "timeout";
11361136

11371137
//internal const string ConnectRetryCount = CONNECTRETRYCOUNT;
1138-
internal const string CONNECTRETRYCOUNT = "ConnectRetryCount";
1138+
internal const string CONNECTRETRYCOUNT = "connectretrycount";
11391139

11401140
//internal const string ConnectRetryInterval = CONNECTRETRYINTERVAL;
1141-
internal const string CONNECTRETRYINTERVAL = "ConnectRetryInterval";
1141+
internal const string CONNECTRETRYINTERVAL = "connectretryinterval";
11421142

11431143
//internal const string CurrentLanguage = LANGUAGE;
11441144
internal const string LANGUAGE = "language";
@@ -1160,17 +1160,17 @@ internal static class DbConnectionStringSynonyms
11601160
internal const string ConnectionLifetime = "connection lifetime";
11611161

11621162
//internal const string MultipleActiveResultSets = MULTIPLEACTIVERESULTSETS;
1163-
internal const string MULTIPLEACTIVERESULTSETS = "MultipleActiveResultSets";
1163+
internal const string MULTIPLEACTIVERESULTSETS = "multipleactiveresultsets";
11641164

11651165
//internal const string MultiSubnetFailover = MULTISUBNETFAILOVER;
1166-
internal const string MULTISUBNETFAILOVER = "MultiSubnetFailover";
1166+
internal const string MULTISUBNETFAILOVER = "multisubnetfailover";
11671167

11681168
//internal const string NetworkLibrary = NET+","+NETWORK;
11691169
internal const string NET = "net";
11701170
internal const string NETWORK = "network";
11711171

11721172
//internal const string PoolBlockingPeriod = POOLBLOCKINGPERIOD;
1173-
internal const string POOLBLOCKINGPERIOD = "PoolBlockingPeriod";
1173+
internal const string POOLBLOCKINGPERIOD = "poolblockingperiod";
11741174

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

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

11831183
//internal const string TrustServerCertificate = TRUSTSERVERCERTIFICATE;
1184-
internal const string TRUSTSERVERCERTIFICATE = "TrustServerCertificate";
1184+
internal const string TRUSTSERVERCERTIFICATE = "trustservercertificate";
11851185

11861186
//internal const string TransparentNetworkIPResolution = TRANSPARENTNETWORKIPRESOLUTION;
1187-
internal const string TRANSPARENTNETWORKIPRESOLUTION = "TransparentNetworkIPResolution";
1187+
internal const string TRANSPARENTNETWORKIPRESOLUTION = "transparentnetworkipresolution";
11881188

11891189
//internal const string UserID = UID+","+User;
11901190
internal const string UID = "uid";

src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlConnectionString.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ internal static class KEY
114114
private static class SYNONYM
115115
{
116116
// application intent
117-
internal const string APPLICATIONINTENT = "ApplicationIntent";
117+
internal const string APPLICATIONINTENT = "applicationintent";
118118
// application name
119119
internal const string APP = "app";
120120
internal const string Async = "async";

src/Microsoft.Data.SqlClient/tests/FunctionalTests/SqlConnectionStringBuilderTest.cs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public class SqlConnectionStringBuilderTest
3737
[InlineData("Enclave Attestation Url = http://dymmyurl")]
3838
[InlineData("Encrypt = true")]
3939
[InlineData("Enlist = false")]
40-
[InlineData("Failover Partner = randomserver.sys.local")]
40+
[InlineData("Initial Catalog = Northwind; Failover Partner = randomserver.sys.local")]
4141
[InlineData("Initial Catalog = Northwind")]
4242
[InlineData("Integrated Security = true")]
4343
[InlineData("Trusted_Connection = false")]
@@ -73,7 +73,7 @@ public void ConnectionStringTests(string connectionString)
7373
[InlineData("Authentication = ActiveDirectoryIntegrated ")]
7474
[InlineData("Authentication = Active Directory Interactive ")]
7575
[InlineData("Authentication = ActiveDirectoryInteractive ")]
76-
[InlineData("Context Connection = true")]
76+
[InlineData("Context Connection = false")]
7777
[InlineData("Network Library = dbmssocn")]
7878
[InlineData("Network = dbnmpntw")]
7979
[InlineData("Net = dbmsrpcn")]
@@ -147,7 +147,10 @@ private void ExecuteConnectionStringTests(string connectionString)
147147
Assert.Equal(valueBuilder1, valueBuilder2);
148148
Assert.True(builder2.ContainsKey(key));
149149
}
150+
using (SqlConnection connection = new SqlConnection(connectionString))
151+
{
152+
Assert.NotNull(connection);
153+
}
150154
}
151-
152155
}
153156
}

0 commit comments

Comments
 (0)