Support Memory<T> as MySqlParameter.Value.

Author: bgrainger

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

@@ -254,28 +254,30 @@ internal void AppendSqlString(ByteBufferWriter writer, StatementPreparerOptions
 			{
 				writer.WriteString(ulongValue);
 			}
-			else if (Value is byte[] || Value is ReadOnlyMemory<byte>)
+			else if (Value is byte[] || Value is ReadOnlyMemory<byte> || Value is Memory<byte>)
 			{
-				var memoryValue = Value is byte[] byteArrayValue ? byteArrayValue.AsSpan() : ((ReadOnlyMemory<byte>) Value).Span;
+				var inputSpan = Value is byte[] byteArray ? byteArray.AsSpan() :
+					Value is Memory<byte> memory ? memory.Span :
+					((ReadOnlyMemory<byte>) Value).Span;
 
 				// determine the number of bytes to be written
-				var length = memoryValue.Length + s_binaryBytes.Length + 1;
-				foreach (var by in memoryValue)
+				var length = inputSpan.Length + s_binaryBytes.Length + 1;
+				foreach (var by in inputSpan)
 				{
 					if (by == 0x27 || by == 0x5C)
 						length++;
 				}
 
-				var span = writer.GetSpan(length);
-				s_binaryBytes.CopyTo(span);
+				var outputSpan = writer.GetSpan(length);
+				s_binaryBytes.CopyTo(outputSpan);
 				var index = s_binaryBytes.Length;
-				foreach (var by in memoryValue)
+				foreach (var by in inputSpan)
 				{
 					if (by == 0x27 || by == 0x5C)
-						span[index++] = 0x5C;
-					span[index++] = by;
+						outputSpan[index++] = 0x5C;
+					outputSpan[index++] = by;
 				}
-				span[index++] = 0x27;
+				outputSpan[index++] = 0x27;
 				Debug.Assert(index == length, "index == length");
 				writer.Advance(index);
 			}
@@ -462,6 +464,11 @@ internal void AppendBinary(ByteBufferWriter writer, StatementPreparerOptions opt
 				writer.WriteLengthEncodedInteger(unchecked((ulong) readOnlyMemoryValue.Length));
 				writer.Write(readOnlyMemoryValue.Span);
 			}
+			else if (Value is Memory<byte> memoryValue)
+			{
+				writer.WriteLengthEncodedInteger(unchecked((ulong) memoryValue.Length));
+				writer.Write(memoryValue.Span);
+			}
 			else if (Value is float floatValue)
 			{
 				writer.Write(BitConverter.GetBytes(floatValue));

tests/SideBySide/InsertTests.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Data;
 using System.Linq;
 using System.Threading.Tasks;
@@ -393,10 +394,11 @@ value set('one', 'two', 'four', 'eight') null
 
 
 #if !BASELINE
-		[Fact]
-		public void InsertReadOnlyMemory()
+		[Theory]
+		[MemberData(nameof(GetBlobs))]
+		public void InsertBlob(object data, bool prepare)
 		{
-			using (var connection = new MySqlConnection(AppConfig.ConnectionString))
+			using (var connection = new MySqlConnection(AppConfig.ConnectionString + ";IgnorePrepare=false"))
 			{
 				connection.Open();
 				connection.Execute(@"drop table if exists insert_mysql_blob;
@@ -407,32 +409,26 @@ value mediumblob null
 
 				using (var cmd = new MySqlCommand("insert into insert_mysql_blob(value) values(@data);", connection))
 				{
-					cmd.Parameters.AddWithValue("@data", new ReadOnlyMemory<byte>(new byte[] { 0, 1, 2, 3, 4, 5, 6, 7, 8 }, 1, 6));
+					cmd.Parameters.AddWithValue("@data", data);
+					if (prepare)
+						cmd.Prepare();
 					cmd.ExecuteNonQuery();
 				}
 				Assert.Equal(new byte[] { 1, 2, 3, 4, 5, 6 }, connection.Query<byte[]>(@"select value from insert_mysql_blob;").Single());
 			}
 		}
 
-		[Fact]
-		public void InsertReadOnlyMemoryPrepared()
+		public static IEnumerable<object[]> GetBlobs()
 		{
-			using (var connection = new MySqlConnection(AppConfig.ConnectionString + ";IgnorePrepare=false"))
+			foreach (var blob in new object[]
 			{
-				connection.Open();
-				connection.Execute(@"drop table if exists insert_mysql_blob;
-create table insert_mysql_blob(
-	rowid integer not null primary key auto_increment,
-	value mediumblob null
-);");
-
-				using (var cmd = new MySqlCommand("insert into insert_mysql_blob(value) values(@data);", connection))
-				{
-					cmd.Parameters.AddWithValue("@data", new ReadOnlyMemory<byte>(new byte[] { 0, 1, 2, 3, 4, 5, 6, 7, 8 }, 1, 6));
-					cmd.Prepare();
-					cmd.ExecuteNonQuery();
-				}
-				Assert.Equal(new byte[] { 1, 2, 3, 4, 5, 6 }, connection.Query<byte[]>(@"select value from insert_mysql_blob;").Single());
+				new byte[] { 1, 2, 3, 4, 5, 6 },
+				new ReadOnlyMemory<byte>(new byte[] { 0, 1, 2, 3, 4, 5, 6, 7, 8 }, 1, 6),
+				new Memory<byte>(new byte[] { 0, 1, 2, 3, 4, 5, 6, 7, 8 }, 1, 6),
+			})
+			{
+				yield return new[] { blob, false };
+				yield return new[] { blob, true };
 			}
 		}
 #endif