add support tests for other basic data types + fix read byte array implementation (#225)

Author: SockworkOrange

CodeGenerator/Generators/UtilsGen.cs

@@ -93,32 +93,6 @@ public class NullToNStringConverter : DefaultTypeConverter
            public static class {{ClassName}}
            {
                {{optionalNullToNStringConverter}}
-               
-               public static byte[] GetBytes(IDataRecord reader, int ordinal)
-               {
-                   const int bufferSize = 100000;
-                   if (reader is null) throw new ArgumentNullException(nameof(reader));
-                   var buffer = new byte[bufferSize];
-                     
-                   var (bytesRead, offset) = (0, 0);
-                   while (bytesRead < bufferSize)
-                   {
-                       var read = (int) reader.GetBytes(
-                           ordinal,
-                           bufferSize + bytesRead,
-                           buffer,
-                           offset,
-                           bufferSize - bytesRead);
-                       if (read == 0)
-                           break;
-                       bytesRead += read;
-                       offset += read;
-                   }
-               
-                   if (bytesRead < bufferSize)
-                       Array.Resize(ref buffer, bytesRead);
-                   return buffer;
-               }
 
                public static string TransformQueryForSliceArgs(string originalSql, int sliceSize, string paramName)
                {

Drivers/DbDriver.cs

@@ -17,7 +17,7 @@ public abstract class DbDriver
 
     private HashSet<string> NullableTypesInDotnetCore { get; } = ["string", "object"];
 
-    private HashSet<string> NullableTypes { get; } = ["short", "long", "double", "decimal", "int", "float", "bool", "DateTime"];
+    private HashSet<string> NullableTypes { get; } = ["bool", "short", "int", "long", "float", "double", "decimal", "DateTime"];
 
     protected abstract List<ColumnMapping> ColumnMappings { get; }
 

Drivers/Generators/CopyFromDeclareGen.cs

@@ -9,10 +9,10 @@ public class CopyFromDeclareGen(DbDriver dbDriver)
     public MemberDeclarationSyntax Generate(string queryTextConstant, string argInterface, Query query)
     {
         return ParseMemberDeclaration($$"""
-                                        public async Task {{query.Name}}(List<{{argInterface}}> args)
-                                        {
-                                            {{((ICopyFrom)dbDriver).GetCopyFromImpl(query, queryTextConstant)}}
-                                        }
-                                        """)!;
+            public async Task {{query.Name}}(List<{{argInterface}}> args)
+            {
+                {{((ICopyFrom)dbDriver).GetCopyFromImpl(query, queryTextConstant)}}
+            }
+            """)!;
     }
 }

Drivers/MySqlConnectorDriver.cs

@@ -28,7 +28,7 @@ public partial class MySqlConnectorDriver(Options options, Dictionary<string, Ta
                 { "mediumblob", null },
                 { "tinyblob", null },
                 { "varbinary", null }
-            }, ordinal => $"Utils.GetBytes(reader, {ordinal})"),
+            }, ordinal => $"reader.GetFieldValue<byte[]>({ordinal})"),
         new("string",
             new Dictionary<string, string?>
             {
@@ -50,13 +50,17 @@ public partial class MySqlConnectorDriver(Options options, Dictionary<string, Ta
                 { "datetime", null },
                 { "timestamp", null }
             }, ordinal => $"reader.GetDateTime({ordinal})"),
+        new("short",
+            new Dictionary<string, string?>
+            {
+                { "smallint", null },
+                { "year", null }
+            }, ordinal => $"reader.GetInt16({ordinal})"),
         new("int",
             new Dictionary<string, string?>
             {
                 { "int", null },
                 { "mediumint", null },
-                { "smallint", null },
-                { "year", null }
             }, ordinal => $"reader.GetInt32({ordinal})"),
         new("bool",
             new Dictionary<string, string?>

Drivers/NpgsqlDriver.cs

@@ -43,7 +43,7 @@ public NpgsqlDriver(Options options, Dictionary<string, Table> tables) : base(op
                 { "mediumblob", null },
                 { "tinyblob", null },
                 { "varbinary", null }
-            }, ordinal => $"Utils.GetBytes(reader, {ordinal})"),
+            }, ordinal => $"reader.GetFieldValue<byte[]>({ordinal})"),
         new("string",
             new Dictionary<string, string?>
             {
@@ -91,9 +91,13 @@ public NpgsqlDriver(Options options, Dictionary<string, Table> tables) : base(op
             new Dictionary<string, string?>
             {
                 { "numeric", "NpgsqlDbType.Numeric" },
-                { "float8", "NpgsqlDbType.Real" },
-                { "decimal", "NpgsqlDbType.Decimal" }
+                { "decimal", "NpgsqlDbType.Numeric" }
             }, ordinal => $"reader.GetDecimal({ordinal})"),
+        new("double",
+            new Dictionary<string, string?>
+            {
+                { "float8", "NpgsqlDbType.Double" },
+            }, ordinal => $"reader.GetDouble({ordinal})"),
         new("bool",
             new Dictionary<string, string?>
             {

Drivers/SqliteDriver.cs

@@ -15,7 +15,7 @@ public partial class SqliteDriver(Options options, Dictionary<string, Table> tab
         new("byte[]", new Dictionary<string, string?>
             {
                 {"blob", null}
-            }, ordinal => $"Utils.GetBytes(reader, {ordinal})"),
+            }, ordinal => $"reader.GetFieldValue<byte[]>({ordinal})"),
         new("string",
             new Dictionary<string, string?>
             {
@@ -27,11 +27,11 @@ public partial class SqliteDriver(Options options, Dictionary<string, Table> tab
                 { "integer", null },
                 { "integernotnulldefaultunixepoch", null } // return type of UNIXEPOCH function
             }, ordinal => $"reader.GetInt32({ordinal})"),
-        new("float",
+        new("decimal",
             new Dictionary<string, string?>
             {
                 {"real", null}
-            }, ordinal => $"reader.GetFloat({ordinal})"),
+            }, ordinal => $"reader.GetDecimal({ordinal})"),
     ];
 
     public override UsingDirectiveSyntax[] GetUsingDirectives()