Commit ad5687e
authored
Merge | SqlInternalConnectionTds (#3760)
* Introduce partial for SqlInternalConnectionTds
* Merge MaxNumberOfRedirectRoute, MsalHttpRetryStatusCode, _accessTokenInBytes, _accessTokenCallback, _cleanSQLDNSCaching, _currentSessionData, _sessionRecoveryAcknowledged, _fedAuthRequired, _federatedAuthenticationAcknowledged, _federatedAuthenticationInfoReceived, _federatedAuthenticationInfoRequested, _federatedAuthenticationRequested, _sspiContextProvider, _activeDirectoryAuthTimeoutRetryHelper, _credential, _fedAuthFeatureExtensionData, _fedAuthToken, _loginAck, _parser, _poolGroupProviderInfo, _recoverySessionData, _serverSupportsDNSCaching, _sessionRecoveryRequested
* Merge accessTokenExpirationBufferTime
* Merge _dnsCachingBeforeRedirect, _SQLDNSRetryEnabled, IsSqlDnsCachingSupported, IsDnsCachingBeforeRedirectSupported, IsSQLDNSRetryEnabled
* Merging _forceMsalRetry, _forceExpiryLocked, _forceExpiryUnLocked, IsJsonSupportEnabled, IsVectorSupportEnabled, pendingSQLDNSObject, _tceVersionSupported, _dbConnectionPool, _dbConnectionPoolAuthenticationContextKey, _newDbConnectionPoolAuthenticationContext
* Merge _dbAuthenticationContextLockedRefreshTimeSpan, _dbAuthenticationContextUnLockedRefreshTimeSpan, s_transientErrors
* Merge _asyncCommandCount, _fConnectionOpen, _currentLanguage, _currentPacketSize, _identity, _instanceName, _originalDatabase, _originalLanguage, _fResetConnection, CurrentSessionData
* Merge _clientConnectionId, _originalClientConnectionId, _routingDestination, _threadIdOwningParserLock, _timeout, _timeoutErrorInternal, TimeoutErrorInternal
* Merge AvailableInternalTransaction, ClientConnectionid, CurrentTransaction, Identity, OriginalClientConnectionId, PendingTransaction, RoutingDestination, RoutingInfo, IsTransientError()
* Merge ServerVersion (rewrite using string interpolation), InstanceName, Is2008OrNewer, IsLockedForBulkCopy, PacketSize, Parser, PoolGroupProviderInfo, ServerProcessId (made internal), ServerProvidedFailoverPartner, ReadyToPrepareTransaction
# Conflicts:
# src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlInternalConnectionTds.cs
# src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlInternalConnectionTds.cs
* Merge IsAccesTokenExpired, UnbindOnTransactionCompletion
Move IsSqlDNSCachingSupported
* Merge IgnoreEnvChange, ThreadHasParserLockForClose
* Merge ChangeDatabaseInternal
(split long lines, added parameter labels to literals, replaced ad-hoc SQL with string interpolation)
* Merge Dispose
(Split long lines, adopt netcore style trave event formatting, use null propagation for parser.disconnect, move comments around)
* Merge ValidateConnectionForExecute
(remove redundant parantheses, split long lines, moved a couple comments)
* Merge CheckEnlistedTransactionBinding
(split long lines, flip enum comparison operands, add parameter labels for constant)
* Merge IsConnectionAlive, Activate
(diff denoted by #if NETFRAMEWORK, rebalance comments)
* Merge InternalDeactivate
(rebalance comments, flip comparison with constant operands)
* Merge ResetConnection
(split long lines, rebalanced comments)
* Merge DecrementAsyncCount, DisconnectTransaction, IncrementAsyncCount
(rewrote disconnectransaction into a single line)
* Merge ExecuteTransaction, Remove unused ExecuteTransaction overload
(use `is Enum or Enum` pattern, chop argument list)
* Merge ExecuteTransaction2005
(make private, split long lines, rebalance comments)
* Merge GetDTCAddress, PropagateTransactionCookie; Remove DelegateTransactionEnded (redundant override)
(split long lines)
* Merge CompleteLogin
(labels for constant parameters, split long lines, adopt netcore style trace event strings)
* Merge Login
(split long lines, rebalanced comments)
* Merge LoginFailure
* Merge OpenLoginEnlist
(split long lines, introduce temp variable for source type b/c the ternary was was too long to use in-line, reorder temp variable declaration order to group similar variables)
* Merge IsDoNotRetryConnectError
(extract exception number checks to variable, comment to xmldocs)
* Merge LoginNoFailure
(resolve conflicts with #if, split long lines, rebalance comments, introduce some ternaries, nothing too crazy)
* Merge ShouldDisableTnir from netframework
* Merge AttemptRetryADAuthWithTimeoutError
(xmldocs, more spacing)
* Merge LoginWithFailover
(rebalance comments, split long lines, introduce a couple ternaries, etc)
* Merge ResolveExtendedServerName
(rebalance comments, split long lines, add argument parameters)
* Merge AttemptOneLogin (resolve conflicts), FailoverPermissionDemand (conditional access, expression body)
* Merge ObtainAdditionalLocksForClose, ReleaseAdditionalLocksForClose
* Merge GetSessionAndReconnectIfNeeded
(rebalance comments, add some newlines)
* Merge BreakConnection
(split lines, conditional access, remove temp variable)
* Merge OnEnvChange
(rebalance comments, conditional access, split long lines)
* Merge OnLoginAck
* Merge OnFedAuthInfo
(split long lines, rebalance comments, remove if around trace and replace with Try* version)
* Merge TryGetFedAuthTokenLocked
(made private, remove IfTraceEnabled and use Try* version, rebalance comments, split long lines)
* Introduce SqlException overload for single error scenarios (ie, the majority of them...)
(and split long lines)
* Merge GetFedAuthToken
(rebalance comments, split long lines, etc)
* Merge OnFeatureExtAck
(Split long lines, flip constant comparisons, standardize the indenting)
* Merge constructor and TryReplaceConnection
(rebalanced comments, use typed provider info)
* Start merging the SyncAsyncLock
* Merge SyncAsyncLock._semaphor, SyncAsyncLock.CanBeReleasedFromAnyThread, SyncAsyncLock.ThreadMayHaveLock (moved to property)
* Merge SyncAsyncLock.Release, SyncAsyncLock.Wait
* Finishing merge of SqlInternalConnectionTds.cs, removing stub
* Move SessionStateRecord into new Connection namespace
* Introduce partial for SessionData in Connection folder
* Merge the SessionData class
* Merge ServerInfo class
* Remove (now empty) SqlInternalConnectionTds files
* Put the little classes in the connection namespace
* Address comments:
* Use string.Format again for UserServerName assignment in ServerInfo.cs
* Make fields readonly that were called out by copilot
* Fixed typo in comment for _dbConnectionPoolAuthenticationContextKey
* Restored TODO comment from @mdaigle
* Added `using` for cancellation token source in the middle of active directory junk1 parent cad54ac commit ad5687e
File tree
16 files changed
+4039
-6478
lines changed- src/Microsoft.Data.SqlClient
- netcore/src
- Microsoft/Data/SqlClient
- netfx/src
- Microsoft/Data/SqlClient
- src/Microsoft/Data/SqlClient
- Connection
- SSPI
16 files changed
+4039
-6478
lines changedLines changed: 12 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
210 | 210 | | |
211 | 211 | | |
212 | 212 | | |
| 213 | + | |
| 214 | + | |
| 215 | + | |
| 216 | + | |
| 217 | + | |
| 218 | + | |
| 219 | + | |
| 220 | + | |
| 221 | + | |
213 | 222 | | |
214 | 223 | | |
215 | 224 | | |
| |||
693 | 702 | | |
694 | 703 | | |
695 | 704 | | |
| 705 | + | |
| 706 | + | |
| 707 | + | |
696 | 708 | | |
697 | 709 | | |
698 | 710 | | |
| |||
849 | 861 | | |
850 | 862 | | |
851 | 863 | | |
852 | | - | |
853 | | - | |
854 | 864 | | |
855 | 865 | | |
856 | 866 | | |
| |||
Lines changed: 0 additions & 3166 deletions
This file was deleted.
Lines changed: 12 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
479 | 479 | | |
480 | 480 | | |
481 | 481 | | |
| 482 | + | |
| 483 | + | |
| 484 | + | |
| 485 | + | |
| 486 | + | |
| 487 | + | |
| 488 | + | |
| 489 | + | |
| 490 | + | |
482 | 491 | | |
483 | 492 | | |
484 | 493 | | |
| |||
857 | 866 | | |
858 | 867 | | |
859 | 868 | | |
| 869 | + | |
| 870 | + | |
| 871 | + | |
860 | 872 | | |
861 | 873 | | |
862 | 874 | | |
| |||
1019 | 1031 | | |
1020 | 1032 | | |
1021 | 1033 | | |
1022 | | - | |
1023 | | - | |
1024 | 1034 | | |
1025 | 1035 | | |
1026 | 1036 | | |
| |||
0 commit comments