Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
66c2cd6
Change all possible references from SqlInternalConnection to SqlInter…
benrr101 Nov 12, 2025
2d664a6
Move BeginTransaction and BeginSqlTransaction into SqlInternalConnect…
benrr101 Nov 12, 2025
c796212
Move ChangeDatabase into SqlInternalConnectionTds, move ChangeDatabas…
benrr101 Nov 12, 2025
13c373c
Move EnlistTransaction to SqlInternalConnectionTds
benrr101 Nov 12, 2025
a176e2f
Remove abstract ValidateConnectionForExecute
benrr101 Nov 12, 2025
c5863e3
Move Enlist into SqlInternalConnectionTds
benrr101 Nov 12, 2025
8002ec7
Move EnlistNonNull into SqlInternalConnectionTds
benrr101 Nov 12, 2025
202beb5
Move EnlistNull into SqlInternalConnectionTds
benrr101 Nov 12, 2025
bb3d541
Removed no longer necessary abstractions in SqlInternalConnection
benrr101 Nov 12, 2025
4d39842
Move OnError into SqlInternalConnectionTds
benrr101 Nov 13, 2025
58c358f
Move Deactivate into SqlInternalConnectionTds, merge InternalDeactiva…
benrr101 Nov 13, 2025
07750f8
Move GetTransactionCookie into SqlInternalConnectionTds
benrr101 Nov 13, 2025
dbe9d9e
Move FindLiveReader into SqlInternalConnectionTds
benrr101 Nov 13, 2025
355f2d2
Merge SqlInternalConnection.Dispose into SqlInternalConnectionTds
benrr101 Nov 13, 2025
74b0c92
Move CleanupTransactionOnCompletion, CreateReferenceCollection into S…
benrr101 Nov 13, 2025
ce46515
Introduce a CachedContexts class, move the cached call contexts from …
benrr101 Nov 13, 2025
79cf052
Migrate usages of CachedCommandExecuteNonQueryAsyncContext to the new…
benrr101 Nov 13, 2025
0a45c97
Migrate usages of CachedCommandExecuteXmlReaderAsyncContext to the ne…
benrr101 Nov 13, 2025
7b5a637
Migrate usage of ReadAsyncCallContext to the new class
benrr101 Nov 13, 2025
ba4c7df
Migrate usage of IsDBNullAsyncCallContext to the new class.
benrr101 Nov 13, 2025
a0a1f24
Comments on CachedContexts
benrr101 Nov 13, 2025
41b7f2a
Sure why not move the reader snapshot into the CachedContexts class? …
benrr101 Nov 13, 2025
1b52999
Move _whereAbouts and s_globalTransactionTMID
benrr101 Nov 13, 2025
8fb7b0e
Merge constructors
benrr101 Nov 13, 2025
0e78a6e
Merge AvailableInternalTransaction, CurrentTransaction, HasLocalTrans…
benrr101 Nov 13, 2025
858d98e
Merge Connection, ConnectionOptions, CurrentDatabase, CurrentDataSour…
benrr101 Nov 13, 2025
6dfbd5d
Remove SqlInternalConnection
benrr101 Nov 13, 2025
a83bd7c
Move SqlInternalConnectionTds.cs to SqlConnectionInternal.cs
benrr101 Nov 13, 2025
c4db055
Renane Microsoft.Data.SqlClient.SqlInternalConnectionTds to Microsoft…
benrr101 Nov 13, 2025
d010d48
Fix one reference to SqlInternalConnectionTds in unit tests
benrr101 Nov 14, 2025
4d02cc2
As per copilot comment, rewriting a block in SqlConnectionFactory to …
benrr101 Nov 18, 2025
04e5cdf
As per copilot comment, adding more comments to CachedContexts class
benrr101 Nov 18, 2025
64766f4
Addressing some feedback from @mdiagle
benrr101 Dec 1, 2025
89b92b9
Merge branch 'main' into dev/russellben/flatten/sqlinternalconnection
benrr101 Dec 2, 2025
3b795ae
Rename Clear*Context to Take*Context
benrr101 Dec 2, 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
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,6 @@ namespace Microsoft.Data.SqlClient
{
internal abstract class SqlInternalConnection : DbConnectionInternal
{
/// <summary>
/// Constructs a new SqlInternalConnection object using the provided connection options.
/// </summary>
/// <param name="connectionOptions">The options to use for this connection.</param>
internal SqlInternalConnection(SqlConnectionString connectionOptions) : base()
{
Debug.Assert(connectionOptions != null, "null connectionOptions?");
ConnectionOptions = connectionOptions;
}

#region Properties

// SQLBU 415870
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -346,8 +346,12 @@ internal SqlInternalConnectionTds(
string accessToken = null,
IDbConnectionPool pool = null,
Func<SqlAuthenticationParameters, CancellationToken, Task<SqlAuthenticationToken>> accessTokenCallback = null,
SspiContextProvider sspiContextProvider = null) : base(connectionOptions)
SspiContextProvider sspiContextProvider = null)
{
Debug.Assert(connectionOptions is not null, "null connectionOptions");

ConnectionOptions = connectionOptions;

#if DEBUG
if (reconnectSessionData != null)
{
Expand Down