Rename implicit transaction to enlisted transaction.

Signed-off-by: Bradley Grainger <[email protected]>

Author: bgrainger

src/MySqlConnector/Core/ImplicitTransactionBase.cs renamed to src/MySqlConnector/Core/EnlistedTransactionBase.cs

@@ -5,7 +5,7 @@
 
 namespace MySqlConnector.Core
 {
-	internal abstract class ImplicitTransactionBase : IEnlistmentNotification
+	internal abstract class EnlistedTransactionBase : IEnlistmentNotification
 	{
 		// A MySqlConnection that holds the ServerSession that was enrolled in the transaction
 		public MySqlConnection Connection { get; set; }
@@ -45,7 +45,7 @@ void IEnlistmentNotification.Rollback(Enlistment enlistment)
 
 		public void InDoubt(Enlistment enlistment) => throw new NotImplementedException();
 
-		protected ImplicitTransactionBase(Transaction transaction, MySqlConnection connection)
+		protected EnlistedTransactionBase(Transaction transaction, MySqlConnection connection)
 		{
 			Transaction = transaction;
 			Connection = connection;

src/MySqlConnector/Core/StandardImplicitTransaction.cs renamed to src/MySqlConnector/Core/StandardEnlistedTransaction.cs

@@ -6,9 +6,9 @@
 
 namespace MySqlConnector.Core
 {
-	internal sealed class StandardImplicitTransaction : ImplicitTransactionBase
+	internal sealed class StandardEnlistedTransaction : EnlistedTransactionBase
 	{
-		public StandardImplicitTransaction(Transaction transaction, MySqlConnection connection)
+		public StandardEnlistedTransaction(Transaction transaction, MySqlConnection connection)
 			: base(transaction, connection)
 		{
 		}

src/MySqlConnector/Core/XaImplicitTransaction.cs renamed to src/MySqlConnector/Core/XaEnlistedTransaction.cs

@@ -6,9 +6,9 @@
 
 namespace MySqlConnector.Core
 {
-	internal sealed class XaImplicitTransaction : ImplicitTransactionBase
+	internal sealed class XaEnlistedTransaction : EnlistedTransactionBase
 	{
-		public XaImplicitTransaction(Transaction transaction, MySqlConnection connection)
+		public XaEnlistedTransaction(Transaction transaction, MySqlConnection connection)
 			: base(transaction, connection)
 		{
 		}

src/MySqlConnector/MySql.Data.MySqlClient/MySqlConnection.cs

@@ -43,7 +43,7 @@ private async Task<MySqlTransaction> BeginDbTransactionAsync(IsolationLevel isol
 			if (CurrentTransaction != null)
 				throw new InvalidOperationException("Transactions may not be nested.");
 #if !NETSTANDARD1_3
-			if (m_implicitTransaction != null)
+			if (m_enlistedTransaction != null)
 				throw new InvalidOperationException("Cannot begin a transaction when already enlisted in a transaction.");
 #endif
 
@@ -86,10 +86,10 @@ private async Task<MySqlTransaction> BeginDbTransactionAsync(IsolationLevel isol
 		public override void EnlistTransaction(System.Transactions.Transaction transaction)
 		{
 			// ignore reenlistment of same connection in same transaction
-			if (m_implicitTransaction?.Transaction.Equals(transaction) ?? false)
+			if (m_enlistedTransaction?.Transaction.Equals(transaction) ?? false)
 				return;
 
-			if (m_implicitTransaction != null)
+			if (m_enlistedTransaction != null)
 				throw new MySqlException("Already enlisted in a Transaction.");
 			if (CurrentTransaction != null)
 				throw new InvalidOperationException("Can't enlist in a Transaction when there is an active MySqlTransaction.");
@@ -106,25 +106,25 @@ public override void EnlistTransaction(System.Transactions.Transaction transacti
 				}
 				else
 				{
-					m_implicitTransaction = m_connectionSettings.UseXaTransactions ?
-						(ImplicitTransactionBase) new XaImplicitTransaction(transaction, this) :
-						new StandardImplicitTransaction(transaction, this);
-					m_implicitTransaction.Start();
+					m_enlistedTransaction = m_connectionSettings.UseXaTransactions ?
+						(EnlistedTransactionBase) new XaEnlistedTransaction(transaction, this) :
+						new StandardEnlistedTransaction(transaction, this);
+					m_enlistedTransaction.Start();
 
 					lock (s_lock)
 					{
 						if (!s_transactionConnections.TryGetValue(transaction, out var enlistedTransactions))
-							s_transactionConnections[transaction] = enlistedTransactions = new List<ImplicitTransactionBase>();
-						enlistedTransactions.Add(m_implicitTransaction);
+							s_transactionConnections[transaction] = enlistedTransactions = new List<EnlistedTransactionBase>();
+						enlistedTransactions.Add(m_enlistedTransaction);
 					}
 				}
 			}
 		}
 
 		internal void UnenlistTransaction()
 		{
-			var transaction = m_implicitTransaction.Transaction;
-			m_implicitTransaction = null;
+			var transaction = m_enlistedTransaction.Transaction;
+			m_enlistedTransaction = null;
 
 			// find this connection in the list of connections associated with the transaction
 			bool? wasIdle = null;
@@ -201,9 +201,9 @@ private void TakeSessionFrom(MySqlConnection other)
 				throw new InvalidOperationException("This connection must not have a session");
 			if (other.m_session is null)
 				throw new InvalidOperationException("Other connection must have a session");
-			if (m_implicitTransaction != null)
+			if (m_enlistedTransaction != null)
 				throw new InvalidOperationException("This connection must not have an enlisted transaction");
-			if (other.m_implicitTransaction is null)
+			if (other.m_enlistedTransaction is null)
 				throw new InvalidOperationException("Other connection must have an enlisted transaction");
 			if (m_activeReader != null)
 				throw new InvalidOperationException("This connection must not have an active reader");
@@ -218,11 +218,11 @@ private void TakeSessionFrom(MySqlConnection other)
 			m_cachedProcedures = other.m_cachedProcedures;
 			other.m_cachedProcedures = null;
 
-			m_implicitTransaction = other.m_implicitTransaction;
-			other.m_implicitTransaction = null;
+			m_enlistedTransaction = other.m_enlistedTransaction;
+			other.m_enlistedTransaction = null;
 		}
 
-		ImplicitTransactionBase m_implicitTransaction;
+		EnlistedTransactionBase m_enlistedTransaction;
 #endif
 
 		public override void Close() => DoClose(changeState: true);
@@ -523,7 +523,7 @@ internal async Task<CachedProcedure> GetCachedProcedure(IOBehavior ioBehavior, s
 #if NETSTANDARD1_3
 		internal bool IgnoreCommandTransaction => m_connectionSettings.IgnoreCommandTransaction;
 #else
-		internal bool IgnoreCommandTransaction => m_connectionSettings.IgnoreCommandTransaction || m_implicitTransaction is StandardImplicitTransaction;
+		internal bool IgnoreCommandTransaction => m_connectionSettings.IgnoreCommandTransaction || m_enlistedTransaction is StandardEnlistedTransaction;
 #endif
 		internal bool IgnorePrepare => m_connectionSettings.IgnorePrepare;
 		internal bool TreatTinyAsBoolean => m_connectionSettings.TreatTinyAsBoolean;
@@ -642,7 +642,7 @@ private void DoClose(bool changeState)
 #if !NETSTANDARD1_3
 			// If participating in a distributed transaction, keep the connection open so we can commit or rollback.
 			// This handles the common pattern of disposing a connection before disposing a TransactionScope (e.g., nested using blocks)
-			if (!(m_implicitTransaction is null))
+			if (!(m_enlistedTransaction is null))
 			{
 				// make sure all DB work is done
 				m_activeReader?.Dispose();
@@ -663,7 +663,7 @@ private void DoClose(bool changeState)
 				// put the new, idle, connection into the list of sessions for this transaction (replacing this MySqlConnection)
 				lock (s_lock)
 				{
-					foreach (var enlistedTransaction in s_transactionConnections[connection.m_implicitTransaction.Transaction])
+					foreach (var enlistedTransaction in s_transactionConnections[connection.m_enlistedTransaction.Transaction])
 					{
 						if (enlistedTransaction.Connection == this)
 						{
@@ -727,7 +727,7 @@ private ConnectionSettings GetConnectionSettings()
 		static readonly StateChangeEventArgs s_stateChangeOpenClosed = new StateChangeEventArgs(ConnectionState.Open, ConnectionState.Closed);
 #if !NETSTANDARD1_3
 		static readonly object s_lock = new object();
-		static readonly Dictionary<System.Transactions.Transaction, List<ImplicitTransactionBase>> s_transactionConnections = new Dictionary<System.Transactions.Transaction, List<ImplicitTransactionBase>>();
+		static readonly Dictionary<System.Transactions.Transaction, List<EnlistedTransactionBase>> s_transactionConnections = new Dictionary<System.Transactions.Transaction, List<EnlistedTransactionBase>>();
 #endif
 
 		string m_connectionString;