Extract WriteQueryPayload method.

Author: bgrainger

src/MySqlConnector/Core/SingleCommandPayloadCreator.cs

@@ -29,15 +29,14 @@ public bool WriteQueryCommand(ref CommandListPosition commandListPosition, IDict
 				if (Log.IsDebugEnabled())
 					Log.Debug("Session{0} Preparing command payload; CommandText: {1}", command.Connection.Session.Id, command.CommandText);
 
-				if (command.CommandType == CommandType.StoredProcedure)
-					WriteStoredProcedure(command, cachedProcedures, writer);
-				else
-					WriteCommand(command, writer);
+				writer.Write((byte) CommandKind.Query);
+				WriteQueryPayload(command, cachedProcedures, writer);
 
 				commandListPosition.CommandIndex++;
 			}
 			else
 			{
+				writer.Write((byte) CommandKind.StatementExecute);
 				WritePreparedStatement(command, preparedStatements.Statements[commandListPosition.PreparedStatementIndex], writer);
 
 				// advance to next prepared statement or next command
@@ -47,18 +46,24 @@ public bool WriteQueryCommand(ref CommandListPosition commandListPosition, IDict
 					commandListPosition.PreparedStatementIndex = 0;
 				}
 			}
-
 			return true;
 		}
 
-		private void WritePreparedStatement(IMySqlCommand command, PreparedStatement preparedStatement, ByteBufferWriter writer)
+		public static void WriteQueryPayload(IMySqlCommand command, IDictionary<string, CachedProcedure> cachedProcedures, ByteBufferWriter writer)
+		{
+			if (command.CommandType == CommandType.StoredProcedure)
+				WriteStoredProcedure(command, cachedProcedures, writer);
+			else
+				WriteCommand(command, writer);
+		}
+
+		private static void WritePreparedStatement(IMySqlCommand command, PreparedStatement preparedStatement, ByteBufferWriter writer)
 		{
 			var parameterCollection = command.RawParameters;
 
 			if (Log.IsDebugEnabled())
 				Log.Debug("Session{0} Preparing command payload; CommandId: {1}; CommandText: {2}", command.Connection.Session.Id, preparedStatement.StatementId, command.CommandText);
 
-			writer.Write((byte) CommandKind.StatementExecute);
 			writer.Write(preparedStatement.StatementId);
 			writer.Write((byte) 0);
 			writer.Write(1);
@@ -119,7 +124,7 @@ private void WritePreparedStatement(IMySqlCommand command, PreparedStatement pre
 			}
 		}
 
-		private void WriteStoredProcedure(IMySqlCommand command, IDictionary<string, CachedProcedure> cachedProcedures, ByteBufferWriter writer)
+		private static void WriteStoredProcedure(IMySqlCommand command, IDictionary<string, CachedProcedure> cachedProcedures, ByteBufferWriter writer)
 		{
 			var parameterCollection = command.RawParameters;
 			var cachedProcedure = cachedProcedures[command.CommandText];
@@ -182,7 +187,7 @@ private void WriteStoredProcedure(IMySqlCommand command, IDictionary<string, Cac
 			preparer.ParseAndBindParameters(writer);
 		}
 
-		private void WriteCommand(IMySqlCommand command, ByteBufferWriter writer)
+		private static void WriteCommand(IMySqlCommand command, ByteBufferWriter writer)
 		{
 			var preparer = new StatementPreparer(command.CommandText, command.RawParameters, command.CreateStatementPreparerOptions());
 			preparer.ParseAndBindParameters(writer);

src/MySqlConnector/Core/StatementPreparer.cs

@@ -33,7 +33,6 @@ public void ParseAndBindParameters(ByteBufferWriter writer)
 		{
 			if (!string.IsNullOrWhiteSpace(m_commandText))
 			{
-				writer.Write((byte) CommandKind.Query);
 				var parser = new ParameterSqlParser(this, writer);
 				parser.Parse(m_commandText);
 			}

tests/MySqlConnector.Tests/StatementPreparerTests.cs

@@ -248,7 +248,7 @@ private static string GetParsedSql(string input, MySqlParameterCollection parame
 			var writer = new ByteBufferWriter();
 			preparer.ParseAndBindParameters(writer);
 			using (var payload = writer.ToPayloadData())
-				return Encoding.UTF8.GetString(payload.AsSpan().Slice(1));
+				return Encoding.UTF8.GetString(payload.AsSpan());
 		}
 	}
 }