Skip to content

Correct GetParseSynonyms' failing debug assertion #3088

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Correct GetParseSynonyms' failing debug assertion #3088

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionString.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ internal static class TRANSACTIONBINDING
#if NETFRAMEWORK
internal const int SynonymCount = 33;
#else
internal const int SynonymCount = 30;
internal const int SynonymCount = 32;
#endif // NETFRAMEWORK

private static Dictionary<string, string> s_sqlClientSynonyms;
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionStringBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ private enum Keywords
private bool _transparentNetworkIPResolution = DbConnectionStringDefaults.TransparentNetworkIPResolution;
private string _networkLibrary = DbConnectionStringDefaults.NetworkLibrary;
#else
internal const int DeprecatedKeywordsCount = 5;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we get rid of this counter?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think so. It's used to mark keywords which are supported in .NET Framework but not in .NET Core. These are Connection Reset and Network Library. Connection Reset should be a fairly easy keyword to merge, but Network Library needs a little more thought - what connection method should we use if the Network Library keyword requests named pipes, but the Server keyword requests TCP?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

" if the Network Library keyword requests named pipes, but the Server keyword requests TCP"

Invalid connection string?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not needed, because the connection would fail itself.

Deprecation wise, network library is replaced with 'tcp/np:' in DataSource property, so we need not worry about handling it.

internal const int DeprecatedKeywordsCount = 2;
#endif
#endregion //Fields

Expand Down
Loading