Skip to content

Commit 5a0b1e8

Browse files
benrr101benrr101
committed
Move properties over
1 parent 9a4af4c commit 5a0b1e8

File tree

6 files changed

+26
-22
lines changed

6 files changed

+26
-22
lines changed

‎src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlConnection.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1272,7 +1272,7 @@ public override void ChangeDatabase(string database)
12721272
/// <include file='../../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml' path='docs/members[@name="SqlConnection"]/ClearAllPools/*' />
12731273
public static void ClearAllPools()
12741274
{
1275-
SqlConnectionFactory.SingletonInstance.ClearAllPools();
1275+
SqlConnectionFactory.Instance.ClearAllPools();
12761276
}
12771277

12781278
/// <include file='../../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml' path='docs/members[@name="SqlConnection"]/ClearPool/*' />
@@ -1283,7 +1283,7 @@ public static void ClearPool(SqlConnection connection)
12831283
DbConnectionOptions connectionOptions = connection.UserConnectionOptions;
12841284
if (connectionOptions != null)
12851285
{
1286-
SqlConnectionFactory.SingletonInstance.ClearPool(connection);
1286+
SqlConnectionFactory.Instance.ClearPool(connection);
12871287
}
12881288
}
12891289

@@ -2265,7 +2265,7 @@ public static void ChangePassword(string connectionString, string newPassword)
22652265

22662266
SqlConnectionPoolKey key = new SqlConnectionPoolKey(connectionString, credential: null, accessToken: null, accessTokenCallback: null);
22672267

2268-
SqlConnectionString connectionOptions = SqlConnectionFactory.FindSqlConnectionOptions(key);
2268+
SqlConnectionString connectionOptions = SqlConnectionFactory.Instance.FindSqlConnectionOptions(key);
22692269
if (connectionOptions.IntegratedSecurity)
22702270
{
22712271
throw SQL.ChangePasswordConflictsWithSSPI();
@@ -2314,7 +2314,7 @@ public static void ChangePassword(string connectionString, SqlCredential credent
23142314

23152315
SqlConnectionPoolKey key = new SqlConnectionPoolKey(connectionString, credential, accessToken: null, accessTokenCallback: null);
23162316

2317-
SqlConnectionString connectionOptions = SqlConnectionFactory.FindSqlConnectionOptions(key);
2317+
SqlConnectionString connectionOptions = SqlConnectionFactory.Instance.FindSqlConnectionOptions(key);
23182318

23192319
// Check for connection string values incompatible with SqlCredential
23202320
if (!string.IsNullOrEmpty(connectionOptions.UserID) || !string.IsNullOrEmpty(connectionOptions.Password))
@@ -2352,7 +2352,7 @@ private static void ChangePassword(string connectionString, SqlConnectionString
23522352
}
23532353
SqlConnectionPoolKey key = new SqlConnectionPoolKey(connectionString, credential, accessToken: null, accessTokenCallback: null);
23542354

2355-
SqlConnectionFactory.SingletonInstance.ClearPool(key);
2355+
SqlConnectionFactory.Instance.ClearPool(key);
23562356
}
23572357

23582358
internal Task<T> RegisterForConnectionCloseNotification<T>(Task<T> outerTask, object value, int tag)

‎src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlConnectionHelper.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ namespace Microsoft.Data.SqlClient
1717
{
1818
public sealed partial class SqlConnection : DbConnection
1919
{
20-
private static readonly SqlConnectionFactory s_connectionFactory = SqlConnectionFactory.SingletonInstance;
20+
private static readonly SqlConnectionFactory s_connectionFactory = SqlConnectionFactory.Instance;
2121

2222
private DbConnectionOptions _userConnectionOptions;
2323
private DbConnectionPoolGroup _poolGroup;
@@ -157,7 +157,7 @@ override protected DbCommand CreateDbCommand()
157157
using (TryEventScope.Create("<prov.DbConnectionHelper.CreateDbCommand|API> {0}", ObjectID))
158158
{
159159
DbCommand command = null;
160-
DbProviderFactory providerFactory = ConnectionFactory.ProviderFactory;
160+
DbProviderFactory providerFactory = SqlConnectionFactory.ProviderFactory;
161161
command = providerFactory.CreateCommand();
162162
command.Connection = this;
163163
return command;

‎src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlConnection.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1266,7 +1266,7 @@ public override void ChangeDatabase(string database)
12661266
public static void ClearAllPools()
12671267
{
12681268
(new SqlClientPermission(PermissionState.Unrestricted)).Demand();
1269-
SqlConnectionFactory.SingletonInstance.ClearAllPools();
1269+
SqlConnectionFactory.Instance.ClearAllPools();
12701270
}
12711271

12721272
/// <include file='../../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml' path='docs/members[@name="SqlConnection"]/ClearPool/*' />
@@ -1278,7 +1278,7 @@ public static void ClearPool(SqlConnection connection)
12781278
if (connectionOptions != null)
12791279
{
12801280
connectionOptions.DemandPermission();
1281-
SqlConnectionFactory.SingletonInstance.ClearPool(connection);
1281+
SqlConnectionFactory.Instance.ClearPool(connection);
12821282
}
12831283
}
12841284

@@ -2290,7 +2290,7 @@ private static void ChangePassword(string connectionString, SqlConnectionString
22902290
}
22912291
SqlConnectionPoolKey key = new SqlConnectionPoolKey(connectionString, credential, accessToken: null, accessTokenCallback: null);
22922292

2293-
SqlConnectionFactory.SingletonInstance.ClearPool(key);
2293+
SqlConnectionFactory.Instance.ClearPool(key);
22942294
}
22952295

22962296
internal Task<T> RegisterForConnectionCloseNotification<T>(Task<T> outerTask, object value, int tag)

‎src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlConnectionHelper.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ namespace Microsoft.Data.SqlClient
1818
{
1919
public sealed partial class SqlConnection : DbConnection
2020
{
21-
private static readonly SqlConnectionFactory _connectionFactory = SqlConnectionFactory.SingletonInstance;
21+
private static readonly SqlConnectionFactory _connectionFactory = SqlConnectionFactory.Instance;
2222
internal static readonly System.Security.CodeAccessPermission ExecutePermission = SqlConnection.CreateExecutePermission();
2323

2424
private DbConnectionOptions _userConnectionOptions;
@@ -203,7 +203,7 @@ override protected DbCommand CreateDbCommand()
203203
{
204204
using (TryEventScope.Create("<prov.DbConnectionHelper.CreateDbCommand|API> {0}", ObjectID))
205205
{
206-
DbProviderFactory providerFactory = ConnectionFactory.ProviderFactory;
206+
DbProviderFactory providerFactory = SqlConnectionFactory.ProviderFactory;
207207
DbCommand command = providerFactory.CreateCommand();
208208
command.Connection = this;
209209
return command;
@@ -212,7 +212,7 @@ override protected DbCommand CreateDbCommand()
212212

213213
private static System.Security.CodeAccessPermission CreateExecutePermission()
214214
{
215-
DBDataPermission p = (DBDataPermission)SqlConnectionFactory.SingletonInstance.ProviderFactory.CreatePermission(System.Security.Permissions.PermissionState.None);
215+
DBDataPermission p = (DBDataPermission)SqlConnectionFactory.ProviderFactory.CreatePermission(System.Security.Permissions.PermissionState.None);
216216
p.Add(String.Empty, String.Empty, KeyRestrictionBehavior.AllowOnly);
217217
return p;
218218
}

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ namespace Microsoft.Data.ProviderBase
1818
{
1919
internal abstract class DbConnectionFactory
2020
{
21-
internal int ObjectID { get; } = Interlocked.Increment(ref _objectTypeCount);
22-
2321
public void ClearAllPools()
2422
{
2523
using (TryEventScope.Create(nameof(SqlConnectionFactory)))
@@ -479,7 +477,7 @@ internal DbMetaDataFactory GetMetaDataFactory(DbConnectionPoolGroup connectionPo
479477
return metaDataFactory;
480478
}
481479

482-
private void PruneConnectionPoolGroups(object state)
480+
protected void PruneConnectionPoolGroups(object state)
483481
{
484482
// when debugging this method, expect multiple threads at the same time
485483
SqlClientEventSource.Log.TryAdvancedTraceEvent("<prov.DbConnectionFactory.PruneConnectionPoolGroups|RES|INFO|CPOOL> {0}", ObjectID);

‎src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionFactory.cs

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ private SqlConnectionFactory()
5151
_poolsToRelease = new List<IDbConnectionPool>();
5252
_poolGroupsToRelease = new List<DbConnectionPoolGroup>();
5353
_pruningTimer = ADP.UnsafeCreateTimer(
54-
new TimerCallback(PruneConnectionPoolGroups),
54+
PruneConnectionPoolGroups,
5555
state: null,
5656
PruningDueTime,
5757
PruningPeriod);
@@ -62,11 +62,17 @@ private SqlConnectionFactory()
6262
}
6363

6464
#endregion
65+
66+
#region Properties
6567

66-
public static readonly SqlConnectionFactory SingletonInstance = new SqlConnectionFactory();
67-
68-
public DbProviderFactory ProviderFactory => SqlClientFactory.Instance;
68+
internal static DbProviderFactory ProviderFactory => SqlClientFactory.Instance;
69+
70+
internal static SqlConnectionFactory Instance { get; } = new SqlConnectionFactory();
6971

72+
internal int ObjectId { get; } = Interlocked.Increment(ref s_objectTypeCount);
73+
74+
#endregion
75+
7076
protected override DbConnectionInternal CreateConnection(
7177
DbConnectionOptions options,
7278
DbConnectionPoolKey poolKey,
@@ -260,9 +266,9 @@ internal override DbConnectionPoolGroupProviderInfo CreateConnectionPoolGroupPro
260266
return new SqlConnectionPoolGroupProviderInfo((SqlConnectionString)connectionOptions);
261267
}
262268

263-
internal static SqlConnectionString FindSqlConnectionOptions(SqlConnectionPoolKey key)
269+
internal SqlConnectionString FindSqlConnectionOptions(SqlConnectionPoolKey key)
264270
{
265-
SqlConnectionString connectionOptions = (SqlConnectionString)SingletonInstance.FindConnectionOptions(key);
271+
SqlConnectionString connectionOptions = (SqlConnectionString)FindConnectionOptions(key);
266272
if (connectionOptions == null)
267273
{
268274
connectionOptions = new SqlConnectionString(key.ConnectionString);

0 commit comments

Comments
 (0)