feat: support set data type in mysql

CodeGenerator/Generators/EnumsGen.cs

@@ -6,7 +6,7 @@
 
 namespace SqlcGenCsharp.Generators;
 
 internal class EnumsGen(DbDriver dbDriver)
 {
     public MemberDeclarationSyntax[] Generate(string name, IList<string> possibleValues)
     {
@@ -21,10 +21,6 @@
                    {{enumValuesDef}}
                }
                """)!;
-
-        if (dbDriver.Options.UseDapper)
-            return [enumType];
-
         var enumExtensions = ParseMemberDeclaration($$"""
                public static class {{name}}Extensions 
                {
@@ -40,6 +36,11 @@
                    {
                        return StringToEnum[me];
                    }
+
+                   public static {{name}}[] To{{name}}Arr(this string me)
+                   {
+                       return me.Split(',').ToList().Select(v => StringToEnum[v]).ToArray();
+                   }
                }
                """)!;
         return [enumType, enumExtensions];

CodegenTests/CodegenUtilsTests.cs

@@ -145,9 +145,6 @@ public void TestMysqlCopyFromGenerateUtilsMembers()
         var expected = new HashSet<string>
         {
             MySqlConnectorDriver.NullToStringCsvConverter,
-            MySqlConnectorDriver.BoolToBitCsvConverter,
-            MySqlConnectorDriver.ByteCsvConverter,
-            MySqlConnectorDriver.ByteArrayCsvConverter
         };
         var actual = members
             .FindAll(m => m is ClassDeclarationSyntax)

Drivers/DbDriver.cs

@@ -21,7 +21,7 @@ public abstract class DbDriver
 
     public Dictionary<string, Dictionary<string, Plugin.Enum>> Enums { get; }
 
-    private IList<Query> Queries { get; }
+    protected IList<Query> Queries { get; }
 
     private HashSet<string> NullableTypesInDotnetCore { get; } =
     [
@@ -59,15 +59,13 @@ public abstract class DbDriver
     public abstract Dictionary<string, ColumnMapping> ColumnMappings { get; }
 
     protected const string JsonElementTypeHandler =
-    """
-        public class JsonElementTypeHandler : SqlMapper.TypeHandler<JsonElement>
+        """
+        private class JsonElementTypeHandler : SqlMapper.TypeHandler<JsonElement>
         {
             public override JsonElement Parse(object value)
             {
                 if (value is string s)
                     return JsonDocument.Parse(s).RootElement;
-                if (value is null)
-                    return default;
                 throw new DataException($"Cannot convert {value?.GetType()} to JsonElement");
             }
 
@@ -76,7 +74,7 @@ public override void SetValue(IDbDataParameter parameter, JsonElement value)
                 parameter.Value = value.GetRawText();
             }
         }
-    """;
+        """;
 
     protected const string TransformQueryForSliceArgsImpl = """
            public static string TransformQueryForSliceArgs(string originalSql, int sliceSize, string paramName)
@@ -148,7 +146,7 @@ private ISet<string> GetUsingDirectivesForColumnMappings()
 
     public virtual ISet<string> GetUsingDirectivesForUtils()
     {
-        return new HashSet<string>()
+        return new HashSet<string>
             {
                 "System.Linq"
             }
@@ -158,20 +156,24 @@ public virtual ISet<string> GetUsingDirectivesForUtils()
 
     public virtual ISet<string> GetUsingDirectivesForModels()
     {
-        return GetUsingDirectivesForColumnMappings();
+        return new HashSet<string>
+            {
+                "System.Linq"
+            }
+            .AddRangeExcludeNulls(GetUsingDirectivesForColumnMappings());
     }
 
-    public virtual string[] GetConstructorStatements()
+    public string[] GetConstructorStatements()
     {
         return [$"this.{Variable.ConnectionString.AsPropertyName()} = {Variable.ConnectionString.AsVarName()};"];
     }
 
-    public virtual string[] GetTransactionConstructorStatements()
+    public string[] GetTransactionConstructorStatements()
     {
         return [$"this.{Variable.Transaction.AsPropertyName()} = {Variable.Transaction.AsVarName()};"];
     }
 
-    protected ISet<string> GetConfigureSqlMappings()
+    protected virtual ISet<string> GetConfigureSqlMappings()
     {
         return ColumnMappings
             .Where(m => TypeExistsInQueries(m.Key) && m.Value.SqlMapper is not null)
@@ -200,9 +202,15 @@ public static void ConfigureSqlMapper()
 
     protected bool TypeExistsInQueries(string csharpType)
     {
-        return Queries
-            .SelectMany(query => query.Columns)
-            .Any(column => csharpType == GetCsharpTypeWithoutNullableSuffix(column, null));
+        return Queries.Any(q => TypeExistsInQuery(csharpType, q));
+    }
+
+    protected bool TypeExistsInQuery(string csharpType, Query query)
+    {
+        return query.Columns
+            .Any(column => csharpType == GetCsharpTypeWithoutNullableSuffix(column, query)) ||
+               query.Params
+            .Any(p => csharpType == GetCsharpTypeWithoutNullableSuffix(p.Column, query));
     }
 
     public string AddNullableSuffixIfNeeded(string csharpType, bool notNull)
@@ -218,6 +226,16 @@ public string GetCsharpType(Column column, Query? query)
         return AddNullableSuffixIfNeeded(csharpType, IsColumnNotNull(column, query));
     }
 
+    public string GetColumnSchema(Column column)
+    {
+        return column.Table.Schema == DefaultSchema ? string.Empty : column.Table.Schema;
+    }
+
+    public virtual string GetEnumTypeAsCsharpType(Column column, Plugin.Enum enumType)
+    {
+        return column.Type.Name.ToModelName(GetColumnSchema(column), DefaultSchema);
+    }
+
     public string GetCsharpTypeWithoutNullableSuffix(Column column, Query? query)
     {
         if (column.EmbedTable != null)
@@ -226,8 +244,8 @@ public string GetCsharpTypeWithoutNullableSuffix(Column column, Query? query)
         if (string.IsNullOrEmpty(column.Type.Name))
             return "object";
 
-        if (IsEnumType(column))
-            return column.Type.Name.ToModelName(column.Table.Schema, DefaultSchema);
+        if (GetEnumType(column) is { } enumType)
+            return GetEnumTypeAsCsharpType(column, enumType);
 
         if (FindOverrideForQueryColumn(query, column) is { CsharpType: var csharpType })
             return csharpType.Type;
@@ -242,14 +260,14 @@ public string GetCsharpTypeWithoutNullableSuffix(Column column, Query? query)
         throw new NotSupportedException($"Column {column.Name} has unsupported column type: {column.Type.Name}");
     }
 
-    private bool IsEnumType(Column column)
+    public Plugin.Enum? GetEnumType(Column column)
     {
         if (column.Table is null)
-            return false;
-        var enumSchema = column.Table.Schema == DefaultSchema ? string.Empty : column.Table.Schema;
-        if (!Enums.TryGetValue(enumSchema, value: out var enumsInSchema))
-            return false;
-        return enumsInSchema.ContainsKey(column.Type.Name);
+            return null;
+        var schemaName = GetColumnSchema(column);
+        if (!Enums.TryGetValue(schemaName, value: out var enumsInSchema))
+            return null;
+        return enumsInSchema.GetValueOrDefault(column.Type.Name);
     }
 
     private static bool DoesColumnMappingApply(ColumnMapping columnMapping, Column column)
@@ -269,16 +287,20 @@ private string GetColumnReader(CsharpTypeOption csharpTypeOption, int ordinal)
         throw new NotSupportedException($"Could not find column mapping for type override: {csharpTypeOption.Type}");
     }
 
-    private string GetEnumReader(Column column, int ordinal)
+    private string GetEnumReader(Column column, int ordinal, Plugin.Enum enumType)
     {
         var enumName = column.Type.Name.ToModelName(column.Table.Schema, DefaultSchema);
-        return $"{Variable.Reader.AsVarName()}.GetString({ordinal}).To{enumName}()";
+        var fullEnumType = GetEnumTypeAsCsharpType(column, enumType);
+        var readStmt = $"{Variable.Reader.AsVarName()}.GetString({ordinal})";
+        if (fullEnumType.EndsWith("[]"))
+            return $"{readStmt}.To{enumName}Arr()";
+        return $"{readStmt}.To{enumName}()";
     }
 
     public string GetColumnReader(Column column, int ordinal, Query? query)
     {
-        if (IsEnumType(column))
-            return GetEnumReader(column, ordinal);
+        if (GetEnumType(column) is { } enumType)
+            return GetEnumReader(column, ordinal, enumType);
 
         if (FindOverrideForQueryColumn(query, column) is { CsharpType: var csharpType })
             return GetColumnReader(csharpType, ordinal);

Drivers/Generators/CommonGen.cs

@@ -21,10 +21,22 @@ public static string GetMethodParameterList(string argInterface, IEnumerable<Par
         if (writerFn is not null)
             return writerFn;
 
-        var defaultWriterFn = (string el, bool notNull, bool isDapper) => notNull ? el : $"{el} ?? (object)DBNull.Value";
-        return dbDriver.Options.UseDapper ? null : defaultWriterFn;
+        if (dbDriver.GetEnumType(column) is { } enumType)
+            if (dbDriver.GetEnumTypeAsCsharpType(column, enumType).EndsWith("[]"))
+                return (el, notNull, isDapper) =>
+                {
+                    var stringJoinStmt = $"string.Join(\",\", {el})";
+                    var nullValue = isDapper ? "null" : "(object)DBNull.Value";
+                    return notNull
+                        ? stringJoinStmt
+                        : $"{el} != null ? {stringJoinStmt} : {nullValue}";
+                };
+
+        string DefaultWriterFn(string el, bool notNull, bool isDapper) => notNull ? el : $"{el} ?? (object)DBNull.Value";
+        return dbDriver.Options.UseDapper ? null : DefaultWriterFn;
     }
 
+    // TODO: extract AddWithValue statement generation to a method + possible override for Npgsql for type override
     public string AddParametersToCommand(Query query)
     {
         return query.Params.Select(p =>