Skip to content

Commit 2894c10

Browse files
committed
Address @mdaigle's comments
1 parent 36ee48c commit 2894c10

File tree

3 files changed

+5
-9
lines changed

3 files changed

+5
-9
lines changed

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -156,9 +156,7 @@ override protected DbCommand CreateDbCommand()
156156
{
157157
using (TryEventScope.Create("<prov.DbConnectionHelper.CreateDbCommand|API> {0}", ObjectID))
158158
{
159-
DbCommand command = null;
160-
DbProviderFactory providerFactory = SqlConnectionFactory.ProviderFactory;
161-
command = providerFactory.CreateCommand();
159+
DbCommand command = SqlClientFactory.Instance.CreateCommand();
162160
command.Connection = this;
163161
return command;
164162
}

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -203,17 +203,16 @@ override protected DbCommand CreateDbCommand()
203203
{
204204
using (TryEventScope.Create("<prov.DbConnectionHelper.CreateDbCommand|API> {0}", ObjectID))
205205
{
206-
DbProviderFactory providerFactory = SqlConnectionFactory.ProviderFactory;
207-
DbCommand command = providerFactory.CreateCommand();
206+
DbCommand command = SqlClientFactory.Instance.CreateCommand();
208207
command.Connection = this;
209208
return command;
210209
}
211210
}
212211

213212
private static System.Security.CodeAccessPermission CreateExecutePermission()
214213
{
215-
DBDataPermission p = (DBDataPermission)SqlConnectionFactory.ProviderFactory.CreatePermission(System.Security.Permissions.PermissionState.None);
216-
p.Add(String.Empty, String.Empty, KeyRestrictionBehavior.AllowOnly);
214+
DBDataPermission p = (DBDataPermission)SqlClientFactory.Instance.CreatePermission(System.Security.Permissions.PermissionState.None);
215+
p.Add(string.Empty, string.Empty, KeyRestrictionBehavior.AllowOnly);
217216
return p;
218217
}
219218

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222

2323
namespace Microsoft.Data.SqlClient
2424
{
25+
// @TODO: Facade pattern (interface, use interface, add constructor overloads for providing non-default interface, reseal)
2526
internal sealed class SqlConnectionFactory
2627
{
2728
#region Member Variables
@@ -67,8 +68,6 @@ private SqlConnectionFactory()
6768
#endregion
6869

6970
#region Properties
70-
71-
internal static DbProviderFactory ProviderFactory => SqlClientFactory.Instance;
7271

7372
internal static SqlConnectionFactory Instance { get; } = new SqlConnectionFactory();
7473

0 commit comments

Comments
 (0)