[release] fix: dotnet warnings (#310)

Author: SockworkOrange

Drivers/ColumnMapping.cs

@@ -13,7 +13,7 @@ public class ColumnMapping(
     Func<string, bool, bool, string>? writerFn = null,
     Func<string, string>? convertFunc = null,
     string? sqlMapper = null,
-    string? sqlMapperImpl = null)
+    Func<bool, string>? sqlMapperImpl = null)
 {
     public Dictionary<string, DbTypeInfo> DbTypes { get; } = dbTypes;
     public Func<int, string> ReaderFn { get; } = readerFn;
@@ -22,5 +22,5 @@ public class ColumnMapping(
     public Func<string, bool, bool, string>? WriterFn { get; } = writerFn;
     public Func<string, string>? ConvertFunc { get; } = convertFunc;
     public string? SqlMapper { get; } = sqlMapper;
-    public string? SqlMapperImpl { get; } = sqlMapperImpl;
+    public Func<bool, string>? SqlMapperImpl { get; } = sqlMapperImpl;
 }

Drivers/DbDriver.cs

@@ -187,7 +187,7 @@ private MemberDeclarationSyntax[] GetSqlMapperMemberDeclarations()
     {
         return [.. ColumnMappings
             .Where(m => TypeExistsInQueries(m.Key) && m.Value.SqlMapperImpl is not null)
-            .Select(m => ParseMemberDeclaration(m.Value.SqlMapperImpl!)!)];
+            .Select(m => ParseMemberDeclaration(m.Value.SqlMapperImpl!(Options.DotnetFramework.IsDotnetCore()))!)];
     }
 
     public abstract string TransformQueryText(Query query);

Drivers/MySqlConnectorDriver.cs

@@ -156,7 +156,7 @@ public sealed partial class MySqlConnectorDriver(
 
     public override string TransactionClassName => "MySqlTransaction";
 
-    private const string JsonElementTypeHandler = """
+    private static readonly Func<bool, string> JsonElementTypeHandler = _ => $$"""
         private class JsonElementTypeHandler : SqlMapper.TypeHandler<JsonElement>
         {
             public override JsonElement Parse(object value)
@@ -291,7 +291,8 @@ public override MemberDeclarationSyntax[] GetEnumExtensionsMembers(string name,
 
     private MemberDeclarationSyntax[] GetSetTypeHandlers()
     {
-        var setTypeHandlerFunc = (string x) =>
+        var optionalNullableSuffix = Options.DotnetFramework.IsDotnetCore() ? "?" : string.Empty;
+        string setTypeHandlerFunc(string x) =>
             $$"""
             private class {{x}}TypeHandler : SqlMapper.TypeHandler<HashSet<{{x}}>>
             {
@@ -302,14 +303,16 @@ private class {{x}}TypeHandler : SqlMapper.TypeHandler<HashSet<{{x}}>>
                     throw new DataException($"Cannot convert {value?.GetType()} to HashSet<{{x}}>");
                 }
             
-                public override void SetValue(IDbDataParameter parameter, HashSet<{{x}}> value)
+                public override void SetValue(IDbDataParameter parameter, HashSet<{{x}}>{{optionalNullableSuffix}} value)
                 {
+                    if (value is null)
+                        return;
                     parameter.Value = string.Join(",", value);
                 }
             }
             """;
 
-        return Queries
+        return [.. Queries
             .SelectMany(q => q.Columns)
             .Where(c =>
             {
@@ -318,8 +321,7 @@ public override void SetValue(IDbDataParameter parameter, HashSet<{{x}}> value)
             })
             .Select(c => setTypeHandlerFunc(EnumToModelName(c)))
             .Distinct()
-            .Select(m => ParseMemberDeclaration(m)!)
-            .ToArray();
+            .Select(m => ParseMemberDeclaration(m)!)];
     }
 
     public override MemberDeclarationSyntax[] GetMemberDeclarationsForUtils()

Drivers/NpgsqlDriver.cs

@@ -345,7 +345,7 @@ public NpgsqlDriver(
 
     public override string TransactionClassName => "NpgsqlTransaction";
 
-    private const string JsonElementTypeHandler = """
+    private static readonly Func<bool, string> JsonElementTypeHandler = _ => $$"""
         private class JsonElementTypeHandler : SqlMapper.TypeHandler<JsonElement>
         {
             public override JsonElement Parse(object value)
@@ -362,8 +362,7 @@ public override void SetValue(IDbDataParameter parameter, JsonElement value)
         }
         """;
 
-    private const string XmlDocumentTypeHandler =
-        """
+    private static readonly Func<bool, string> XmlDocumentTypeHandler = isDotnetCore => $$"""
         private class XmlDocumentTypeHandler : SqlMapper.TypeHandler<XmlDocument>
         {
             public override XmlDocument Parse(object value)
@@ -377,8 +376,10 @@ public override XmlDocument Parse(object value)
                 throw new DataException($"Cannot convert {value?.GetType()} to XmlDocument");
             }
 
-            public override void SetValue(IDbDataParameter parameter, XmlDocument value)
+            public override void SetValue(IDbDataParameter parameter, XmlDocument{{(isDotnetCore ? "?" : string.Empty)}} value)
             {
+                if (value is null)
+                    return;
                 parameter.Value = value.OuterXml;
             }
         }

examples/MySqlConnectorDapperExample/Utils.cs

@@ -48,8 +48,10 @@ public override HashSet<BiosAuthorType> Parse(object value)
             throw new DataException($"Cannot convert {value?.GetType()} to HashSet<BiosAuthorType>");
         }
 
-        public override void SetValue(IDbDataParameter parameter, HashSet<BiosAuthorType> value)
+        public override void SetValue(IDbDataParameter parameter, HashSet<BiosAuthorType>? value)
         {
+            if (value is null)
+                return;
             parameter.Value = string.Join(",", value);
         }
     }
@@ -63,8 +65,10 @@ public override HashSet<MysqlStringTypesCSet> Parse(object value)
             throw new DataException($"Cannot convert {value?.GetType()} to HashSet<MysqlStringTypesCSet>");
         }
 
-        public override void SetValue(IDbDataParameter parameter, HashSet<MysqlStringTypesCSet> value)
+        public override void SetValue(IDbDataParameter parameter, HashSet<MysqlStringTypesCSet>? value)
         {
+            if (value is null)
+                return;
             parameter.Value = string.Join(",", value);
         }
     }

examples/MySqlConnectorDapperLegacyExample/Utils.cs

@@ -51,6 +51,8 @@ public override HashSet<BiosAuthorType> Parse(object value)
 
             public override void SetValue(IDbDataParameter parameter, HashSet<BiosAuthorType> value)
             {
+                if (value is null)
+                    return;
                 parameter.Value = string.Join(",", value);
             }
         }
@@ -66,6 +68,8 @@ public override HashSet<MysqlStringTypesCSet> Parse(object value)
 
             public override void SetValue(IDbDataParameter parameter, HashSet<MysqlStringTypesCSet> value)
             {
+                if (value is null)
+                    return;
                 parameter.Value = string.Join(",", value);
             }
         }

examples/NpgsqlDapperExample/Utils.cs

@@ -40,8 +40,10 @@ public override XmlDocument Parse(object value)
             throw new DataException($"Cannot convert {value?.GetType()} to XmlDocument");
         }
 
-        public override void SetValue(IDbDataParameter parameter, XmlDocument value)
+        public override void SetValue(IDbDataParameter parameter, XmlDocument? value)
         {
+            if (value is null)
+                return;
             parameter.Value = value.OuterXml;
         }
     }

examples/NpgsqlDapperLegacyExample/Utils.cs

@@ -43,6 +43,8 @@ public override XmlDocument Parse(object value)
 
             public override void SetValue(IDbDataParameter parameter, XmlDocument value)
             {
+                if (value is null)
+                    return;
                 parameter.Value = value.OuterXml;
             }
         }