Remove definitions of System.Data.Common DbBatch types.

When these are supported in a future .NET Core version, conditional compilation will be used to derive from the appropriate base classes.

Author: bgrainger

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

@@ -7,69 +7,9 @@
 using MySqlConnector.Protocol.Serialization;
 using MySqlConnector.Utilities;
 
-#if NET45 || NET461 || NET471 || NETSTANDARD1_3 || NETSTANDARD2_0 || NETSTANDARD2_1 || NETCOREAPP2_1 || NETCOREAPP3_0
-namespace System.Data.Common
-{
-	public abstract class DbBatch : IDisposable
-	{
-		public DbBatchCommandCollection BatchCommands => DbBatchCommands;
-		protected abstract DbBatchCommandCollection DbBatchCommands { get; }
-
-		#region Execution (mirrors DbCommand)
-
-		public DbDataReader ExecuteReader() => ExecuteDbDataReader();
-		protected abstract DbDataReader ExecuteDbDataReader();
-		public Task<DbDataReader> ExecuteReaderAsync(CancellationToken cancellationToken = default) => ExecuteDbDataReaderAsync(cancellationToken);
-		protected abstract Task<DbDataReader> ExecuteDbDataReaderAsync(CancellationToken cancellationToken);
-
-		public abstract int ExecuteNonQuery();
-		public abstract Task<int> ExecuteNonQueryAsync(CancellationToken cancellationToken = default);
-
-		public abstract object ExecuteScalar();
-		public abstract Task<object> ExecuteScalarAsync(CancellationToken cancellationToken = default);
-
-		#endregion
-
-		#region Execution properties (mirrors DbCommand)
-
-		public abstract int Timeout { get; set; }
-
-		// Delegates to DbConnection
-		public DbConnection Connection { get; set; }
-		protected abstract DbConnection DbConnection { get; set; }
-
-		// Delegates to DbTransaction
-		public DbTransaction Transaction { get; set; }
-		protected abstract DbTransaction DbTransaction { get; set; }
-
-		#endregion
-
-		#region Other methods mirroring DbCommand
-
-		public abstract void Prepare();
-		public abstract Task PrepareAsync(CancellationToken cancellationToken = default);
-		public abstract void Cancel();
-
-		#endregion
-
-		#region Standard dispose pattern
-
-		public void Dispose()
-		{
-			Dispose(true);
-			GC.SuppressFinalize(this);
-		}
-
-		protected virtual void Dispose(bool disposing) { }
-
-		#endregion
-	}
-}
-#endif
-
 namespace MySql.Data.MySqlClient
 {
-	public sealed class MySqlBatch : DbBatch, ICancellableCommand
+	public sealed class MySqlBatch : ICancellableCommand, IDisposable
 	{
 		public MySqlBatch()
 			: this(null, null)
@@ -84,31 +24,20 @@ public MySqlBatch(MySqlConnection connection = null, MySqlTransaction transactio
 			m_commandId = ICancellableCommandExtensions.GetNextId();
 		}
 
-		public new MySqlConnection Connection { get; set; }
-		public new MySqlTransaction Transaction { get; set; }
-		public new MySqlBatchCommandCollection BatchCommands { get; }
-
-		protected override DbConnection DbConnection
-		{
-			get => Connection;
-			set => Connection = (MySqlConnection) value;
-		}
-
-		protected override DbTransaction DbTransaction
-		{
-			get => Transaction;
-			set => Transaction = (MySqlTransaction) value;
-		}
+		public MySqlConnection Connection { get; set; }
+		public MySqlTransaction Transaction { get; set; }
+		public MySqlBatchCommandCollection BatchCommands { get; }
 
-		protected override DbBatchCommandCollection DbBatchCommands => BatchCommands;
+		public DbDataReader ExecuteReader() => ExecuteDbDataReader();
+		public Task<DbDataReader> ExecuteReaderAsync(CancellationToken cancellationToken = default) => ExecuteDbDataReaderAsync(cancellationToken);
 
-		protected override DbDataReader ExecuteDbDataReader()
+		private DbDataReader ExecuteDbDataReader()
 		{
 			((ICancellableCommand) this).ResetCommandTimeout();
 			return ExecuteReaderAsync(IOBehavior.Synchronous, CancellationToken.None).GetAwaiter().GetResult();
 		}
 
-		protected override Task<DbDataReader> ExecuteDbDataReaderAsync(CancellationToken cancellationToken)
+		private Task<DbDataReader> ExecuteDbDataReaderAsync(CancellationToken cancellationToken)
 		{
 			((ICancellableCommand) this).ResetCommandTimeout();
 			return ExecuteReaderAsync(AsyncIOBehavior, cancellationToken);
@@ -128,17 +57,17 @@ private Task<DbDataReader> ExecuteReaderAsync(IOBehavior ioBehavior, Cancellatio
 			return CommandExecutor.ExecuteReaderAsync(BatchCommands, payloadCreator, CommandBehavior.Default, ioBehavior, cancellationToken);
 		}
 
-		public override int ExecuteNonQuery() => ExecuteNonQueryAsync(IOBehavior.Synchronous, CancellationToken.None).GetAwaiter().GetResult();
+		public int ExecuteNonQuery() => ExecuteNonQueryAsync(IOBehavior.Synchronous, CancellationToken.None).GetAwaiter().GetResult();
 
-		public override object ExecuteScalar() => ExecuteScalarAsync(IOBehavior.Synchronous, CancellationToken.None).GetAwaiter().GetResult();
+		public object ExecuteScalar() => ExecuteScalarAsync(IOBehavior.Synchronous, CancellationToken.None).GetAwaiter().GetResult();
 
-		public override Task<int> ExecuteNonQueryAsync(CancellationToken cancellationToken = default) => ExecuteNonQueryAsync(AsyncIOBehavior, cancellationToken);
+		public Task<int> ExecuteNonQueryAsync(CancellationToken cancellationToken = default) => ExecuteNonQueryAsync(AsyncIOBehavior, cancellationToken);
 
-		public override Task<object> ExecuteScalarAsync(CancellationToken cancellationToken = default) => ExecuteScalarAsync(AsyncIOBehavior, cancellationToken);
+		public Task<object> ExecuteScalarAsync(CancellationToken cancellationToken = default) => ExecuteScalarAsync(AsyncIOBehavior, cancellationToken);
 
-		public override int Timeout { get; set; }
+		public int Timeout { get; set; }
 
-		public override void Prepare()
+		public void Prepare()
 		{
 			if (!NeedsPrepare(out var exception))
 			{
@@ -150,20 +79,13 @@ public override void Prepare()
 			DoPrepareAsync(IOBehavior.Synchronous, default).GetAwaiter().GetResult();
 		}
 
-		public override Task PrepareAsync(CancellationToken cancellationToken = default) => PrepareAsync(AsyncIOBehavior, cancellationToken);
+		public Task PrepareAsync(CancellationToken cancellationToken = default) => PrepareAsync(AsyncIOBehavior, cancellationToken);
 
-		public override void Cancel() => Connection?.Cancel(this);
+		public void Cancel() => Connection?.Cancel(this);
 
-		protected override void Dispose(bool disposing)
+		public void Dispose()
 		{
-			try
-			{
-				m_isDisposed = true;
-			}
-			finally
-			{
-				base.Dispose(disposing);
-			}
+			m_isDisposed = true;
 		}
 
 		int ICancellableCommand.CommandId => m_commandId;

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

@@ -1,26 +1,9 @@
 using System.Data;
-using System.Data.Common;
 using MySqlConnector.Core;
 
-#if NET45 || NET461 || NET471 || NETSTANDARD1_3 || NETSTANDARD2_0 || NETSTANDARD2_1 || NETCOREAPP2_1 || NETCOREAPP3_0
-namespace System.Data.Common
-{
-	public abstract class DbBatchCommand
-	{
-		public abstract string CommandText { get; set; }
-		public abstract CommandType CommandType { get; set; }
-		public abstract CommandBehavior CommandBehavior { get; set; }
-		public abstract int RecordsAffected { get; set; }
-
-		public DbParameterCollection Parameters => DbParameterCollection;
-		protected abstract DbParameterCollection DbParameterCollection { get; }
-	}
-}
-#endif
-
 namespace MySql.Data.MySqlClient
 {
-	public sealed class MySqlBatchCommand : DbBatchCommand, IMySqlCommand
+	public sealed class MySqlBatchCommand : IMySqlCommand
 	{
 		public MySqlBatchCommand()
 			: this(null)
@@ -33,13 +16,12 @@ public MySqlBatchCommand(string commandText)
 			CommandType = CommandType.Text;
 		}
 
-		public override string CommandText { get; set; }
-		public override CommandType CommandType { get; set; }
-		public override CommandBehavior CommandBehavior { get; set; }
-		public override int RecordsAffected { get; set; }
-		protected override DbParameterCollection DbParameterCollection => Parameters;
+		public string CommandText { get; set; }
+		public CommandType CommandType { get; set; }
+		public CommandBehavior CommandBehavior { get; set; }
+		public int RecordsAffected { get; set; }
 
-		public new MySqlParameterCollection Parameters
+		public MySqlParameterCollection Parameters
 		{
 			get
 			{

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

@@ -1,20 +1,10 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.Data.Common;
 using MySqlConnector.Core;
 
-#if NET45 || NET461 || NET471 || NETSTANDARD1_3 || NETSTANDARD2_0 || NETSTANDARD2_1 || NETCOREAPP2_1 || NETCOREAPP3_0
-namespace System.Data.Common
-{
-	public abstract class DbBatchCommandCollection : Collection<DbBatchCommand>
-	{
-	}
-}
-#endif
-
 namespace MySql.Data.MySqlClient
 {
-	public sealed class MySqlBatchCommandCollection : DbBatchCommandCollection, IReadOnlyList<IMySqlCommand>
+	public sealed class MySqlBatchCommandCollection : Collection<MySqlBatchCommand>, IReadOnlyList<IMySqlCommand>
 	{
 		public new MySqlBatchCommand this[int index]
 		{

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

@@ -16,8 +16,8 @@ public sealed class MySqlClientFactory : DbProviderFactory
 		public override DbDataAdapter CreateDataAdapter() => new MySqlDataAdapter();
 #endif
 
-		public DbBatch CreateBatch() => new MySqlBatch();
-		public DbBatchCommand CreateBatchCommand() => new MySqlBatchCommand();
+		public MySqlBatch CreateBatch() => new MySqlBatch();
+		public MySqlBatchCommand CreateBatchCommand() => new MySqlBatchCommand();
 		public bool CanCreateBatch => true;
 
 		private MySqlClientFactory()