Skip to content

Commit 072f318

Browse files
benrr101benrr101
authored
Merge | DbConnectionOptions Prep Work (#3343)
* Remove KEY and SYNONYM static classes replace with DbConnectionStringKeywords and DbConnectionStringSynonyms Some light cleanup for nearby code * Extract debug code into its own partial * Move DbConnectionOptions into ConnectionString subfolder Drop common from filename * Move netfx DbConnectionOptions to ConnectionString subfolder, add netfx suffix Change reference to common project DbConnectionOptions.cs * Move netcore DbConnectionOptions to ConnectionString subfolder, add netcore suffix Change reference to common project DbConnectionOptions.cs * Bring all DbConnectionOptions files into the respective projects, move all instances to ConnectionString namespace * Patch up references to DbConnectionOptions in common and netcore project * Patch up references to DbConnectionOptions in common and netfx project * Cleanup of debug partial * Fix broken file link * I don't see why the build would be failing ... pretty sure I fixed that issue
1 parent b68f44a commit 072f318

20 files changed

+303
-286
lines changed

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,12 @@
5353
<Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\ConnectionString\AttestationProtocolUtilities.cs">
5454
<Link>Microsoft\Data\Common\ConnectionString\AttestationProtocolUtilities.cs</Link>
5555
</Compile>
56+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\ConnectionString\DbConnectionOptions.cs">
57+
<Link>Microsoft\Data\Common\ConnectionString\DbConnectionOptions.cs</Link>
58+
</Compile>
59+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\ConnectionString\DbConnectionOptions.Debug.cs">
60+
<Link>Microsoft\Data\Common\ConnectionString\DbConnectionOptions.Debug.cs</Link>
61+
</Compile>
5662
<Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\ConnectionString\DbConnectionStringDefaults.cs">
5763
<Link>Microsoft\Data\Common\ConnectionString\DbConnectionStringDefaults.cs</Link>
5864
</Compile>
@@ -71,9 +77,6 @@
7177
<Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\ConnectionString\PoolBlockingUtilities.cs">
7278
<Link>Microsoft\Data\Common\ConnectionString\PoolBlockingUtilities.cs</Link>
7379
</Compile>
74-
<Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\DbConnectionOptions.Common.cs">
75-
<Link>Microsoft\Data\Common\DbConnectionOptions.Common.cs</Link>
76-
</Compile>
7780
<Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\MultipartIdentifier.cs">
7881
<Link>Microsoft\Data\Common\MultipartIdentifier.cs</Link>
7982
</Compile>
@@ -728,7 +731,8 @@
728731
<Compile Include="$(CommonSourceRoot)System\Diagnostics\CodeAnalysis.cs">
729732
<Link>System\Diagnostics\CodeAnalysis.cs</Link>
730733
</Compile>
731-
<Compile Include="Microsoft\Data\Common\DbConnectionOptions.cs" />
734+
735+
<Compile Include="Microsoft\Data\Common\ConnectionString\DbConnectionOptions.netcore.cs" />
732736
<Compile Include="Microsoft\Data\SqlClient\SNI\ConcurrentQueueSemaphore.cs" />
733737
<Compile Include="Microsoft\Data\SqlClient\SNI\SNIError.cs" />
734738
<Compile Include="Microsoft\Data\SqlClient\SNI\SNICommon.cs" />

‎src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/Common/DbConnectionOptions.cs renamed to ‎src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/Common/ConnectionString/DbConnectionOptions.netcore.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@
55
using System;
66
using System.IO;
77
using System.Text;
8-
using Microsoft.Data.Common.ConnectionString;
98

10-
namespace Microsoft.Data.Common
9+
namespace Microsoft.Data.Common.ConnectionString
1110
{
1211
internal partial class DbConnectionOptions
1312
{

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
using System.Threading;
1919
using System.Threading.Tasks;
2020
using Microsoft.Data.Common;
21+
using Microsoft.Data.Common.ConnectionString;
2122
using Microsoft.Data.ProviderBase;
2223
using Microsoft.Data.SqlClient.ConnectionPool;
2324
using Microsoft.Data.SqlClient.Diagnostics;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
using System.Diagnostics;
88
using System.IO;
99
using Microsoft.Data.Common;
10+
using Microsoft.Data.Common.ConnectionString;
1011
using Microsoft.Data.ProviderBase;
1112
using Microsoft.Data.SqlClient.ConnectionPool;
1213

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
using System.Threading;
1010
using System.Transactions;
1111
using Microsoft.Data.Common;
12+
using Microsoft.Data.Common.ConnectionString;
1213
using Microsoft.Data.ProviderBase;
1314
using Microsoft.Data.SqlClient.ConnectionPool;
1415

15-
1616
namespace Microsoft.Data.SqlClient
1717
{
1818
public sealed partial class SqlConnection : DbConnection

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99
using System.Diagnostics.CodeAnalysis;
1010
using System.Globalization;
1111
using System.Net.Http.Headers;
12-
using System.Runtime.CompilerServices;
1312
using System.Security;
1413
using System.Text;
1514
using System.Threading;
1615
using System.Threading.Tasks;
1716
using System.Transactions;
1817
using Microsoft.Data.Common;
18+
using Microsoft.Data.Common.ConnectionString;
1919
using Microsoft.Data.ProviderBase;
2020
using Microsoft.Data.SqlClient.ConnectionPool;
2121
using Microsoft.Identity.Client;

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,12 @@
237237
<Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\ConnectionString\AttestationProtocolUtilities.cs">
238238
<Link>Microsoft\Data\Common\ConnectionString\AttestationProtocolUtilities.cs</Link>
239239
</Compile>
240+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\ConnectionString\DbConnectionOptions.cs">
241+
<Link>Microsoft\Data\Common\ConnectionString\DbConnectionOptions.cs</Link>
242+
</Compile>
243+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\ConnectionString\DbConnectionOptions.Debug.cs">
244+
<Link>Microsoft\Data\Common\ConnectionString\DbConnectionOptions.Debug.cs</Link>
245+
</Compile>
240246
<Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\ConnectionString\DbConnectionStringDefaults.cs">
241247
<Link>Microsoft\Data\Common\ConnectionString\DbConnectionStringDefaults.cs</Link>
242248
</Compile>
@@ -255,9 +261,6 @@
255261
<Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\ConnectionString\PoolBlockingUtilities.cs">
256262
<Link>Microsoft\Data\Common\ConnectionString\PoolBlockingUtilities.cs</Link>
257263
</Compile>
258-
<Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\DbConnectionOptions.Common.cs">
259-
<Link>Microsoft\Data\Common\DbConnectionOptions.Common.cs</Link>
260-
</Compile>
261264
<Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\MultipartIdentifier.cs">
262265
<Link>Microsoft\Data\Common\MultipartIdentifier.cs</Link>
263266
</Compile>
@@ -938,7 +941,7 @@
938941
</Compile>
939942
</ItemGroup>
940943
<ItemGroup>
941-
<Compile Include="Microsoft\Data\Common\DbConnectionOptions.cs" />
944+
<Compile Include="Microsoft\Data\Common\ConnectionString\DbConnectionOptions.netfx.cs" />
942945
<Compile Include="Microsoft\Data\Common\DbConnectionString.cs" />
943946
<Compile Include="Microsoft\Data\SqlClient\SqlBulkCopy.cs" />
944947
<Compile Include="Microsoft\Data\SqlClient\SqlClientWrapperSmiStream.cs" />

‎src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/Common/DbConnectionOptions.cs renamed to ‎src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/Common/ConnectionString/DbConnectionOptions.netfx.cs

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
using System.Text;
99
using Microsoft.Data.Common.ConnectionString;
1010

11-
namespace Microsoft.Data.Common
11+
namespace Microsoft.Data.Common.ConnectionString
1212
{
1313
internal partial class DbConnectionOptions
1414
{
@@ -33,20 +33,18 @@ internal bool HasBlankPassword
3333
{
3434
if (!ConvertValueToIntegratedSecurity())
3535
{
36-
if (_parsetable.ContainsKey(KEY.Password))
36+
if (_parsetable.TryGetValue(DbConnectionStringKeywords.Password, out string value))
3737
{
38-
return string.IsNullOrEmpty(_parsetable[KEY.Password]);
38+
return string.IsNullOrEmpty(value);
3939
}
40-
else
41-
if (_parsetable.ContainsKey(SYNONYM.Pwd))
40+
41+
if (_parsetable.TryGetValue(DbConnectionStringSynonyms.Pwd, out value))
4242
{
43-
return string.IsNullOrEmpty(_parsetable[SYNONYM.Pwd]); // MDAC 83097
44-
}
45-
else
46-
{
47-
return (_parsetable.ContainsKey(KEY.User_ID) && !string.IsNullOrEmpty(_parsetable[KEY.User_ID])) ||
48-
(_parsetable.ContainsKey(SYNONYM.UID) && !string.IsNullOrEmpty(_parsetable[SYNONYM.UID]));
43+
return string.IsNullOrEmpty(value); // MDAC 83097
4944
}
45+
46+
return (_parsetable.TryGetValue(DbConnectionStringKeywords.UserID, out value) && !string.IsNullOrEmpty(value)) ||
47+
(_parsetable.TryGetValue(DbConnectionStringSynonyms.UID, out value) && !string.IsNullOrEmpty(value));
5048
}
5149
return false;
5250
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
using System.Threading;
2323
using System.Threading.Tasks;
2424
using Microsoft.Data.Common;
25+
using Microsoft.Data.Common.ConnectionString;
2526
using Microsoft.Data.ProviderBase;
2627
using Microsoft.Data.SqlClient.ConnectionPool;
2728
using Microsoft.SqlServer.Server;

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,11 @@
33
// See the LICENSE file in the project root for more information.
44

55
using System;
6-
using System.Collections.Specialized;
7-
using System.Configuration;
86
using System.Data.Common;
97
using System.Diagnostics;
108
using System.IO;
11-
using System.Runtime.Versioning;
129
using Microsoft.Data.Common;
10+
using Microsoft.Data.Common.ConnectionString;
1311
using Microsoft.Data.ProviderBase;
1412
using Microsoft.Data.SqlClient.ConnectionPool;
1513
using Microsoft.Data.SqlClient.Server;

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

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,20 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33
// See the LICENSE file in the project root for more information.
44

5+
using System;
6+
using System.Data;
7+
using System.Data.Common;
8+
using System.Diagnostics;
9+
using System.Runtime.ConstrainedExecution;
10+
using System.Threading;
11+
using System.Transactions;
12+
using Microsoft.Data.Common;
13+
using Microsoft.Data.Common.ConnectionString;
14+
using Microsoft.Data.ProviderBase;
15+
using Microsoft.Data.SqlClient.ConnectionPool;
16+
517
namespace Microsoft.Data.SqlClient
618
{
7-
using System;
8-
using System.Data;
9-
using System.Data.Common;
10-
using System.Diagnostics;
11-
using System.Runtime.ConstrainedExecution;
12-
using System.Threading;
13-
using System.Transactions;
14-
using Microsoft.Data.Common;
15-
using Microsoft.Data.ProviderBase;
16-
using Microsoft.Data.SqlClient.ConnectionPool;
17-
1819
public sealed partial class SqlConnection : DbConnection
1920
{
2021
private static readonly DbConnectionFactory _connectionFactory = SqlConnectionFactory.SingletonInstance;

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
using System.Threading.Tasks;
1717
using System.Transactions;
1818
using Microsoft.Data.Common;
19+
using Microsoft.Data.Common.ConnectionString;
1920
using Microsoft.Data.ProviderBase;
2021
using Microsoft.Data.SqlClient.ConnectionPool;
2122
using Microsoft.Identity.Client;
@@ -694,7 +695,7 @@ internal override bool IsLockedForBulkCopy
694695
}
695696
}
696697

697-
internal protected override bool IsNonPoolableTransactionRoot
698+
protected internal override bool IsNonPoolableTransactionRoot
698699
{
699700
get
700701
{

0 commit comments

Comments
 (0)