Move standard implementations back to MySqlCommand.

These were moved to ICommandExecutor in 16d2c99, but don't need to support customised implementations.

Author: bgrainger

src/MySqlConnector/Core/ICommandExecutor.cs

@@ -9,10 +9,6 @@ namespace MySqlConnector.Core
 {
 	internal interface ICommandExecutor
 	{
-		Task<int> ExecuteNonQueryAsync(string commandText, MySqlParameterCollection parameterCollection, IOBehavior ioBehavior, CancellationToken cancellationToken);
-
-		Task<object> ExecuteScalarAsync(string commandText, MySqlParameterCollection parameterCollection, IOBehavior ioBehavior, CancellationToken cancellationToken);
-
 		Task<DbDataReader> ExecuteReaderAsync(string commandText, MySqlParameterCollection parameterCollection, CommandBehavior behavior, IOBehavior ioBehavior, CancellationToken cancellationToken);
 	}
 }

src/MySqlConnector/Core/TextCommandExecutor.cs

@@ -20,42 +20,6 @@ internal TextCommandExecutor(MySqlCommand command)
 			m_command = command;
 		}
 
-		public virtual async Task<int> ExecuteNonQueryAsync(string commandText, MySqlParameterCollection parameterCollection,
-			IOBehavior ioBehavior, CancellationToken cancellationToken)
-		{
-			using (var reader = (MySqlDataReader) await ExecuteReaderAsync(commandText, parameterCollection, CommandBehavior.Default, ioBehavior, cancellationToken).ConfigureAwait(false))
-			{
-				do
-				{
-					while (await reader.ReadAsync(ioBehavior, cancellationToken).ConfigureAwait(false))
-					{
-					}
-				} while (await reader.NextResultAsync(ioBehavior, cancellationToken).ConfigureAwait(false));
-				return reader.RecordsAffected;
-			}
-		}
-
-		public virtual async Task<object> ExecuteScalarAsync(string commandText, MySqlParameterCollection parameterCollection,
-			IOBehavior ioBehavior, CancellationToken cancellationToken)
-		{
-			var hasSetResult = false;
-			object result = null;
-			using (var reader = (MySqlDataReader) await ExecuteReaderAsync(commandText, parameterCollection, CommandBehavior.SingleResult | CommandBehavior.SingleRow, ioBehavior, cancellationToken).ConfigureAwait(false))
-			{
-				do
-				{
-					var hasResult = await reader.ReadAsync(ioBehavior, cancellationToken).ConfigureAwait(false);
-					if (!hasSetResult)
-					{
-						if (hasResult)
-							result = reader.GetValue(0);
-						hasSetResult = true;
-					}
-				} while (await reader.NextResultAsync(ioBehavior, cancellationToken).ConfigureAwait(false));
-			}
-			return result;
-		}
-
 		public virtual async Task<DbDataReader> ExecuteReaderAsync(string commandText, MySqlParameterCollection parameterCollection,
 			CommandBehavior behavior, IOBehavior ioBehavior, CancellationToken cancellationToken)
 		{

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

@@ -54,17 +54,9 @@ public MySqlCommand(string commandText, MySqlConnection connection, MySqlTransac
 
 		public override void Cancel() => Connection.Cancel(this);
 
-		public override int ExecuteNonQuery()
-		{
-			ResetCommandTimeout();
-			return ExecuteNonQueryAsync(IOBehavior.Synchronous, CancellationToken.None).GetAwaiter().GetResult();
-		}
+		public override int ExecuteNonQuery() => ExecuteNonQueryAsync(IOBehavior.Synchronous, CancellationToken.None).GetAwaiter().GetResult();
 
-		public override object ExecuteScalar()
-		{
-			ResetCommandTimeout();
-			return ExecuteScalarAsync(IOBehavior.Synchronous, CancellationToken.None).GetAwaiter().GetResult();
-		}
+		public override object ExecuteScalar() => ExecuteScalarAsync(IOBehavior.Synchronous, CancellationToken.None).GetAwaiter().GetResult();
 
 		public new MySqlDataReader ExecuteReader() => (MySqlDataReader) base.ExecuteReader();
 
@@ -174,16 +166,44 @@ protected override DbDataReader ExecuteDbDataReader(CommandBehavior behavior)
 		public override Task<int> ExecuteNonQueryAsync(CancellationToken cancellationToken) =>
 			ExecuteNonQueryAsync(AsyncIOBehavior, cancellationToken);
 
-		internal Task<int> ExecuteNonQueryAsync(IOBehavior ioBehavior, CancellationToken cancellationToken) =>
-			!IsValid(out var exception) ? Utility.TaskFromException<int>(exception) :
-				m_commandExecutor.ExecuteNonQueryAsync(CommandText, m_parameterCollection, ioBehavior, cancellationToken);
+		internal async Task<int> ExecuteNonQueryAsync(IOBehavior ioBehavior, CancellationToken cancellationToken)
+		{
+			ResetCommandTimeout();
+			using (var reader = (MySqlDataReader) await ExecuteReaderAsync(CommandBehavior.Default, ioBehavior, cancellationToken).ConfigureAwait(false))
+			{
+				do
+				{
+					while (await reader.ReadAsync(ioBehavior, cancellationToken).ConfigureAwait(false))
+					{
+					}
+				} while (await reader.NextResultAsync(ioBehavior, cancellationToken).ConfigureAwait(false));
+				return reader.RecordsAffected;
+			}
+		}
 
 		public override Task<object> ExecuteScalarAsync(CancellationToken cancellationToken) =>
 			ExecuteScalarAsync(AsyncIOBehavior, cancellationToken);
 
-		internal Task<object> ExecuteScalarAsync(IOBehavior ioBehavior, CancellationToken cancellationToken) =>
-			!IsValid(out var exception) ? Utility.TaskFromException<object>(exception) :
-				m_commandExecutor.ExecuteScalarAsync(CommandText, m_parameterCollection, ioBehavior, cancellationToken);
+		internal async Task<object> ExecuteScalarAsync(IOBehavior ioBehavior, CancellationToken cancellationToken)
+		{
+			ResetCommandTimeout();
+			var hasSetResult = false;
+			object result = null;
+			using (var reader = (MySqlDataReader) await ExecuteReaderAsync(CommandBehavior.SingleResult | CommandBehavior.SingleRow, ioBehavior, cancellationToken).ConfigureAwait(false))
+			{
+				do
+				{
+					var hasResult = await reader.ReadAsync(ioBehavior, cancellationToken).ConfigureAwait(false);
+					if (!hasSetResult)
+					{
+						if (hasResult)
+							result = reader.GetValue(0);
+						hasSetResult = true;
+					}
+				} while (await reader.NextResultAsync(ioBehavior, cancellationToken).ConfigureAwait(false));
+			}
+			return result;
+		}
 
 		protected override Task<DbDataReader> ExecuteDbDataReaderAsync(CommandBehavior behavior, CancellationToken cancellationToken)
 		{