Update Reference Sources to .NET Framework 4.6.1

[mono.git] / mcs / class / referencesource / System.Data / System / Data / SqlClient / SqlConnectionFactory.cs

diff --git a/mcs/class/referencesource/System.Data/System/Data/SqlClient/SqlConnectionFactory.cs b/mcs/class/referencesource/System.Data/System/Data/SqlClient/SqlConnectionFactory.cs
index 3b23e31a0462555186d4453a4bad238ef7008941..d1b96a31b51bd353e12b7383dd02ff100fd801cb 100644 (file)
--- a/mcs/class/referencesource/System.Data/System/Data/SqlClient/SqlConnectionFactory.cs
+++ b/mcs/class/referencesource/System.Data/System/Data/SqlClient/SqlConnectionFactory.cs
@@ -41,17 +41,19 @@ namespace System.Data.SqlClient
             SqlConnectionPoolKey key = (SqlConnectionPoolKey) poolKey;
             SqlInternalConnection result = null;
             SessionData recoverySessionData = null;
+            SqlConnection sqlOwningConnection = owningConnection as SqlConnection;
+            bool applyTransientFaultHandling = sqlOwningConnection != null ? sqlOwningConnection._applyTransientFaultHandling : false;
 
             SqlConnectionString userOpt = null;
             if (userOptions != null) {
                 userOpt = (SqlConnectionString)userOptions;
             }
-            else if (owningConnection != null) {
-                userOpt = (SqlConnectionString)(((SqlConnection)owningConnection).UserConnectionOptions);                
+            else if (sqlOwningConnection != null) {
+                userOpt = (SqlConnectionString)(sqlOwningConnection.UserConnectionOptions);                
             }
 
-            if (owningConnection != null) {
-                recoverySessionData = ((SqlConnection)owningConnection)._recoverySessionData;
+            if (sqlOwningConnection != null) {
+                recoverySessionData = sqlOwningConnection._recoverySessionData;
             }
 
             if (opt.ContextConnection) {
@@ -63,7 +65,7 @@ namespace System.Data.SqlClient
 
                 // Pass DbConnectionPoolIdentity to SqlInternalConnectionTds if using integrated security.
                 // Used by notifications.
-                if (opt.IntegratedSecurity) {
+                if (opt.IntegratedSecurity || opt.Authentication == SqlAuthenticationMethod.ActiveDirectoryIntegrated) {
                     if (pool != null) {
                         identity = pool.Identity;
                     }
@@ -90,7 +92,7 @@ namespace System.Data.SqlClient
 
 
                             SqlConnectionString sseopt = new SqlConnectionString(opt, opt.DataSource, true /* user instance=true */, false /* set Enlist = false */);
-                            sseConnection = new SqlInternalConnectionTds(identity, sseopt, key.Credential, null, "", null, false);
+                            sseConnection = new SqlInternalConnectionTds(identity, sseopt, key.Credential, null, "", null, false, applyTransientFaultHandling: applyTransientFaultHandling);
                             // NOTE: Retrieve <UserInstanceName> here. This user instance name will be used below to connect to the Sql Express User Instance.
                             instanceName = sseConnection.InstanceName;
 
@@ -122,7 +124,7 @@ namespace System.Data.SqlClient
                     opt = new SqlConnectionString(opt, instanceName, false /* user instance=false */, null /* do not modify the Enlist value */);
                     poolGroupProviderInfo = null; // null so we do not pass to constructor below...
                 }
-                result = new SqlInternalConnectionTds(identity, opt, key.Credential, poolGroupProviderInfo, "", null, redirectedUserInstance, userOpt, recoverySessionData);            
+                result = new SqlInternalConnectionTds(identity, opt, key.Credential, poolGroupProviderInfo, "", null, redirectedUserInstance, userOpt, recoverySessionData, pool, key.AccessToken, applyTransientFaultHandling: applyTransientFaultHandling);
             }
             return result;
         }
@@ -157,7 +159,7 @@ namespace System.Data.SqlClient
                     connectionTimeout = Int32.MaxValue;
 
                 poolingOptions = new DbConnectionPoolGroupOptions(
-                                                    opt.IntegratedSecurity,
+                                                    opt.IntegratedSecurity || opt.Authentication == SqlAuthenticationMethod.ActiveDirectoryIntegrated,
                                                     opt.MinPoolSize,
                                                     opt.MaxPoolSize,
                                                     connectionTimeout,
@@ -180,14 +182,16 @@ namespace System.Data.SqlClient
                 throw SQL.NotAvailableOnContextConnection();
             }
 
-            NameValueCollection settings = (NameValueCollection)PrivilegedConfigurationManager.GetSection("system.data.sqlclient");
             Stream XMLStream =null;
+#if !NO_CONFIGURATION
+            NameValueCollection settings = (NameValueCollection)PrivilegedConfigurationManager.GetSection("system.data.sqlclient");
             if (settings != null){
                 string [] values = settings.GetValues(_metaDataXml);
                 if (values != null) {
                     XMLStream = ADP.GetXmlStreamFromValues(values, _metaDataXml);
                 }
             }
+#endif
 
             // if the xml was not obtained from machine.config use the embedded XML resource
             if (XMLStream == null){
@@ -306,9 +310,11 @@ namespace System.Data.SqlClient
 
         public static readonly SqlPerformanceCounters SingletonInstance = new SqlPerformanceCounters();
 
+#if !MOBILE
         [System.Diagnostics.PerformanceCounterPermissionAttribute(System.Security.Permissions.SecurityAction.Assert, PermissionAccess=PerformanceCounterPermissionAccess.Write, MachineName=".", CategoryName=CategoryName)]
         private SqlPerformanceCounters() : base (CategoryName, CategoryHelp) {
         }
+#endif
     }
 }