Skip to content

Commit d8d9fc4

Browse files
cheenamalhotracheenamalhotra
authored
Fix synonym count issues on debug (#3098)
1 parent 4117175 commit d8d9fc4

File tree

3 files changed

+21
-30
lines changed

3 files changed

+21
-30
lines changed

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

Lines changed: 17 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -772,55 +772,51 @@ internal static Dictionary<string, string> GetParseSynonyms()
772772
{
773773

774774
int count = SqlConnectionStringBuilder.KeywordsCount + SynonymCount;
775-
#if NET
776-
count += SqlConnectionStringBuilder.DeprecatedKeywordsCount;
777-
#endif
778775
synonyms = new Dictionary<string, string>(count, StringComparer.OrdinalIgnoreCase)
779776
{
780777
{ KEY.ApplicationIntent, KEY.ApplicationIntent },
781778
{ KEY.Application_Name, KEY.Application_Name },
782779
{ KEY.AttachDBFilename, KEY.AttachDBFilename },
783-
{ KEY.PoolBlockingPeriod, KEY.PoolBlockingPeriod},
780+
{ KEY.AttestationProtocol, KEY.AttestationProtocol},
781+
{ KEY.Authentication, KEY.Authentication },
782+
{ KEY.ColumnEncryptionSetting, KEY.ColumnEncryptionSetting },
784783
{ KEY.Command_Timeout, KEY.Command_Timeout },
784+
{ KEY.Connect_Retry_Count, KEY.Connect_Retry_Count },
785+
{ KEY.Connect_Retry_Interval, KEY.Connect_Retry_Interval },
785786
{ KEY.Connect_Timeout, KEY.Connect_Timeout },
786-
{ KEY.Connection_Reset, KEY.Connection_Reset },
787787
{ KEY.Context_Connection, KEY.Context_Connection },
788788
{ KEY.Current_Language, KEY.Current_Language },
789789
{ KEY.Data_Source, KEY.Data_Source },
790+
{ KEY.EnclaveAttestationUrl, KEY.EnclaveAttestationUrl },
790791
{ KEY.Encrypt, KEY.Encrypt },
791792
{ KEY.Enlist, KEY.Enlist },
792793
{ KEY.FailoverPartner, KEY.FailoverPartner },
794+
{ KEY.Failover_Partner_SPN, KEY.Failover_Partner_SPN },
793795
{ KEY.HostNameInCertificate, KEY.HostNameInCertificate },
794796
{ KEY.ServerCertificate, KEY.ServerCertificate},
795797
{ KEY.Initial_Catalog, KEY.Initial_Catalog },
796798
{ KEY.Integrated_Security, KEY.Integrated_Security },
799+
{ KEY.IPAddressPreference, KEY.IPAddressPreference },
797800
{ KEY.Load_Balance_Timeout, KEY.Load_Balance_Timeout },
798801
{ KEY.MARS, KEY.MARS },
799802
{ KEY.Max_Pool_Size, KEY.Max_Pool_Size },
800803
{ KEY.Min_Pool_Size, KEY.Min_Pool_Size },
801804
{ KEY.MultiSubnetFailover, KEY.MultiSubnetFailover },
802-
{ KEY.Network_Library, KEY.Network_Library },
803805
{ KEY.Packet_Size, KEY.Packet_Size },
804806
{ KEY.Password, KEY.Password },
805807
{ KEY.Persist_Security_Info, KEY.Persist_Security_Info },
806808
{ KEY.Pooling, KEY.Pooling },
809+
{ KEY.PoolBlockingPeriod, KEY.PoolBlockingPeriod },
807810
{ KEY.Replication, KEY.Replication },
811+
{ KEY.Server_SPN, KEY.Server_SPN },
808812
{ KEY.TrustServerCertificate, KEY.TrustServerCertificate },
809813
{ KEY.TransactionBinding, KEY.TransactionBinding },
810814
{ KEY.Type_System_Version, KEY.Type_System_Version },
811-
{ KEY.ColumnEncryptionSetting, KEY.ColumnEncryptionSetting },
812-
{ KEY.EnclaveAttestationUrl, KEY.EnclaveAttestationUrl },
813-
{ KEY.AttestationProtocol, KEY.AttestationProtocol},
814815
{ KEY.User_ID, KEY.User_ID },
815816
{ KEY.User_Instance, KEY.User_Instance },
816817
{ KEY.Workstation_Id, KEY.Workstation_Id },
817-
{ KEY.Connect_Retry_Count, KEY.Connect_Retry_Count },
818-
{ KEY.Connect_Retry_Interval, KEY.Connect_Retry_Interval },
819-
{ KEY.Authentication, KEY.Authentication },
820-
{ KEY.IPAddressPreference, KEY.IPAddressPreference },
821-
{ KEY.Server_SPN, KEY.Server_SPN },
822-
{ KEY.Failover_Partner_SPN, KEY.Failover_Partner_SPN },
823818

819+
{ SYNONYM.IPADDRESSPREFERENCE, KEY.IPAddressPreference },
824820
{ SYNONYM.APP, KEY.Application_Name },
825821
{ SYNONYM.APPLICATIONINTENT, KEY.ApplicationIntent },
826822
{ SYNONYM.EXTENDED_PROPERTIES, KEY.AttachDBFilename },
@@ -841,24 +837,25 @@ internal static Dictionary<string, string> GetParseSynonyms()
841837
{ SYNONYM.SERVER, KEY.Data_Source },
842838
{ SYNONYM.DATABASE, KEY.Initial_Catalog },
843839
{ SYNONYM.TRUSTED_CONNECTION, KEY.Integrated_Security },
840+
{ SYNONYM.TRUSTSERVERCERTIFICATE, KEY.TrustServerCertificate },
844841
{ SYNONYM.Connection_Lifetime, KEY.Load_Balance_Timeout },
845-
{ SYNONYM.NET, KEY.Network_Library },
846-
{ SYNONYM.NETWORK, KEY.Network_Library },
847842
{ SYNONYM.Pwd, KEY.Password },
848843
{ SYNONYM.PERSISTSECURITYINFO, KEY.Persist_Security_Info },
849-
{ SYNONYM.TRUSTSERVERCERTIFICATE, KEY.TrustServerCertificate },
850844
{ SYNONYM.UID, KEY.User_ID },
851845
{ SYNONYM.User, KEY.User_ID },
852846
{ SYNONYM.WSID, KEY.Workstation_Id },
853847
{ SYNONYM.ServerSPN, KEY.Server_SPN },
854848
{ SYNONYM.FailoverPartnerSPN, KEY.Failover_Partner_SPN },
855849
#if NETFRAMEWORK
850+
{ KEY.Connection_Reset, KEY.Connection_Reset },
851+
{ KEY.Network_Library, KEY.Network_Library },
856852
{ KEY.TransparentNetworkIPResolution, KEY.TransparentNetworkIPResolution },
853+
{ SYNONYM.NET, KEY.Network_Library },
854+
{ SYNONYM.NETWORK, KEY.Network_Library },
857855
{ SYNONYM.TRANSPARENTNETWORKIPRESOLUTION, KEY.TransparentNetworkIPResolution },
858856
#endif // NETFRAMEWORK
859-
{ SYNONYM.IPADDRESSPREFERENCE, KEY.IPAddressPreference }
860857
};
861-
Debug.Assert(synonyms.Count == count, "incorrect initial ParseSynonyms size");
858+
Debug.Assert(synonyms.Count == count, $"incorrect initial ParseSynonyms size {count} v/s {synonyms.Count}");
862859
Interlocked.CompareExchange(ref s_sqlClientSynonyms, synonyms, null);
863860
}
864861
return synonyms;
@@ -1160,12 +1157,6 @@ protected internal override PermissionSet CreatePermissionSet()
11601157
return permissionSet;
11611158
}
11621159

1163-
internal SqlConnectionEncryptOption ConvertValueToEncrypt()
1164-
{
1165-
SqlConnectionEncryptOption defaultEncryptValue = !Parsetable.ContainsKey(KEY.Authentication) ? DEFAULT.Encrypt : SqlConnectionEncryptOption.Mandatory;
1166-
return ConvertValueToSqlConnectionEncrypt();
1167-
}
1168-
11691160
private readonly bool _connectionReset;
11701161
private readonly bool _transparentNetworkIPResolution;
11711162
private readonly string _networkLibrary;

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,6 @@ private enum Keywords
131131
private bool _connectionReset = DbConnectionStringDefaults.ConnectionReset;
132132
private bool _transparentNetworkIPResolution = DbConnectionStringDefaults.TransparentNetworkIPResolution;
133133
private string _networkLibrary = DbConnectionStringDefaults.NetworkLibrary;
134-
#else
135-
internal const int DeprecatedKeywordsCount = 5;
136134
#endif
137135
#endregion //Fields
138136

‎src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/RetryLogic/SqlConnectionReliabilityTest.cs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,8 +203,10 @@ private SqlConnection CreateConnectionWithInvalidCatalog(string cnnString, SqlRe
203203
InitialCatalog = InvalidInitialCatalog
204204
};
205205

206-
SqlConnection cnn = new SqlConnection(builder.ConnectionString);
207-
cnn.RetryLogicProvider = provider;
206+
SqlConnection cnn = new(builder.ConnectionString)
207+
{
208+
RetryLogicProvider = provider
209+
};
208210
cnn.RetryLogicProvider.Retrying += (s, e) =>
209211
{
210212
Assert.Equal(e.RetryCount, e.Exceptions.Count);

0 commit comments

Comments
 (0)