Skip to content

Commit 3db8d96

Browse files
committed
Remove SqlInternalConnection
1 parent 878f25a commit 3db8d96

File tree

6 files changed

+6
-39
lines changed

6 files changed

+6
-39
lines changed

src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -702,9 +702,6 @@
702702
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlInfoMessageEventHandler.cs">
703703
<Link>Microsoft\Data\SqlClient\SqlInfoMessageEventHandler.cs</Link>
704704
</Compile>
705-
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlInternalConnection.cs">
706-
<Link>Microsoft\Data\SqlClient\SqlInternalConnection.cs</Link>
707-
</Compile>
708705
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlInternalConnectionTds.cs">
709706
<Link>Microsoft\Data\SqlClient\SqlInternalConnectionTds.cs</Link>
710707
</Compile>

src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -866,9 +866,6 @@
866866
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlInfoMessageEventHandler.cs">
867867
<Link>Microsoft\Data\SqlClient\SqlInfoMessageEventHandler.cs</Link>
868868
</Compile>
869-
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlInternalConnection.cs">
870-
<Link>Microsoft\Data\SqlClient\SqlInternalConnection.cs</Link>
871-
</Compile>
872869
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlInternalConnectionTds.cs">
873870
<Link>Microsoft\Data\SqlClient\SqlInternalConnectionTds.cs</Link>
874871
</Compile>

src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDelegatedTransaction.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ internal sealed class SqlDelegatedTransaction : IPromotableSinglePhaseNotificati
3232

3333
private bool _active; // Is the transaction active?
3434

35-
internal SqlDelegatedTransaction(SqlInternalConnection connection, Transaction tx)
35+
internal SqlDelegatedTransaction(SqlInternalConnectionTds connection, Transaction tx)
3636
{
3737
Debug.Assert(connection != null, "null connection?");
38-
_connection = (SqlInternalConnectionTds)connection;
38+
_connection = connection;
3939
_atomicTransaction = tx;
4040
_active = false;
4141
System.Transactions.IsolationLevel systxIsolationLevel = tx.IsolationLevel;

src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlInternalConnection.cs

Lines changed: 0 additions & 27 deletions
This file was deleted.

src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlInternalConnectionTds.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
namespace Microsoft.Data.SqlClient
2626
{
27-
internal class SqlInternalConnectionTds : SqlInternalConnection, IDisposable
27+
internal class SqlInternalConnectionTds : DbConnectionInternal, IDisposable
2828
{
2929
#region Constants
3030

src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlTransaction.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public sealed class SqlTransaction : DbTransaction
2828
private bool _isFromApi;
2929

3030
internal SqlTransaction(
31-
SqlInternalConnection internalConnection,
31+
SqlInternalConnectionTds internalConnection,
3232
SqlConnection con,
3333
IsolationLevel iso,
3434
SqlInternalTransaction internalTransaction)
@@ -42,13 +42,13 @@ internal SqlTransaction(
4242
if (internalTransaction == null)
4343
{
4444
InternalTransaction = new SqlInternalTransaction(
45-
(SqlInternalConnectionTds)internalConnection,
45+
internalConnection,
4646
TransactionType.LocalFromAPI,
4747
this);
4848
}
4949
else
5050
{
51-
Debug.Assert(((SqlInternalConnectionTds)internalConnection).CurrentTransaction == internalTransaction,
51+
Debug.Assert(internalConnection.CurrentTransaction == internalTransaction,
5252
"Unexpected Parser.CurrentTransaction state!");
5353
InternalTransaction = internalTransaction;
5454
InternalTransaction.InitParent(this);

0 commit comments

Comments
 (0)