Remove DbConnectionFactory

Author: benrr101

src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj

@@ -99,9 +99,6 @@
     <Compile Include="$(CommonSourceRoot)\Microsoft\Data\ProviderBase\DbConnectionClosed.cs">
       <Link>Microsoft\Data\ProviderBase\DbConnectionClosed.cs</Link>
     </Compile>
-    <Compile Include="$(CommonSourceRoot)\Microsoft\Data\ProviderBase\DbConnectionFactory.cs">
-      <Link>Microsoft\Data\ProviderBase\DbConnectionFactory.cs</Link>
-    </Compile>
     <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\ChannelDbConnectionPool.cs">
       <Link>Microsoft\Data\SqlClient\ConnectionPool\ChannelDbConnectionPool.cs</Link>
     </Compile>

src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj

@@ -285,9 +285,6 @@
     <Compile Include="$(CommonSourceRoot)\Microsoft\Data\ProviderBase\DbConnectionClosed.cs">
       <Link>Microsoft\Data\ProviderBase\DbConnectionClosed.cs</Link>
     </Compile>
-    <Compile Include="$(CommonSourceRoot)\Microsoft\Data\ProviderBase\DbConnectionFactory.cs">
-      <Link>Microsoft\Data\ProviderBase\DbConnectionFactory.cs</Link>
-    </Compile>
     <Compile Include="$(CommonSourceRoot)Microsoft\Data\ProviderBase\DbConnectionInternal.cs">
       <Link>Microsoft\Data\ProviderBase\DbConnectionInternal.cs</Link>
     </Compile>

src/Microsoft.Data.SqlClient/src/Microsoft/Data/ProviderBase/DbConnectionFactory.cs

@@ -22,7 +22,7 @@
 
 namespace Microsoft.Data.SqlClient
 {
-    internal sealed class SqlConnectionFactory : DbConnectionFactory
+    internal sealed class SqlConnectionFactory
     {
         #region Member Variables
 
@@ -180,13 +180,7 @@ internal DbConnectionPoolGroup GetConnectionPoolGroup(
                 // our collection of pool entries, then we need to create a
                 // new pool entry and add it to our collection.
 
-                DbConnectionOptions connectionOptions = CreateConnectionOptions(
-                    key.ConnectionString,
-                    userConnectionOptions);
-                if (connectionOptions is null)
-                {
-                    throw ADP.InternalConnectionError(ADP.ConnectionError.ConnectionOptionsMissing);
-                }
+                SqlConnectionString connectionOptions = new SqlConnectionString(key.ConnectionString);
 
                 if (userConnectionOptions is null)
                 {
@@ -474,58 +468,6 @@ internal bool TryGetConnection(
 
         #endregion
 
-        protected override DbConnectionOptions CreateConnectionOptions(string connectionString, DbConnectionOptions previous)
-        {
-            Debug.Assert(!string.IsNullOrEmpty(connectionString), "empty connectionString");
-            SqlConnectionString result = new SqlConnectionString(connectionString);
-            return result;
-        }
-
-        protected override DbConnectionPoolGroupOptions CreateConnectionPoolGroupOptions(DbConnectionOptions connectionOptions)
-        {
-            SqlConnectionString opt = (SqlConnectionString)connectionOptions;
-
-            DbConnectionPoolGroupOptions poolingOptions = null;
-
-            if (opt.Pooling)
-            {    // never pool context connections.
-                int connectionTimeout = opt.ConnectTimeout;
-
-                if (connectionTimeout > 0 && connectionTimeout < int.MaxValue / 1000)
-                {
-                    connectionTimeout *= 1000;
-                }
-                else if (connectionTimeout >= int.MaxValue / 1000)
-                {
-                    connectionTimeout = int.MaxValue;
-                }
-                
-                if (opt.Authentication is SqlAuthenticationMethod.ActiveDirectoryInteractive
-                                       or SqlAuthenticationMethod.ActiveDirectoryDeviceCodeFlow)
-                {
-                    // interactive/device code flow mode will always have pool's CreateTimeout = 10 x ConnectTimeout.
-                    if (connectionTimeout >= Int32.MaxValue / 10)
-                    {
-                        connectionTimeout = Int32.MaxValue;
-                    }
-                    else
-                    {
-                        connectionTimeout *= 10;
-                    }
-                    SqlClientEventSource.Log.TryTraceEvent("SqlConnectionFactory.CreateConnectionPoolGroupOptions | Set connection pool CreateTimeout '{0}' when Authentication mode '{1}' is used.", connectionTimeout, opt.Authentication);
-                }
-
-                poolingOptions = new DbConnectionPoolGroupOptions(
-                    opt.IntegratedSecurity || opt.Authentication is SqlAuthenticationMethod.ActiveDirectoryIntegrated,
-                    opt.MinPoolSize,
-                    opt.MaxPoolSize,
-                    connectionTimeout,
-                    opt.LoadBalanceTimeout,
-                    opt.Enlist);
-            }
-            return poolingOptions;
-        }
-
         internal DbConnectionPoolGroupProviderInfo CreateConnectionPoolGroupProviderInfo(
             DbConnectionOptions connectionOptions) =>
             new SqlConnectionPoolGroupProviderInfo((SqlConnectionString)connectionOptions);
@@ -556,7 +498,7 @@ internal SqlConnectionString FindSqlConnectionOptions(SqlConnectionPoolKey key)
         }
 
         // @TODO: All these methods seem redundant ... shouldn't we always have a SqlConnection?
-        internal override DbConnectionPoolGroup GetConnectionPoolGroup(DbConnection connection)
+        internal DbConnectionPoolGroup GetConnectionPoolGroup(DbConnection connection)
         {
             SqlConnection c = (connection as SqlConnection);
             if (c != null)
@@ -566,7 +508,7 @@ internal override DbConnectionPoolGroup GetConnectionPoolGroup(DbConnection conn
             return null;
         }
 
-        internal override DbConnectionInternal GetInnerConnection(DbConnection connection)
+        internal DbConnectionInternal GetInnerConnection(DbConnection connection)
         {
             SqlConnection c = (connection as SqlConnection);
             if (c != null)
@@ -576,7 +518,7 @@ internal override DbConnectionInternal GetInnerConnection(DbConnection connectio
             return null;
         }
 
-        protected override int GetObjectId(DbConnection connection)
+        internal int GetObjectId(DbConnection connection)
         {
             SqlConnection c = (connection as SqlConnection);
             if (c != null)
@@ -586,7 +528,7 @@ protected override int GetObjectId(DbConnection connection)
             return 0;
         }
 
-        internal override void PermissionDemand(DbConnection outerConnection)
+        internal void PermissionDemand(DbConnection outerConnection)
         {
             SqlConnection c = (outerConnection as SqlConnection);
             if (c != null)
@@ -595,7 +537,7 @@ internal override void PermissionDemand(DbConnection outerConnection)
             }
         }
 
-        internal override void SetConnectionPoolGroup(DbConnection outerConnection, DbConnectionPoolGroup poolGroup)
+        internal void SetConnectionPoolGroup(DbConnection outerConnection, DbConnectionPoolGroup poolGroup)
         {
             SqlConnection c = (outerConnection as SqlConnection);
             if (c != null)
@@ -604,7 +546,7 @@ internal override void SetConnectionPoolGroup(DbConnection outerConnection, DbCo
             }
         }
 
-        internal override void SetInnerConnectionEvent(DbConnection owningObject, DbConnectionInternal to)
+        internal void SetInnerConnectionEvent(DbConnection owningObject, DbConnectionInternal to)
         {
             SqlConnection c = (owningObject as SqlConnection);
             if (c != null)
@@ -613,7 +555,7 @@ internal override void SetInnerConnectionEvent(DbConnection owningObject, DbConn
             }
         }
 
-        internal override bool SetInnerConnectionFrom(DbConnection owningObject, DbConnectionInternal to, DbConnectionInternal from)
+        internal bool SetInnerConnectionFrom(DbConnection owningObject, DbConnectionInternal to, DbConnectionInternal from)
         {
             SqlConnection c = (owningObject as SqlConnection);
             if (c != null)
@@ -623,7 +565,7 @@ internal override bool SetInnerConnectionFrom(DbConnection owningObject, DbConne
             return false;
         }
 
-        internal override void SetInnerConnectionTo(DbConnection owningObject, DbConnectionInternal to)
+        internal void SetInnerConnectionTo(DbConnection owningObject, DbConnectionInternal to)
         {
             SqlConnection c = (owningObject as SqlConnection);
             if (c != null)
@@ -757,6 +699,51 @@ private static SqlInternalConnectionTds CreateConnection(
                 key.AccessTokenCallback);
         }
 
+        private static DbConnectionPoolGroupOptions CreateConnectionPoolGroupOptions(SqlConnectionString connectionOptions)
+        {
+            SqlConnectionString opt = (SqlConnectionString)connectionOptions;
+
+            DbConnectionPoolGroupOptions poolingOptions = null;
+
+            if (opt.Pooling)
+            {    // never pool context connections.
+                int connectionTimeout = opt.ConnectTimeout;
+
+                if (connectionTimeout > 0 && connectionTimeout < int.MaxValue / 1000)
+                {
+                    connectionTimeout *= 1000;
+                }
+                else if (connectionTimeout >= int.MaxValue / 1000)
+                {
+                    connectionTimeout = int.MaxValue;
+                }
+                
+                if (opt.Authentication is SqlAuthenticationMethod.ActiveDirectoryInteractive
+                                       or SqlAuthenticationMethod.ActiveDirectoryDeviceCodeFlow)
+                {
+                    // interactive/device code flow mode will always have pool's CreateTimeout = 10 x ConnectTimeout.
+                    if (connectionTimeout >= Int32.MaxValue / 10)
+                    {
+                        connectionTimeout = Int32.MaxValue;
+                    }
+                    else
+                    {
+                        connectionTimeout *= 10;
+                    }
+                    SqlClientEventSource.Log.TryTraceEvent("SqlConnectionFactory.CreateConnectionPoolGroupOptions | Set connection pool CreateTimeout '{0}' when Authentication mode '{1}' is used.", connectionTimeout, opt.Authentication);
+                }
+
+                poolingOptions = new DbConnectionPoolGroupOptions(
+                    opt.IntegratedSecurity || opt.Authentication is SqlAuthenticationMethod.ActiveDirectoryIntegrated,
+                    opt.MinPoolSize,
+                    opt.MaxPoolSize,
+                    connectionTimeout,
+                    opt.LoadBalanceTimeout,
+                    opt.Enlist);
+            }
+            return poolingOptions;
+        }
+
         private static DbMetaDataFactory CreateMetaDataFactory(
             DbConnectionInternal internalConnection,
             out bool cacheMetaDataFactory)