Rename parameters to match interface declarations.

Author: bgrainger

src/MySqlConnector/Core/EnlistedTransactionBase.cs

@@ -20,10 +20,10 @@ public void Start()
 			Transaction!.EnlistVolatile(this, EnlistmentOptions.None);
 		}
 
-		void IEnlistmentNotification.Prepare(PreparingEnlistment enlistment)
+		void IEnlistmentNotification.Prepare(PreparingEnlistment preparingEnlistment)
 		{
-			OnPrepare(enlistment);
-			enlistment.Prepared();
+			OnPrepare(preparingEnlistment);
+			preparingEnlistment.Prepared();
 		}
 
 		void IEnlistmentNotification.Commit(Enlistment enlistment)

src/MySqlConnector/MySqlBatch.cs

@@ -162,13 +162,13 @@ public void Dispose()
 		int ICancellableCommand.CommandTimeout => Timeout;
 		int ICancellableCommand.CancelAttemptCount { get; set; }
 
-		IDisposable? ICancellableCommand.RegisterCancel(CancellationToken token)
+		IDisposable? ICancellableCommand.RegisterCancel(CancellationToken cancellationToken)
 		{
-			if (!token.CanBeCanceled)
+			if (!cancellationToken.CanBeCanceled)
 				return null;
 
 			m_cancelAction ??= Cancel;
-			return token.Register(m_cancelAction);
+			return cancellationToken.Register(m_cancelAction);
 		}
 
 		void ICancellableCommand.SetTimeout(int milliseconds)

src/MySqlConnector/MySqlCommand.cs

@@ -233,7 +233,7 @@ public override CommandType CommandType
 		/// </remarks>
 		public long LastInsertedId { get; private set; }
 
-		void IMySqlCommand.SetLastInsertedId(long value) => LastInsertedId = value;
+		void IMySqlCommand.SetLastInsertedId(long lastInsertedId) => LastInsertedId = lastInsertedId;
 
 		protected override DbConnection? DbConnection
 		{
@@ -346,19 +346,19 @@ public override ValueTask DisposeAsync()
 		}
 
 		/// <summary>
-		/// Registers <see cref="Cancel"/> as a callback with <paramref name="token"/> if cancellation is supported.
+		/// Registers <see cref="Cancel"/> as a callback with <paramref name="cancellationToken"/> if cancellation is supported.
 		/// </summary>
-		/// <param name="token">The <see cref="CancellationToken"/>.</param>
+		/// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
 		/// <returns>An object that must be disposed to revoke the cancellation registration.</returns>
 		/// <remarks>This method is more efficient than calling <code>token.Register(Command.Cancel)</code> because it avoids
 		/// unnecessary allocations.</remarks>
-		IDisposable? ICancellableCommand.RegisterCancel(CancellationToken token)
+		IDisposable? ICancellableCommand.RegisterCancel(CancellationToken cancellationToken)
 		{
-			if (!token.CanBeCanceled)
+			if (!cancellationToken.CanBeCanceled)
 				return null;
 
 			m_cancelAction ??= Cancel;
-			return token.Register(m_cancelAction);
+			return cancellationToken.Register(m_cancelAction);
 		}
 
 		void ICancellableCommand.SetTimeout(int milliseconds)

src/MySqlConnector/MySqlConnection.cs

@@ -541,9 +541,9 @@ private static async Task ClearPoolAsync(MySqlConnection connection, IOBehavior
 		/// Returns schema information for the data source of this <see cref="MySqlConnection"/>.
 		/// </summary>
 		/// <param name="collectionName">The name of the schema to return.</param>
-		/// <param name="restrictions">The restrictions to apply to the schema; this parameter is currently ignored.</param>
+		/// <param name="restrictionValues">The restrictions to apply to the schema; this parameter is currently ignored.</param>
 		/// <returns>A <see cref="DataTable"/> containing schema information.</returns>
-		public override DataTable GetSchema(string collectionName, string?[] restrictions) => GetSchemaProvider().GetSchemaAsync(IOBehavior.Synchronous, collectionName, default).GetAwaiter().GetResult();
+		public override DataTable GetSchema(string collectionName, string?[] restrictionValues) => GetSchemaProvider().GetSchemaAsync(IOBehavior.Synchronous, collectionName, default).GetAwaiter().GetResult();
 
 		/// <summary>
 		/// Asynchronously returns schema information for the data source of this <see cref="MySqlConnection"/>.
@@ -576,14 +576,14 @@ public override Task<DataTable> GetSchemaAsync(string collectionName, Cancellati
 		/// Asynchronously returns schema information for the data source of this <see cref="MySqlConnection"/>.
 		/// </summary>
 		/// <param name="collectionName">The name of the schema to return.</param>
-		/// <param name="restrictions">The restrictions to apply to the schema; this parameter is currently ignored.</param>
+		/// <param name="restrictionValues">The restrictions to apply to the schema; this parameter is currently ignored.</param>
 		/// <param name="cancellationToken">A token to cancel the asynchronous operation.</param>
 		/// <returns>A <see cref="Task{DataTable}"/> containing schema information.</returns>
 		/// <remarks>The proposed ADO.NET API that this is based on is not finalized; this API may change in the future.</remarks>
 #if NET45 || NET461 || NET471 || NETSTANDARD1_3 || NETSTANDARD2_0 || NETSTANDARD2_1 || NETCOREAPP2_1 || NETCOREAPP3_1
-		public Task<DataTable> GetSchemaAsync(string collectionName, string?[] restrictions, CancellationToken cancellationToken = default)
+		public Task<DataTable> GetSchemaAsync(string collectionName, string?[] restrictionValues, CancellationToken cancellationToken = default)
 #else
-		public override Task<DataTable> GetSchemaAsync(string collectionName, string?[] restrictions, CancellationToken cancellationToken = default)
+		public override Task<DataTable> GetSchemaAsync(string collectionName, string?[] restrictionValues, CancellationToken cancellationToken = default)
 #endif
 			=> GetSchemaProvider().GetSchemaAsync(AsyncIOBehavior, collectionName, cancellationToken).AsTask();
 

src/MySqlConnector/MySqlConnectionStringBuilder.cs

@@ -371,15 +371,15 @@ public bool UseXaTransactions
 		}
 
 		// Other Methods
-		public override bool ContainsKey(string key)
+		public override bool ContainsKey(string keyword)
 		{
-			var option = MySqlConnectionStringOption.TryGetOptionForKey(key);
+			var option = MySqlConnectionStringOption.TryGetOptionForKey(keyword);
 			return option is object && base.ContainsKey(option.Key);
 		}
 
-		public override bool Remove(string key)
+		public override bool Remove(string keyword)
 		{
-			var option = MySqlConnectionStringOption.TryGetOptionForKey(key);
+			var option = MySqlConnectionStringOption.TryGetOptionForKey(keyword);
 			return option is object && base.Remove(option.Key);
 		}