fix: upgrade sqlc version to 1.30 (#312)

* fix: upgrade sqlc version to 1.30

* fix: refactor anonymous Func definition to delegates

Author: SockworkOrange

.github/workflows/build.yml

@@ -4,7 +4,7 @@ defaults:
     shell: bash
 
 env:
-  SQLC_VERSION: 1.27.0
+  SQLC_VERSION: 1.30.0
   WASI_SDK_VERSION: 22
   DOTNET_VERSION: '8.0.x'
 

.github/workflows/tests.yml

@@ -5,7 +5,7 @@ defaults:
 
 env:
   DOTNET_VERSION: '8.0.x'
-  SQLC_VERSION: 1.27.0
+  SQLC_VERSION: 1.30.0
 
 on:
   push:

CodegenTests/test-requests/DefaultSchemaEnum/request.json

@@ -100,6 +100,6 @@
       }
     }
   ],
-  "sqlc_version": "v1.27.0",
+  "sqlc_version": "v1.30.0",
   "plugin_options": "eyJvdmVycmlkZURyaXZlclZlcnNpb24iOiIiLCJnZW5lcmF0ZUNzcHJvaiI6dHJ1ZSwidGFyZ2V0RnJhbWV3b3JrIjoibmV0OC4wIiwibmFtZXNwYWNlTmFtZSI6IiIsInVzZURhcHBlciI6ZmFsc2UsIm92ZXJyaWRlRGFwcGVyVmVyc2lvbiI6IiIsIm92ZXJyaWRlcyI6bnVsbCwiZGVidWdSZXF1ZXN0IjpmYWxzZX0="
 }

CodegenTests/test-requests/DefaultSchemaEnum/request.message

@@ -10,4 +10,4 @@
 dummy_column0
Rdummy_tablebdummy_table_dummy_columnzdummy_column:	query.sql�

 1INSERT INTO dummy_table (dummy_column) VALUES (?)
 TestInsert:exec*U
Q
-dummy_column0
Rpublicdummy_tablebdummy_table_dummy_columnzdummy_column:	query.sqlBdummy_table"v1.27.0*�
{"overrideDriverVersion":"","generateCsproj":true,"targetFramework":"net8.0","namespaceName":"","useDapper":false,"overrideDapperVersion":"","overrides":null,"debugRequest":false}
+dummy_column0
Rpublicdummy_tablebdummy_table_dummy_columnzdummy_column:	query.sqlBdummy_table"v1.30.0*�
{"overrideDriverVersion":"","generateCsproj":true,"targetFramework":"net8.0","namespaceName":"","useDapper":false,"overrideDapperVersion":"","overrides":null,"debugRequest":false}

CodegenTests/test-requests/SchemaScopedEnum/request.json

@@ -80,6 +80,6 @@
       "filename": "query.sql"
     }
   ],
-  "sqlc_version": "v1.27.0",
+  "sqlc_version": "v1.30.0",
   "plugin_options": "eyJvdmVycmlkZURyaXZlclZlcnNpb24iOiIiLCJnZW5lcmF0ZUNzcHJvaiI6dHJ1ZSwidGFyZ2V0RnJhbWV3b3JrIjoibmV0OC4wIiwibmFtZXNwYWNlTmFtZSI6IiIsInVzZURhcHBlciI6ZmFsc2UsIm92ZXJyaWRlRGFwcGVyVmVyc2lvbiI6IiIsIm92ZXJyaWRlcyI6bnVsbCwiZGVidWdSZXF1ZXN0IjpmYWxzZX0="
 }

CodegenTests/test-requests/SchemaScopedEnum/request.message

@@ -7,4 +7,4 @@
 dummy_schemadummy_tableI
 dummy_column0
Rdummy_schemadummy_tablebdummy_table_dummy_column�

 9SELECT dummy_column FROM dummy_schema.dummy_table LIMIT 1Test:one"W
-dummy_column0
Rdummy_schemadummy_tablebdummy_table_dummy_columnzdummy_column:	query.sql"v1.27.0*�
{"overrideDriverVersion":"","generateCsproj":true,"targetFramework":"net8.0","namespaceName":"","useDapper":false,"overrideDapperVersion":"","overrides":null,"debugRequest":false}
+dummy_column0
Rdummy_schemadummy_tablebdummy_table_dummy_columnzdummy_column:	query.sql"v1.30.0*�
{"overrideDriverVersion":"","generateCsproj":true,"targetFramework":"net8.0","namespaceName":"","useDapper":false,"overrideDapperVersion":"","overrides":null,"debugRequest":false}

Drivers/ColumnMapping.cs

@@ -5,22 +5,30 @@ namespace SqlcGenCsharp.Drivers;
 
 public record DbTypeInfo(int? Length = null, string? NpgsqlTypeOverride = null);
 
+public delegate string ReaderFn(int ordinal);
+
+public delegate string WriterFn(string el, bool notNull, bool isDapper);
+
+public delegate string ConvertFunc(string el);
+
+public delegate string SqlMapperImplFunc(bool isDotnetCore);
+
 public class ColumnMapping(
     Dictionary<string, DbTypeInfo> dbTypes,
-    Func<int, string> readerFn,
-    Func<int, string>? readerArrayFn = null,
+    ReaderFn readerFn,
+    ReaderFn? readerArrayFn = null,
     string? usingDirective = null,
-    Func<string, bool, bool, string>? writerFn = null,
-    Func<string, string>? convertFunc = null,
+    WriterFn? writerFn = null,
+    ConvertFunc? convertFunc = null,
     string? sqlMapper = null,
-    Func<bool, string>? sqlMapperImpl = null)
+    SqlMapperImplFunc? sqlMapperImpl = null)
 {
     public Dictionary<string, DbTypeInfo> DbTypes { get; } = dbTypes;
-    public Func<int, string> ReaderFn { get; } = readerFn;
-    public Func<int, string>? ReaderArrayFn { get; } = readerArrayFn;
+    public ReaderFn ReaderFn { get; } = readerFn;
+    public ReaderFn? ReaderArrayFn { get; } = readerArrayFn;
     public string? UsingDirective { get; } = usingDirective;
-    public Func<string, bool, bool, string>? WriterFn { get; } = writerFn;
-    public Func<string, string>? ConvertFunc { get; } = convertFunc;
+    public WriterFn? WriterFn { get; } = writerFn;
+    public ConvertFunc? ConvertFunc { get; } = convertFunc;
     public string? SqlMapper { get; } = sqlMapper;
-    public Func<bool, string>? SqlMapperImpl { get; } = sqlMapperImpl;
+    public SqlMapperImplFunc? SqlMapperImpl { get; } = sqlMapperImpl;
 }

Drivers/DbDriver.cs

@@ -330,7 +330,7 @@ private static bool DoesColumnMappingApply(ColumnMapping columnMapping, Column c
         return typeInfo.Length.Value == column.Length;
     }
 
-    public virtual Func<string, bool, bool, string>? GetWriterFn(Column column, Query query)
+    public virtual WriterFn? GetWriterFn(Column column, Query query)
     {
         var csharpType = GetCsharpTypeWithoutNullableSuffix(column, query);
         var writerFn = ColumnMappings.GetValueOrDefault(csharpType)?.WriterFn;

Drivers/MySqlConnectorDriver.cs

@@ -156,7 +156,7 @@ public sealed partial class MySqlConnectorDriver(
 
     public override string TransactionClassName => "MySqlTransaction";
 
-    private static readonly Func<bool, string> JsonElementTypeHandler = _ => $$"""
+    private static readonly SqlMapperImplFunc JsonElementTypeHandler = _ => $$"""
         private class JsonElementTypeHandler : SqlMapper.TypeHandler<JsonElement>
         {
             public override JsonElement Parse(object value)
@@ -613,7 +613,7 @@ private bool IsSetDataType(Column column)
         return enumType is not null && IsSetDataType(column, enumType);
     }
 
-    public override Func<string, bool, bool, string>? GetWriterFn(Column column, Query query)
+    public override WriterFn? GetWriterFn(Column column, Query query)
     {
         var csharpType = GetCsharpTypeWithoutNullableSuffix(column, query);
         var writerFn = ColumnMappings.GetValueOrDefault(csharpType)?.WriterFn;

Drivers/NpgsqlDriver.cs

@@ -345,7 +345,7 @@ public NpgsqlDriver(
 
     public override string TransactionClassName => "NpgsqlTransaction";
 
-    private static readonly Func<bool, string> JsonElementTypeHandler = _ => $$"""
+    private static readonly SqlMapperImplFunc JsonElementTypeHandler = _ => $$"""
         private class JsonElementTypeHandler : SqlMapper.TypeHandler<JsonElement>
         {
             public override JsonElement Parse(object value)
@@ -362,7 +362,7 @@ public override void SetValue(IDbDataParameter parameter, JsonElement value)
         }
         """;
 
-    private static readonly Func<bool, string> XmlDocumentTypeHandler = isDotnetCore => $$"""
+    private static readonly SqlMapperImplFunc XmlDocumentTypeHandler = isDotnetCore => $$"""
         private class XmlDocumentTypeHandler : SqlMapper.TypeHandler<XmlDocument>
         {
             public override XmlDocument Parse(object value)
@@ -597,7 +597,7 @@ string AddRowsToCopyCommand()
         }
     }
 
-    public override Func<string, bool, bool, string>? GetWriterFn(Column column, Query query)
+    public override WriterFn? GetWriterFn(Column column, Query query)
     {
         var csharpType = GetCsharpTypeWithoutNullableSuffix(column, query);
         var writerFn = ColumnMappings.GetValueOrDefault(csharpType)?.WriterFn;