Remove duplicated method.

This was added independently in 1f17b21 and 16d2c99.

Add tests to verify that parameters are found case-insensitively.

Author: bgrainger

src/MySqlConnector/MySqlClient/MySqlParameterCollection.cs

@@ -85,11 +85,12 @@ public override int IndexOf(string parameterName)
 			return string.Equals(parameterName, m_parameters[index].ParameterName, StringComparison.OrdinalIgnoreCase) ? index : -1;
 		}
 
+		// Finds the index of a parameter by name, regardless of whether 'parameterName' or the matching
+		// MySqlParameter.ParameterName has a leading '?' or '@'.
 		internal int NormalizedIndexOf(string parameterName)
 		{
-			if (parameterName == null)
-				throw new ArgumentNullException(nameof(parameterName));
-			return m_nameToIndex.TryGetValue(MySqlParameter.NormalizeParameterName(parameterName), out var index) ? index : -1;
+			var normalizedName = MySqlParameter.NormalizeParameterName(parameterName ?? throw new ArgumentNullException(nameof(parameterName)));
+			return m_nameToIndex.TryGetValue(normalizedName, out var index) ? index : -1;
 		}
 
 		public override void Insert(int index, object value) => m_parameters.Insert(index, (MySqlParameter) value);
@@ -141,15 +142,6 @@ protected override void SetParameter(int index, DbParameter value)
 			set => SetParameter(index, value);
 		}
 
-		// Finds the index of a parameter by name, regardless of whether 'parameterName' or the matching
-		// MySqlParameter.ParameterName has a leading '?' or '@'.
-		internal int FlexibleIndexOf(string parameterName)
-		{
-			if (parameterName == null)
-				throw new ArgumentNullException(nameof(parameterName));
-			return m_nameToIndex.TryGetValue(MySqlParameter.NormalizeParameterName(parameterName), out var index) ? index : -1;
-		}
-
 		private void AddParameter(MySqlParameter parameter)
 		{
 			m_parameters.Add(parameter);

src/MySqlConnector/MySqlClient/MySqlStatementPreparer.cs

@@ -51,7 +51,7 @@ protected override void OnBeforeParse(string sql)
 			protected override void OnNamedParameter(int index, int length)
 			{
 				var parameterName = m_preparer.m_commandText.Substring(index, length);
-				var parameterIndex = m_preparer.m_parameters.FlexibleIndexOf(parameterName);
+				var parameterIndex = m_preparer.m_parameters.NormalizedIndexOf(parameterName);
 				if (parameterIndex != -1)
 					DoAppendParameter(parameterIndex, index, length);
 				else if ((m_preparer.m_options & StatementPreparerOptions.AllowUserVariables) == 0)

tests/SideBySide/ParameterCollection.cs

@@ -5,18 +5,18 @@
 
 namespace SideBySide
 {
-    public class ParameterCollection : IDisposable
-    {
-	    public ParameterCollection()
-	    {
-		    m_command = new MySqlCommand();
+	public class ParameterCollection : IDisposable
+	{
+		public ParameterCollection()
+		{
+			m_command = new MySqlCommand();
 			m_parameterCollection = m_command.Parameters;
 		}
 
-	    public void Dispose()
-	    {
-		    m_command.Dispose();
-	    }
+		public void Dispose()
+		{
+			m_command.Dispose();
+		}
 
 		[Theory]
 		[InlineData("Baz", 0)]
@@ -33,12 +33,12 @@ public void Dispose()
 		[InlineData("?Bar", -1)]
 		[InlineData("", -1)]
 		public void FindByName(string parameterName, int position)
-	    {
-		    m_parameterCollection.Add(new MySqlParameter { ParameterName = "Baz", Value = 0 });
+		{
+			m_parameterCollection.Add(new MySqlParameter { ParameterName = "Baz", Value = 0 });
 			m_parameterCollection.Add(new MySqlParameter { ParameterName = "@Test", Value = 1 });
 			m_parameterCollection.Add(new MySqlParameter { ParameterName = "?Foo", Value = 2 });
-		    int index = m_parameterCollection.IndexOf(parameterName);
-		    Assert.Equal(position, index);
+			int index = m_parameterCollection.IndexOf(parameterName);
+			Assert.Equal(position, index);
 			Assert.Equal(position != -1, m_parameterCollection.Contains(parameterName));
 
 			string expectedParameterName = parameterName;
@@ -60,7 +60,31 @@ public void FindByName(string parameterName, int position)
 				Assert.NotNull(parameter);
 				Assert.Equal(expectedParameterName, parameter.ParameterName);
 			}
-	    }
+		}
+
+		[Theory]
+		[InlineData("@test")]
+		[InlineData("@Test")]
+		[InlineData("@tEsT")]
+		[InlineData("@TEST")]
+		public void FindByNameIgnoringCase(string parameterName)
+		{
+			m_parameterCollection.AddWithValue("@Test", 1);
+			Assert.Equal(1, m_parameterCollection.Count);
+
+			Assert.True(m_parameterCollection.Contains(parameterName));
+			Assert.Equal(0, m_parameterCollection.IndexOf(parameterName));
+
+			var parameter = m_parameterCollection[parameterName];
+			Assert.Equal("@Test", parameter.ParameterName);
+			Assert.Equal(1, parameter.Value);
+
+			parameter = m_parameterCollection[0];
+			Assert.Equal("@Test", parameter.ParameterName);
+
+			m_parameterCollection.RemoveAt(parameterName);
+			Assert.Equal(0, m_parameterCollection.Count);
+		}
 
 		[Fact]
 		public void IndexOfNull()
@@ -82,17 +106,17 @@ public void Clear()
 		}
 
 		[Fact]
-	    public void RemoveAtIndex()
-	    {
+		public void RemoveAtIndex()
+		{
 			m_parameterCollection.Add(new MySqlParameter { ParameterName = "@Test1", Value = 0 });
 			m_parameterCollection.Add(new MySqlParameter { ParameterName = "@Test2", Value = 1 });
 			Assert.Equal(0, m_parameterCollection.IndexOf("@Test1"));
 			Assert.Equal(1, m_parameterCollection.IndexOf("@Test2"));
-		    m_parameterCollection.RemoveAt(0);
-		    Assert.Equal(1, m_parameterCollection.Count);
+			m_parameterCollection.RemoveAt(0);
+			Assert.Equal(1, m_parameterCollection.Count);
 			Assert.Equal(-1, m_parameterCollection.IndexOf("@Test1"));
 			Assert.Equal(0, m_parameterCollection.IndexOf("@Test2"));
-	    }
+		}
 
 		[Fact]
 		public void RemoveAtString()
@@ -122,8 +146,8 @@ public void SetParameterIndex()
 		}
 
 		[Fact]
-	    public void SetParameterString()
-	    {
+		public void SetParameterString()
+		{
 			m_parameterCollection.Add(new MySqlParameter { ParameterName = "@Test1", Value = 0 });
 			m_parameterCollection.Add(new MySqlParameter { ParameterName = "@Test2", Value = 1 });
 			Assert.Equal(0, m_parameterCollection.IndexOf("@Test1"));