Support SET parameter type. Fixes #1491

Author: bgrainger

src/MySqlConnector/Core/CachedProcedure.cs

@@ -153,10 +153,10 @@ internal static List<CachedParameter> ParseParameters(string parametersSql)
 			return [];
 
 		// strip precision specifier containing comma
-		parametersSql = s_numericTypes.Replace(parametersSql, @"$1");
+		parametersSql = s_numericTypes.Replace(parametersSql, "$1");
 
 		// strip enum values containing commas (these would have been stripped by ParseDataType anyway)
-		parametersSql = s_enum.Replace(parametersSql, "ENUM");
+		parametersSql = s_enumOrSet.Replace(parametersSql, "$1");
 
 		var parameters = parametersSql.Split(',');
 		var cachedParameters = new List<CachedParameter>(parameters.Length);
@@ -195,7 +195,7 @@ internal static string ParseDataType(string sql, out bool unsigned, out int leng
 	{
 		sql = s_characterSet.Replace(sql, "");
 		sql = s_collate.Replace(sql, "");
-		sql = s_enum.Replace(sql, "ENUM");
+		sql = s_enumOrSet.Replace(sql, "$1");
 
 		length = 0;
 		var match = s_length.Match(sql);
@@ -260,7 +260,7 @@ private static CachedParameter CreateCachedParameter(int ordinal, string? direct
 	private static readonly Regex s_singleLineComments = new(@"(^|\s)--.*?$", RegexOptions.Multiline);
 	private static readonly Regex s_multipleSpaces = new(@"\s+");
 	private static readonly Regex s_numericTypes = new(@"(DECIMAL|DEC|FIXED|NUMERIC|FLOAT|DOUBLE PRECISION|DOUBLE|REAL)\s*\([0-9]+(,\s*[0-9]+)\)", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase);
-	private static readonly Regex s_enum = new(@"ENUM\s*\([^)]+\)", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase);
+	private static readonly Regex s_enumOrSet = new(@"(ENUM|SET)\s*\([^)]+\)", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase);
 	private static readonly Regex s_parameterName = new(@"^(?:`((?:[\u0001-\u005F\u0061-\uFFFF]+|``)+)`|([A-Za-z0-9$_\u0080-\uFFFF]+)) (.*)$");
 	private static readonly Regex s_characterSet = new(" (CHARSET|CHARACTER SET) [A-Za-z0-9_]+", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase);
 	private static readonly Regex s_collate = new(" (COLLATE) [A-Za-z0-9_]+", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase);

tests/MySqlConnector.Tests/CachedProcedureTests.cs

@@ -121,6 +121,12 @@ public static IEnumerable<object[]> CreateParseableParameters()
 					new CachedParameter(1, "INOUT", "param", "LONGTEXT", false, 0),
 				}
 			],
+			[
+				"ColSet set('set1','set2','set3')", new object[]
+				{
+					new CachedParameter(1, "IN", "ColSet", "SET", false, 0),
+				}
+			],
 			[
 				@"IN param1 DATETIME(6),
 -- ignored1
@@ -189,6 +195,7 @@ param4 INTEGER(3)
 	[InlineData("NUMERIC(12)", "DECIMAL", false, 12)]
 	[InlineData("FIXED(12)", "DECIMAL", false, 12)]
 	[InlineData("ENUM('a','b','c')", "ENUM", false, 0)]
+	[InlineData("SET('a','b','c')", "SET", false, 0)]
 	public void ParseDataType(string sql, string expectedDataType, bool expectedUnsigned, int expectedLength)
 	{
 		var dataType = CachedProcedure.ParseDataType(sql, out var unsigned, out var length);