Skip to content

Merge | TdsParser.cs #3622

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

Merged
merged 32 commits into from
Sep 30, 2025
Merged

Merge | TdsParser.cs #3622

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
4689f8b
netfx, netcore: sync tracing
edwardneal Sep 20, 2025
19163f5
netfx, netcore: whitespace, comment and naming changes
edwardneal Sep 20, 2025
69099ac
netfx, netcore: merge TNIR handling
edwardneal Sep 20, 2025
a5f114f
netfx: sync DNS caching
edwardneal Sep 20, 2025
96ef625
netfx, netcore: merge CER mopup
edwardneal Sep 20, 2025
f2de25f
netfx, netcore: merge debug assertions
edwardneal Sep 20, 2025
83f112b
netfx: sync SNI-specific and endian-specific logic
edwardneal Sep 20, 2025
b2e4fed
netcore: merge netfx synthesis of default column name from operand
edwardneal Sep 20, 2025
d937f90
netfx: ensure disposal of ConstrainedTextWriter and XmlWriter
edwardneal Sep 20, 2025
1c03e7c
netfx, netcore: sync handling of SqlError generation
edwardneal Sep 20, 2025
13f7a22
netfx: port #232
edwardneal Sep 20, 2025
894f8ca
netfx: port TryRunSetupSpinWaitContinuation
edwardneal Sep 20, 2025
b73d240
netcore: sync _resetConnectionEvent.WaitOne
edwardneal Sep 20, 2025
4eb8697
netfx: port skipping read of fields from SqlLoginAck and SqlReturnValue
edwardneal Sep 20, 2025
5c00879
netcore: supporting infrastructure for CER cleanup
edwardneal Sep 20, 2025
70a622f
netfx: sync GetCodePage
edwardneal Sep 20, 2025
aeab751
netcore, netfx: sync SqlGuid handling
edwardneal Sep 20, 2025
b2cb0fe
netcore, netfx: sync SqlBinary handling
edwardneal Sep 20, 2025
844ad1e
netcore: sync date/time handling
edwardneal Sep 20, 2025
3249a81
netcore, netfx: sync decimal handling
edwardneal Sep 20, 2025
1d1e925
netfx, netcore: sync minor cleanup of if conditions
edwardneal Sep 20, 2025
52dd551
netfx, netcore: sync creation of LocalDB instances
edwardneal Sep 20, 2025
7880b5f
netcore: run ApplyFeatureExData in a checked context
edwardneal Sep 20, 2025
143de69
netcore, netfx: sync creation of a TryEventScope
edwardneal Sep 20, 2025
c9585a3
netfx: sync order of variable assignment
edwardneal Sep 20, 2025
5a21361
netcore: merge static constructor
edwardneal Sep 20, 2025
ec02267
Merge branch 'main' into merge/tdsparser-complete
edwardneal Sep 24, 2025
e2d846b
Merge conditional compilation of netfx-only features
edwardneal Sep 24, 2025
af79e6b
Port TryReadByteArray usage from netcore to netfx
edwardneal Sep 24, 2025
69c81be
Rename existing shared TdsParser.cs to TdsParser.SSPI.cs
edwardneal Sep 24, 2025
6bfb6ef
Final merge of TdsParser.cs and redirection of references
edwardneal Sep 24, 2025
0839219
Code review response
edwardneal Sep 26, 2025
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
45 changes: 40 additions & 5 deletions src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,14 @@ internal void Connect(ServerInfo serverInfo,
SqlInternalConnectionTds connHandler,
TimeoutTimer timeout,
SqlConnectionString connectionOptions,
bool withFailover)
#if NETFRAMEWORK
bool withFailover,
bool isFirstTransparentAttempt,
bool disableTnir
#else
bool withFailover
#endif
)
{
SqlConnectionEncryptOption encrypt = connectionOptions.Encrypt;
bool isTlsFirst = (encrypt == SqlConnectionEncryptOption.Strict);
Expand Down Expand Up @@ -418,6 +425,26 @@ internal void Connect(ServerInfo serverInfo,
_connHandler.TimeoutErrorInternal.SetAndBeginPhase(SqlConnectionTimeoutErrorPhase.InitializeConnection);

bool fParallel = _connHandler.ConnectionOptions.MultiSubnetFailover;
TransparentNetworkResolutionState transparentNetworkResolutionState;
int totalTimeout;

#if NETFRAMEWORK
if (_connHandler.ConnectionOptions.TransparentNetworkIPResolution && !disableTnir)
{
if (isFirstTransparentAttempt)
transparentNetworkResolutionState = TransparentNetworkResolutionState.SequentialMode;
else
transparentNetworkResolutionState = TransparentNetworkResolutionState.ParallelMode;
}
else
{
transparentNetworkResolutionState = TransparentNetworkResolutionState.DisabledMode;
}
totalTimeout = _connHandler.ConnectionOptions.ConnectTimeout;
#else
transparentNetworkResolutionState = TransparentNetworkResolutionState.DisabledMode;
totalTimeout = -1;
#endif

FQDNforDNSCache = serverInfo.ResolvedServerName;

Expand All @@ -438,8 +465,8 @@ internal void Connect(ServerInfo serverInfo,
false,
true,
fParallel,
TransparentNetworkResolutionState.DisabledMode,
-1,
transparentNetworkResolutionState,
totalTimeout,
_connHandler.ConnectionOptions.IPAddressPreference,
FQDNforDNSCache,
ref _connHandler.pendingSQLDNSObject,
Expand Down Expand Up @@ -538,8 +565,8 @@ internal void Connect(ServerInfo serverInfo,
true,
true,
fParallel,
TransparentNetworkResolutionState.DisabledMode,
-1,
transparentNetworkResolutionState,
totalTimeout,
_connHandler.ConnectionOptions.IPAddressPreference,
FQDNforDNSCache,
ref _connHandler.pendingSQLDNSObject,
Expand Down Expand Up @@ -1354,7 +1381,11 @@ internal void ThrowExceptionAndWarning(TdsParserStateObject stateObj, SqlCommand
breakConnection &= (TdsParserState.Closed != _state);
if (breakConnection)
{
#if NETFRAMEWORK
if ((_state == TdsParserState.OpenNotLoggedIn) && (_connHandler.ConnectionOptions.TransparentNetworkIPResolution || _connHandler.ConnectionOptions.MultiSubnetFailover || _loginWithFailover) && (temp.Count == 1) && ((temp[0].Number == TdsEnums.TIMEOUT_EXPIRED) || (temp[0].Number == TdsEnums.SNI_WAIT_TIMEOUT)))
#else
if ((_state == TdsParserState.OpenNotLoggedIn) && (_connHandler.ConnectionOptions.MultiSubnetFailover || _loginWithFailover) && (temp.Count == 1) && ((temp[0].Number == TdsEnums.TIMEOUT_EXPIRED) || (temp[0].Number == TdsEnums.SNI_WAIT_TIMEOUT)))
#endif
{
// DevDiv2 Bug 459546: With "MultiSubnetFailover=yes" in the Connection String, SQLClient incorrectly throws a Timeout using shorter time slice (3-4 seconds), not honoring the actual 'Connect Timeout'
// http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/459546
Expand Down Expand Up @@ -13792,7 +13823,11 @@ internal string TraceString()
_statisticsIsInTransaction ? bool.TrueString : bool.FalseString,
_fPreserveTransaction ? bool.TrueString : bool.FalseString,
_connHandler == null ? "(null)" : _connHandler.ConnectionOptions.MultiSubnetFailover.ToString((IFormatProvider)null),
#if NETFRAMEWORK
_connHandler == null ? "(null)" : _connHandler.ConnectionOptions.TransparentNetworkIPResolution.ToString((IFormatProvider)null));
#else
_connHandler == null ? "(null)" : bool.FalseString);
#endif
}

private string TraceObjectClass(object instance)
Expand Down
30 changes: 25 additions & 5 deletions src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/TdsParser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,9 +349,14 @@ internal void Connect(ServerInfo serverInfo,
SqlInternalConnectionTds connHandler,
TimeoutTimer timeout,
SqlConnectionString connectionOptions,
#if NETFRAMEWORK
bool withFailover,
bool isFirstTransparentAttempt,
bool disableTnir)
bool disableTnir
#else
bool withFailover
#endif
)
{
SqlConnectionEncryptOption encrypt = connectionOptions.Encrypt;
bool isTlsFirst = (encrypt == SqlConnectionEncryptOption.Strict);
Expand Down Expand Up @@ -423,8 +428,10 @@ internal void Connect(ServerInfo serverInfo,
_connHandler.TimeoutErrorInternal.SetAndBeginPhase(SqlConnectionTimeoutErrorPhase.InitializeConnection);

bool fParallel = _connHandler.ConnectionOptions.MultiSubnetFailover;

TransparentNetworkResolutionState transparentNetworkResolutionState;
int totalTimeout;

#if NETFRAMEWORK
if (_connHandler.ConnectionOptions.TransparentNetworkIPResolution && !disableTnir)
{
if (isFirstTransparentAttempt)
Expand All @@ -433,9 +440,14 @@ internal void Connect(ServerInfo serverInfo,
transparentNetworkResolutionState = TransparentNetworkResolutionState.ParallelMode;
}
else
{
transparentNetworkResolutionState = TransparentNetworkResolutionState.DisabledMode;

int totalTimeout = _connHandler.ConnectionOptions.ConnectTimeout;
}
totalTimeout = _connHandler.ConnectionOptions.ConnectTimeout;
#else
transparentNetworkResolutionState = TransparentNetworkResolutionState.DisabledMode;
totalTimeout = -1;
#endif

FQDNforDNSCache = serverInfo.ResolvedServerName;

Expand Down Expand Up @@ -1371,7 +1383,11 @@ internal void ThrowExceptionAndWarning(TdsParserStateObject stateObj, SqlCommand
breakConnection &= (TdsParserState.Closed != _state);
if (breakConnection)
{
#if NETFRAMEWORK
if ((_state == TdsParserState.OpenNotLoggedIn) && (_connHandler.ConnectionOptions.TransparentNetworkIPResolution || _connHandler.ConnectionOptions.MultiSubnetFailover || _loginWithFailover) && (temp.Count == 1) && ((temp[0].Number == TdsEnums.TIMEOUT_EXPIRED) || (temp[0].Number == TdsEnums.SNI_WAIT_TIMEOUT)))
#else
if ((_state == TdsParserState.OpenNotLoggedIn) && (_connHandler.ConnectionOptions.MultiSubnetFailover || _loginWithFailover) && (temp.Count == 1) && ((temp[0].Number == TdsEnums.TIMEOUT_EXPIRED) || (temp[0].Number == TdsEnums.SNI_WAIT_TIMEOUT)))
#endif
{
// DevDiv2 Bug 459546: With "MultiSubnetFailover=yes" in the Connection String, SQLClient incorrectly throws a Timeout using shorter time slice (3-4 seconds), not honoring the actual 'Connect Timeout'
// http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/459546
Expand Down Expand Up @@ -13838,7 +13854,11 @@ internal string TraceString()
_statisticsIsInTransaction ? bool.TrueString : bool.FalseString,
_fPreserveTransaction ? bool.TrueString : bool.FalseString,
_connHandler == null ? "(null)" : _connHandler.ConnectionOptions.MultiSubnetFailover.ToString((IFormatProvider)null),
_connHandler == null ? "(null)" : _connHandler.ConnectionOptions.TransparentNetworkIPResolution.ToString((IFormatProvider)null));
#if NETFRAMEWORK
_connHandler == null ? "(null)" : _connHandler.ConnectionOptions.TransparentNetworkIPResolution.ToString((IFormatProvider)null));
#else
_connHandler == null ? "(null)" : bool.FalseString);
#endif
}

private string TraceObjectClass(object instance)
Expand Down