Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit6695ecd

Browse files
authored
Merge | DbConnectionString.Common (#3256)
* Split DbConnectionStringCommon classes into separate classes (will deal with utils in a bit)* Wire up moved files* Splitting remaining common class, moving "common" class to ConnectionString namespace and renaming to sync class/file name.
1 parente472d4d commit6695ecd

22 files changed

+1354
-1239
lines changed

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

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,30 @@
5050
<CompileInclude="$(CommonSourceRoot)Microsoft\Data\Common\BitConverterCompatible.cs">
5151
<Link>Microsoft\Data\Common\BitConverterCompatible.cs</Link>
5252
</Compile>
53+
<CompileInclude="$(CommonSourceRoot)Microsoft\Data\Common\ConnectionString\AttestationProtocolUtilities.cs">
54+
<Link>Microsoft\Data\Common\ConnectionString\AttestationProtocolUtilities.cs</Link>
55+
</Compile>
56+
<CompileInclude="$(CommonSourceRoot)Microsoft\Data\Common\ConnectionString\DbConnectionStringDefaults.cs">
57+
<Link>Microsoft\Data\Common\ConnectionString\DbConnectionStringDefaults.cs</Link>
58+
</Compile>
59+
<CompileInclude="$(CommonSourceRoot)Microsoft\Data\Common\ConnectionString\DbConnectionStringKeywords.cs">
60+
<Link>Microsoft\Data\Common\ConnectionString\DbConnectionStringKeywords.cs</Link>
61+
</Compile>
62+
<CompileInclude="$(CommonSourceRoot)Microsoft\Data\Common\ConnectionString\DbConnectionStringSynonyms.cs">
63+
<Link>Microsoft\Data\Common\ConnectionString\DbConnectionStringSynonyms.cs</Link>
64+
</Compile>
65+
<CompileInclude="$(CommonSourceRoot)Microsoft\Data\Common\ConnectionString\DbConnectionStringUtilities.cs">
66+
<Link>Microsoft\Data\Common\ConnectionString\DbConnectionStringUtilities.cs</Link>
67+
</Compile>
68+
<CompileInclude="$(CommonSourceRoot)Microsoft\Data\Common\ConnectionString\IpAddressPreferenceUtilities.cs">
69+
<Link>Microsoft\Data\Common\ConnectionString\IpAddressPreferenceUtilities.cs</Link>
70+
</Compile>
71+
<CompileInclude="$(CommonSourceRoot)Microsoft\Data\Common\ConnectionString\PoolBlockingUtilities.cs">
72+
<Link>Microsoft\Data\Common\ConnectionString\PoolBlockingUtilities.cs</Link>
73+
</Compile>
5374
<CompileInclude="$(CommonSourceRoot)Microsoft\Data\Common\DbConnectionOptions.Common.cs">
5475
<Link>Microsoft\Data\Common\DbConnectionOptions.Common.cs</Link>
5576
</Compile>
56-
<CompileInclude="$(CommonSourceRoot)Microsoft\Data\Common\DbConnectionStringCommon.cs">
57-
<Link>Microsoft\Data\Common\DbConnectionStringCommon.cs</Link>
58-
</Compile>
5977
<CompileInclude="$(CommonSourceRoot)Microsoft\Data\Common\MultipartIdentifier.cs">
6078
<Link>Microsoft\Data\Common\MultipartIdentifier.cs</Link>
6179
</Compile>

‎src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/Common/DbConnectionOptions.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
usingSystem;
66
usingSystem.IO;
77
usingSystem.Text;
8+
usingMicrosoft.Data.Common.ConnectionString;
89

910
namespaceMicrosoft.Data.Common
1011
{

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -194,19 +194,19 @@ public SqlConnection(string connectionString, SqlCredential credential) : this()
194194
}
195195
elseif(UsesActiveDirectoryManagedIdentity(connectionOptions))
196196
{
197-
throwSQL.SettingCredentialWithNonInteractiveArgument(DbConnectionStringBuilderUtil.ActiveDirectoryManagedIdentityString);
197+
throwSQL.SettingCredentialWithNonInteractiveArgument(DbConnectionStringUtilities.ActiveDirectoryManagedIdentityString);
198198
}
199199
elseif(UsesActiveDirectoryMSI(connectionOptions))
200200
{
201-
throwSQL.SettingCredentialWithNonInteractiveArgument(DbConnectionStringBuilderUtil.ActiveDirectoryMSIString);
201+
throwSQL.SettingCredentialWithNonInteractiveArgument(DbConnectionStringUtilities.ActiveDirectoryMSIString);
202202
}
203203
elseif(UsesActiveDirectoryDefault(connectionOptions))
204204
{
205-
throwSQL.SettingCredentialWithNonInteractiveArgument(DbConnectionStringBuilderUtil.ActiveDirectoryDefaultString);
205+
throwSQL.SettingCredentialWithNonInteractiveArgument(DbConnectionStringUtilities.ActiveDirectoryDefaultString);
206206
}
207207
elseif(UsesActiveDirectoryWorkloadIdentity(connectionOptions))
208208
{
209-
throwSQL.SettingCredentialWithNonInteractiveArgument(DbConnectionStringBuilderUtil.ActiveDirectoryWorkloadIdentityString);
209+
throwSQL.SettingCredentialWithNonInteractiveArgument(DbConnectionStringUtilities.ActiveDirectoryWorkloadIdentityString);
210210
}
211211

212212
Credential=credential;
@@ -621,19 +621,19 @@ public override string ConnectionString
621621
}
622622
elseif(UsesActiveDirectoryManagedIdentity(connectionOptions))
623623
{
624-
throwSQL.SettingNonInteractiveWithCredential(DbConnectionStringBuilderUtil.ActiveDirectoryManagedIdentityString);
624+
throwSQL.SettingNonInteractiveWithCredential(DbConnectionStringUtilities.ActiveDirectoryManagedIdentityString);
625625
}
626626
elseif(UsesActiveDirectoryMSI(connectionOptions))
627627
{
628-
throwSQL.SettingNonInteractiveWithCredential(DbConnectionStringBuilderUtil.ActiveDirectoryMSIString);
628+
throwSQL.SettingNonInteractiveWithCredential(DbConnectionStringUtilities.ActiveDirectoryMSIString);
629629
}
630630
elseif(UsesActiveDirectoryDefault(connectionOptions))
631631
{
632-
throwSQL.SettingNonInteractiveWithCredential(DbConnectionStringBuilderUtil.ActiveDirectoryDefaultString);
632+
throwSQL.SettingNonInteractiveWithCredential(DbConnectionStringUtilities.ActiveDirectoryDefaultString);
633633
}
634634
elseif(UsesActiveDirectoryWorkloadIdentity(connectionOptions))
635635
{
636-
throwSQL.SettingNonInteractiveWithCredential(DbConnectionStringBuilderUtil.ActiveDirectoryWorkloadIdentityString);
636+
throwSQL.SettingNonInteractiveWithCredential(DbConnectionStringUtilities.ActiveDirectoryWorkloadIdentityString);
637637
}
638638

639639
CheckAndThrowOnInvalidCombinationOfConnectionStringAndSqlCredential(connectionOptions);
@@ -1005,19 +1005,19 @@ public SqlCredential Credential
10051005
}
10061006
elseif(UsesActiveDirectoryManagedIdentity(connectionOptions))
10071007
{
1008-
throwSQL.SettingCredentialWithNonInteractiveInvalid(DbConnectionStringBuilderUtil.ActiveDirectoryManagedIdentityString);
1008+
throwSQL.SettingCredentialWithNonInteractiveInvalid(DbConnectionStringUtilities.ActiveDirectoryManagedIdentityString);
10091009
}
10101010
elseif(UsesActiveDirectoryMSI(connectionOptions))
10111011
{
1012-
throwSQL.SettingCredentialWithNonInteractiveInvalid(DbConnectionStringBuilderUtil.ActiveDirectoryMSIString);
1012+
throwSQL.SettingCredentialWithNonInteractiveInvalid(DbConnectionStringUtilities.ActiveDirectoryMSIString);
10131013
}
10141014
elseif(UsesActiveDirectoryDefault(connectionOptions))
10151015
{
1016-
throwSQL.SettingCredentialWithNonInteractiveInvalid(DbConnectionStringBuilderUtil.ActiveDirectoryDefaultString);
1016+
throwSQL.SettingCredentialWithNonInteractiveInvalid(DbConnectionStringUtilities.ActiveDirectoryDefaultString);
10171017
}
10181018
elseif(UsesActiveDirectoryWorkloadIdentity(connectionOptions))
10191019
{
1020-
throwSQL.SettingCredentialWithNonInteractiveInvalid(DbConnectionStringBuilderUtil.ActiveDirectoryWorkloadIdentityString);
1020+
throwSQL.SettingCredentialWithNonInteractiveInvalid(DbConnectionStringUtilities.ActiveDirectoryWorkloadIdentityString);
10211021
}
10221022

10231023
CheckAndThrowOnInvalidCombinationOfConnectionStringAndSqlCredential(connectionOptions);

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

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -234,8 +234,26 @@
234234
<CompileInclude="$(CommonSourceRoot)Microsoft\Data\Common\BitConverterCompatible.cs">
235235
<Link>Microsoft\Data\Common\BitConverterCompatible.cs</Link>
236236
</Compile>
237-
<CompileInclude="$(CommonSourceRoot)Microsoft\Data\Common\DbConnectionStringCommon.cs">
238-
<Link>Microsoft\Data\Common\DbConnectionStringCommon.cs</Link>
237+
<CompileInclude="$(CommonSourceRoot)Microsoft\Data\Common\ConnectionString\AttestationProtocolUtilities.cs">
238+
<Link>Microsoft\Data\Common\ConnectionString\AttestationProtocolUtilities.cs</Link>
239+
</Compile>
240+
<CompileInclude="$(CommonSourceRoot)Microsoft\Data\Common\ConnectionString\DbConnectionStringDefaults.cs">
241+
<Link>Microsoft\Data\Common\ConnectionString\DbConnectionStringDefaults.cs</Link>
242+
</Compile>
243+
<CompileInclude="$(CommonSourceRoot)Microsoft\Data\Common\ConnectionString\DbConnectionStringKeywords.cs">
244+
<Link>Microsoft\Data\Common\ConnectionString\DbConnectionStringKeywords.cs</Link>
245+
</Compile>
246+
<CompileInclude="$(CommonSourceRoot)Microsoft\Data\Common\ConnectionString\DbConnectionStringSynonyms.cs">
247+
<Link>Microsoft\Data\Common\ConnectionString\DbConnectionStringSynonyms.cs</Link>
248+
</Compile>
249+
<CompileInclude="$(CommonSourceRoot)Microsoft\Data\Common\ConnectionString\DbConnectionStringUtilities.cs">
250+
<Link>Microsoft\Data\Common\ConnectionString\DbConnectionStringUtilities.cs</Link>
251+
</Compile>
252+
<CompileInclude="$(CommonSourceRoot)Microsoft\Data\Common\ConnectionString\IpAddressPreferenceUtilities.cs">
253+
<Link>Microsoft\Data\Common\ConnectionString\IpAddressPreferenceUtilities.cs</Link>
254+
</Compile>
255+
<CompileInclude="$(CommonSourceRoot)Microsoft\Data\Common\ConnectionString\PoolBlockingUtilities.cs">
256+
<Link>Microsoft\Data\Common\ConnectionString\PoolBlockingUtilities.cs</Link>
239257
</Compile>
240258
<CompileInclude="$(CommonSourceRoot)Microsoft\Data\Common\DbConnectionOptions.Common.cs">
241259
<Link>Microsoft\Data\Common\DbConnectionOptions.Common.cs</Link>

‎src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/Common/DBConnectionString.cs

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,24 @@
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+
usingSystem;
6+
usingSystem.Collections.Generic;
7+
usingSystem.Data;
8+
usingSystem.Diagnostics;
9+
usingSystem.Text;
10+
usingMicrosoft.Data.Common.ConnectionString;
11+
usingMicrosoft.Data.SqlClient;
12+
513
namespaceMicrosoft.Data.Common
614
{
7-
8-
usingSystem;
9-
usingSystem.Collections.Generic;
10-
usingSystem.Data;
11-
usingSystem.Diagnostics;
12-
usingSystem.Text;
13-
usingMicrosoft.Data.SqlClient;
14-
1515
[Serializable]// MDAC 83147
1616
internalsealedclassDBConnectionString
1717
{
1818
// instances of this class are intended to be immutable, i.e readonly
1919
// used by permission classes so it is much easier to verify correctness
2020
// when not worried about the class being modified during execution
2121

22+
// @TODO: Remove in favor of DbConnectionStringKeywords
2223
privatestaticclassKEY
2324
{
2425
internalconststringPassword=DbConnectionStringKeywords.Password;

‎src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/Common/DbConnectionOptions.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
usingSystem.Runtime.Versioning;
77
usingSystem.Security;
88
usingSystem.Text;
9+
usingMicrosoft.Data.Common.ConnectionString;
910

1011
namespaceMicrosoft.Data.Common
1112
{

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -388,22 +388,22 @@ public SqlConnection(string connectionString, SqlCredential credential) : this()
388388

389389
if(UsesActiveDirectoryManagedIdentity(connectionOptions))
390390
{
391-
throwSQL.SettingCredentialWithNonInteractiveArgument(DbConnectionStringBuilderUtil.ActiveDirectoryManagedIdentityString);
391+
throwSQL.SettingCredentialWithNonInteractiveArgument(DbConnectionStringUtilities.ActiveDirectoryManagedIdentityString);
392392
}
393393

394394
if(UsesActiveDirectoryMSI(connectionOptions))
395395
{
396-
throwSQL.SettingCredentialWithNonInteractiveArgument(DbConnectionStringBuilderUtil.ActiveDirectoryMSIString);
396+
throwSQL.SettingCredentialWithNonInteractiveArgument(DbConnectionStringUtilities.ActiveDirectoryMSIString);
397397
}
398398

399399
if(UsesActiveDirectoryDefault(connectionOptions))
400400
{
401-
throwSQL.SettingCredentialWithNonInteractiveArgument(DbConnectionStringBuilderUtil.ActiveDirectoryDefaultString);
401+
throwSQL.SettingCredentialWithNonInteractiveArgument(DbConnectionStringUtilities.ActiveDirectoryDefaultString);
402402
}
403403

404404
if(UsesActiveDirectoryWorkloadIdentity(connectionOptions))
405405
{
406-
throwSQL.SettingCredentialWithNonInteractiveArgument(DbConnectionStringBuilderUtil.ActiveDirectoryWorkloadIdentityString);
406+
throwSQL.SettingCredentialWithNonInteractiveArgument(DbConnectionStringUtilities.ActiveDirectoryWorkloadIdentityString);
407407
}
408408

409409
Credential=credential;
@@ -823,19 +823,19 @@ override public string ConnectionString
823823
}
824824
elseif(UsesActiveDirectoryManagedIdentity(connectionOptions))
825825
{
826-
throwSQL.SettingNonInteractiveWithCredential(DbConnectionStringBuilderUtil.ActiveDirectoryManagedIdentityString);
826+
throwSQL.SettingNonInteractiveWithCredential(DbConnectionStringUtilities.ActiveDirectoryManagedIdentityString);
827827
}
828828
elseif(UsesActiveDirectoryMSI(connectionOptions))
829829
{
830-
throwSQL.SettingNonInteractiveWithCredential(DbConnectionStringBuilderUtil.ActiveDirectoryMSIString);
830+
throwSQL.SettingNonInteractiveWithCredential(DbConnectionStringUtilities.ActiveDirectoryMSIString);
831831
}
832832
elseif(UsesActiveDirectoryDefault(connectionOptions))
833833
{
834-
throwSQL.SettingNonInteractiveWithCredential(DbConnectionStringBuilderUtil.ActiveDirectoryDefaultString);
834+
throwSQL.SettingNonInteractiveWithCredential(DbConnectionStringUtilities.ActiveDirectoryDefaultString);
835835
}
836836
elseif(UsesActiveDirectoryWorkloadIdentity(connectionOptions))
837837
{
838-
throwSQL.SettingNonInteractiveWithCredential(DbConnectionStringBuilderUtil.ActiveDirectoryWorkloadIdentityString);
838+
throwSQL.SettingNonInteractiveWithCredential(DbConnectionStringUtilities.ActiveDirectoryWorkloadIdentityString);
839839
}
840840

841841
CheckAndThrowOnInvalidCombinationOfConnectionStringAndSqlCredential(connectionOptions);
@@ -1176,19 +1176,19 @@ public SqlCredential Credential
11761176
}
11771177
elseif(UsesActiveDirectoryManagedIdentity(connectionOptions))
11781178
{
1179-
throwSQL.SettingCredentialWithNonInteractiveInvalid(DbConnectionStringBuilderUtil.ActiveDirectoryManagedIdentityString);
1179+
throwSQL.SettingCredentialWithNonInteractiveInvalid(DbConnectionStringUtilities.ActiveDirectoryManagedIdentityString);
11801180
}
11811181
elseif(UsesActiveDirectoryMSI(connectionOptions))
11821182
{
1183-
throwSQL.SettingCredentialWithNonInteractiveInvalid(DbConnectionStringBuilderUtil.ActiveDirectoryMSIString);
1183+
throwSQL.SettingCredentialWithNonInteractiveInvalid(DbConnectionStringUtilities.ActiveDirectoryMSIString);
11841184
}
11851185
elseif(UsesActiveDirectoryDefault(connectionOptions))
11861186
{
1187-
throwSQL.SettingCredentialWithNonInteractiveInvalid(DbConnectionStringBuilderUtil.ActiveDirectoryDefaultString);
1187+
throwSQL.SettingCredentialWithNonInteractiveInvalid(DbConnectionStringUtilities.ActiveDirectoryDefaultString);
11881188
}
11891189
elseif(UsesActiveDirectoryWorkloadIdentity(connectionOptions))
11901190
{
1191-
throwSQL.SettingCredentialWithNonInteractiveInvalid(DbConnectionStringBuilderUtil.ActiveDirectoryWorkloadIdentityString);
1191+
throwSQL.SettingCredentialWithNonInteractiveInvalid(DbConnectionStringUtilities.ActiveDirectoryWorkloadIdentityString);
11921192
}
11931193

11941194
CheckAndThrowOnInvalidCombinationOfConnectionStringAndSqlCredential(connectionOptions);

‎src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
usingSystem.Threading;
1919
usingSystem.Threading.Tasks;
2020
usingSystem.Transactions;
21+
usingMicrosoft.Data.Common.ConnectionString;
2122
usingMicrosoft.Data.SqlClient;
2223
usingIsolationLevel=System.Data.IsolationLevel;
2324
usingMicrosoft.Identity.Client;
@@ -47,6 +48,7 @@ internal static partial class ADP
4748
{
4849
// NOTE: Initializing a Task in SQL CLR requires the "UNSAFE" permission set (http://msdn.microsoft.com/en-us/library/ms172338.aspx)
4950
// Therefore we are lazily initializing these Tasks to avoid forcing customers to use the "UNSAFE" set when they are actually using no Async features
51+
// @TODO: These are not necessary because the TPL has optimized commonly used task return values like true and false.
5052
privatestaticTask<bool>s_trueTask;
5153
internalstaticTask<bool>TrueTask=>s_trueTask??=Task.FromResult(true);
5254

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp