Merge pull request #1252 from neuecc/improve-prepared-execution

Avoid normalize parameter every operation in prepared query.

Author: bgrainger

src/MySqlConnector/Core/ParsedStatement.cs

@@ -17,6 +17,12 @@ internal sealed class ParsedStatement
 	/// </summary>
 	public List<string?> ParameterNames { get; } = new();
 
+	/// <summary>
+	/// The normalized names of the parameters (if known) of the parameters in the prepared statement. There
+	/// is one entry in this list for each parameter, which will be <c>null</c> if the name is unknown.
+	/// </summary>
+	public List<string?> NormalizedParameterNames { get; } = new();
+
 	/// <summary>
 	/// The indexes of the parameters in the prepared statement. There is one entry in this list for
 	/// each parameter; it will be <c>-1</c> if the parameter is named.

src/MySqlConnector/Core/SingleCommandPayloadCreator.cs

@@ -116,10 +116,10 @@ private static void WritePreparedStatement(IMySqlCommand command, PreparedStatem
 			var parameters = new MySqlParameter[commandParameterCount + attributeCount];
 			for (var i = 0; i < commandParameterCount; i++)
 			{
-				var parameterName = preparedStatement.Statement.ParameterNames![i];
-				var parameterIndex = parameterName is not null ? (parameterCollection?.NormalizedIndexOf(parameterName) ?? -1) : preparedStatement.Statement.ParameterIndexes[i];
+				var parameterName = preparedStatement.Statement.NormalizedParameterNames![i];
+				var parameterIndex = parameterName is not null ? (parameterCollection?.UnsafeIndexOf(parameterName) ?? -1) : preparedStatement.Statement.ParameterIndexes[i];
 				if (parameterIndex == -1 && parameterName is not null)
-					throw new MySqlException("Parameter '{0}' must be defined.".FormatInvariant(parameterName));
+					throw new MySqlException("Parameter '{0}' must be defined.".FormatInvariant(preparedStatement.Statement.ParameterNames![i]));
 				else if (parameterIndex < 0 || parameterIndex >= (parameterCollection?.Count ?? 0))
 					throw new MySqlException("Parameter index {0} is invalid when only {1} parameter{2} defined.".FormatInvariant(parameterIndex, parameterCollection?.Count ?? 0, parameterCollection?.Count == 1 ? " is" : "s are"));
 				parameters[i] = parameterCollection![parameterIndex];

src/MySqlConnector/Core/StatementPreparer.cs

@@ -147,6 +147,7 @@ private void DoAppendParameter(string? parameterName, int parameterIndex, int te
 
 			// store the parameter index
 			m_statements[m_statements.Count - 1].ParameterNames.Add(parameterName);
+			m_statements[m_statements.Count - 1].NormalizedParameterNames.Add(parameterName == null ? null : MySqlParameter.NormalizeParameterName(parameterName));
 			m_statements[m_statements.Count - 1].ParameterIndexes.Add(parameterIndex);
 		}
 

src/MySqlConnector/MySqlParameterCollection.cs

@@ -96,6 +96,11 @@ internal int NormalizedIndexOf(string? parameterName)
 		return m_nameToIndex.TryGetValue(normalizedName, out var index) ? index : -1;
 	}
 
+	internal int UnsafeIndexOf(string? normalizedParameterName)
+	{
+		return m_nameToIndex.TryGetValue(normalizedParameterName ?? "", out var index) ? index : -1;
+	}
+
 	public override void Insert(int index, object value) => AddParameter((MySqlParameter) (value ?? throw new ArgumentNullException(nameof(value))), index);
 
 	public override bool IsFixedSize => false;