Implement CommandBehavior for MySqlBatch.ExecuteReader.

This moved from the individual DbBatchCommand to ExecuteReader during the development of the .NET API.

Author: bgrainger

src/MySqlConnector/MySqlBatch.cs

@@ -136,7 +136,7 @@ private DbDataReader ExecuteDbDataReader(CommandBehavior behavior)
 #endif
 		{
 			((ICancellableCommand) this).ResetCommandTimeout();
-			return ExecuteReaderAsync(IOBehavior.Synchronous, CancellationToken.None).GetAwaiter().GetResult();
+			return ExecuteReaderAsync(behavior, IOBehavior.Synchronous, CancellationToken.None).GetAwaiter().GetResult();
 		}
 
 #if NET6_0_OR_GREATER
@@ -147,21 +147,22 @@ private async Task<DbDataReader> ExecuteDbDataReaderAsync(CommandBehavior behavi
 		{
 			((ICancellableCommand) this).ResetCommandTimeout();
 			using var registration = ((ICancellableCommand) this).RegisterCancel(cancellationToken);
-			return await ExecuteReaderAsync(AsyncIOBehavior, cancellationToken).ConfigureAwait(false);
+			return await ExecuteReaderAsync(behavior, AsyncIOBehavior, cancellationToken).ConfigureAwait(false);
 		}
 
-		private Task<MySqlDataReader> ExecuteReaderAsync(IOBehavior ioBehavior, CancellationToken cancellationToken)
+		private Task<MySqlDataReader> ExecuteReaderAsync(CommandBehavior behavior, IOBehavior ioBehavior, CancellationToken cancellationToken)
 		{
 			if (!IsValid(out var exception))
 			 	return Utility.TaskFromException<MySqlDataReader>(exception);
 
+			CurrentCommandBehavior = behavior;
 			foreach (MySqlBatchCommand batchCommand in BatchCommands)
 				batchCommand.Batch = this;
 
 			var payloadCreator = Connection!.Session.SupportsComMulti ? BatchedCommandPayloadCreator.Instance :
 				IsPrepared ? SingleCommandPayloadCreator.Instance :
 				ConcatenatedCommandPayloadCreator.Instance;
-			return CommandExecutor.ExecuteReaderAsync(BatchCommands!.Commands, payloadCreator, CommandBehavior.Default, ioBehavior, cancellationToken);
+			return CommandExecutor.ExecuteReaderAsync(BatchCommands!.Commands, payloadCreator, behavior, ioBehavior, cancellationToken);
 		}
 
 #if NET6_0_OR_GREATER
@@ -241,6 +242,8 @@ public void Dispose()
 			m_isDisposed = true;
 		}
 
+		internal CommandBehavior CurrentCommandBehavior { get; set; }
+
 		int ICancellableCommand.CommandId => m_commandId;
 		int ICancellableCommand.CommandTimeout => Timeout;
 		int ICancellableCommand.CancelAttemptCount { get; set; }
@@ -280,7 +283,7 @@ private async Task<int> ExecuteNonQueryAsync(IOBehavior ioBehavior, Cancellation
 		{
 			((ICancellableCommand) this).ResetCommandTimeout();
 			using var registration = ((ICancellableCommand) this).RegisterCancel(cancellationToken);
-			using var reader = await ExecuteReaderAsync(ioBehavior, cancellationToken).ConfigureAwait(false);
+			using var reader = await ExecuteReaderAsync(CommandBehavior.Default, ioBehavior, cancellationToken).ConfigureAwait(false);
 			do
 			{
 				while (await reader.ReadAsync(ioBehavior, cancellationToken).ConfigureAwait(false))
@@ -296,7 +299,7 @@ private async Task<int> ExecuteNonQueryAsync(IOBehavior ioBehavior, Cancellation
 			using var registration = ((ICancellableCommand) this).RegisterCancel(cancellationToken);
 			var hasSetResult = false;
 			object? result = null;
-			using var reader = await ExecuteReaderAsync(ioBehavior, cancellationToken).ConfigureAwait(false);
+			using var reader = await ExecuteReaderAsync(CommandBehavior.Default, ioBehavior, cancellationToken).ConfigureAwait(false);
 			do
 			{
 				var hasResult = await reader.ReadAsync(ioBehavior, cancellationToken).ConfigureAwait(false);

src/MySqlConnector/MySqlBatchCommand.cs

@@ -51,7 +51,7 @@ public MySqlBatchCommand(string? commandText)
 
 		bool IMySqlCommand.AllowUserVariables => false;
 
-		CommandBehavior IMySqlCommand.CommandBehavior => CommandBehavior.Default;
+		CommandBehavior IMySqlCommand.CommandBehavior => Batch!.CurrentCommandBehavior;
 
 		MySqlParameterCollection? IMySqlCommand.RawParameters => m_parameterCollection;
 

tests/SideBySide/BatchTests.cs

@@ -80,7 +80,7 @@ public void NotDisposed()
 			Assert.Throws<ObjectDisposedException>(() => batch.ExecuteNonQuery());
 		}
 
-		[Fact(Skip = "Not implemented")]
+		[Fact]
 		public void CloseConnection()
 		{
 			using var connection = new MySqlConnection(AppConfig.ConnectionString);
@@ -229,19 +229,14 @@ public void ExecuteInvalidSqlBatch()
 			Assert.Equal(1, reader.GetInt32(0));
 			Assert.False(reader.Read());
 
-			try
-			{
-				reader.NextResult();
-				Assert.True(false, "Shouldn't get here");
-			}
-			catch (MySqlException ex)
-			{
-				Assert.Equal(MySqlErrorCode.ParseError, ex.ErrorCode);
-			}
+			var ex = Assert.Throws<MySqlException>(() => reader.NextResult());
+			Assert.Equal(MySqlErrorCode.ParseError, ex.ErrorCode);
 		}
 
-		[Fact(Skip = "Not implemented")]
-		public void SingleRow()
+		[Theory]
+		[InlineData(false)]
+		[InlineData(true)]
+		public void SingleRow(bool prepare)
 		{
 			using var connection = new MySqlConnection(AppConfig.ConnectionString);
 			connection.Open();
@@ -257,8 +252,13 @@ public void SingleRow()
 				BatchCommands =
 				{
 					new MySqlBatchCommand("SELECT id FROM batch_single_row ORDER BY id"),
+					new MySqlBatchCommand("SELECT id FROM batch_single_row ORDER BY id"),
 				},
 			};
+
+			if (prepare)
+				batch.Prepare();
+
 			using var reader = batch.ExecuteReader(CommandBehavior.SingleRow);
 			Assert.True(reader.Read());
 			Assert.Equal(1, reader.GetInt32(0));