fix: refactor id column type logic

Author: SockworkOrange

Drivers/ColumnMapping.cs

@@ -11,6 +11,7 @@ public class ColumnMapping(
     Func<int, string>? readerArrayFn = null,
     string? usingDirective = null,
     Func<string, bool, bool, string>? writerFn = null,
+    string? convertFunc = null,
     string? sqlMapper = null,
     string? sqlMapperImpl = null)
 {
@@ -19,6 +20,7 @@ public class ColumnMapping(
     public Func<int, string>? ReaderArrayFn { get; } = readerArrayFn;
     public string? UsingDirective { get; } = usingDirective;
     public Func<string, bool, bool, string>? WriterFn { get; } = writerFn;
+    public string? ConvertFunc { get; } = convertFunc;
     public string? SqlMapper { get; } = sqlMapper;
     public string? SqlMapperImpl { get; } = sqlMapperImpl;
 }

Drivers/DbDriver.cs

@@ -51,6 +51,10 @@ public abstract class DbDriver
         "JsonElement"
     ];
 
+    protected const string IntTo32 = "Convert.ToInt32";
+    protected const string IntTo64 = "Convert.ToInt64";
+
+
     public abstract Dictionary<string, ColumnMapping> ColumnMappings { get; }
 
     protected const string JsonElementTypeHandler =
@@ -330,11 +334,12 @@ public string GetIdColumnType(Query query)
 
     public virtual string[] GetLastIdStatement(Query query)
     {
-        var convertFunc = GetIdColumnType(query) == "int" ? "ToInt32" : "ToInt64"; // TODO refactor
+        var idColumnType = GetIdColumnType(query);
+        var convertFunc = ColumnMappings[idColumnType].ConvertFunc ?? throw new InvalidOperationException($"ConvertFunc is missing for id column type {idColumnType}");
         return
         [
             $"var {Variable.Result.AsVarName()} = await {Variable.Command.AsVarName()}.ExecuteScalarAsync();",
-            $"return Convert.{convertFunc}({Variable.Result.AsVarName()});"
+            $"return {convertFunc}({Variable.Result.AsVarName()});"
         ];
     }
 

Drivers/MySqlConnectorDriver.cs

@@ -47,7 +47,8 @@ public partial class MySqlConnectorDriver(
                 {
                     { "bigint", new() }
                 },
-                ordinal => $"reader.GetInt64({ordinal})"
+                ordinal => $"reader.GetInt64({ordinal})",
+                convertFunc: IntTo64
             ),
             ["byte"] = new ColumnMapping(
                 new()
@@ -97,7 +98,8 @@ public partial class MySqlConnectorDriver(
                     { "int", new() },
                     { "mediumint", new() }
                 },
-                ordinal => $"reader.GetInt32({ordinal})"
+                ordinal => $"reader.GetInt32({ordinal})",
+                convertFunc: IntTo32
             ),
             ["double"] = new(
                 new()

Drivers/NpgsqlDriver.cs

@@ -39,7 +39,8 @@ public NpgsqlDriver(
                     { "bigint", new() },
                     { "bigserial", new() }
                 },
-                ordinal => $"reader.GetInt64({ordinal})"
+                ordinal => $"reader.GetInt64({ordinal})",
+                convertFunc: IntTo64
             ),
             ["byte[]"] = new(
                 new()
@@ -118,7 +119,8 @@ public NpgsqlDriver(
                     { "serial", new(NpgsqlTypeOverride: "NpgsqlDbType.Integer") }
                 },
                 ordinal => $"reader.GetInt32({ordinal})",
-                ordinal => $"reader.GetFieldValue<int[]>({ordinal})"
+                ordinal => $"reader.GetFieldValue<int[]>({ordinal})",
+                convertFunc: IntTo32
             ),
             ["float"] = new(
                 new()

Drivers/SqliteDriver.cs

@@ -39,7 +39,8 @@ public partial class SqliteDriver(
                     { "integer", new() },
                     { "integernotnulldefaultunixepoch", new() }
                 },
-                ordinal => $"reader.GetInt32({ordinal})"
+                ordinal => $"reader.GetInt32({ordinal})",
+                convertFunc: IntTo32
             ),
             ["decimal"] = new(
                 new()
@@ -54,14 +55,7 @@ public partial class SqliteDriver(
                     { "any", new() }
                 },
                 ordinal => $"reader.GetValue({ordinal})"
-            ),
-            ["long"] = new(
-                new()
-                {
-                    { "bigint", new() }
-                },
-                ordinal => $"reader.GetInt64({ordinal})"
-            ),
+            )
         };
 
     public override string TransactionClassName => "SqliteTransaction";