Fix Application Intent keyword issue + updated test (#585)

dotnet · Jun 2, 2020 · b3a3205 · b3a3205
1 parent 245db93
commit b3a3205
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 12 deletions.
diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/Common/DbConnectionStringCommon.cs b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/Common/DbConnectionStringCommon.cs
@@ -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";
 
         //internal const string AttachDBFilename       = EXTENDEDPROPERTIES+","+INITIALFILENAME;
         internal const string EXTENDEDPROPERTIES = "extended properties";
@@ -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";
@@ -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";
 
@@ -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";

diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlConnectionString.cs b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlConnectionString.cs
@@ -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";

diff --git a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/SqlConnectionStringBuilderTest.cs b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/SqlConnectionStringBuilderTest.cs
@@ -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")]
         [InlineData("Initial Catalog = Northwind")]
         [InlineData("Integrated Security = true")]
         [InlineData("Trusted_Connection = false")]
@@ -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")]
@@ -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);
+            }
         }
-
     }
 }