diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e21e1690..11b88b36 100644
--- a/.github/workflows/build.yml
+++ b/.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'
 
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index ebd4d991..757a94b8 100644
--- a/.github/workflows/tests.yml
+++ b/.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:
diff --git a/CodegenTests/test-requests/DefaultSchemaEnum/request.json b/CodegenTests/test-requests/DefaultSchemaEnum/request.json
index 9cfcde41..7cf007aa 100644
--- a/CodegenTests/test-requests/DefaultSchemaEnum/request.json
+++ b/CodegenTests/test-requests/DefaultSchemaEnum/request.json
@@ -100,6 +100,6 @@
       }
     }
   ],
-  "sqlc_version": "v1.27.0",
+  "sqlc_version": "v1.30.0",
   "plugin_options": "eyJvdmVycmlkZURyaXZlclZlcnNpb24iOiIiLCJnZW5lcmF0ZUNzcHJvaiI6dHJ1ZSwidGFyZ2V0RnJhbWV3b3JrIjoibmV0OC4wIiwibmFtZXNwYWNlTmFtZSI6IiIsInVzZURhcHBlciI6ZmFsc2UsIm92ZXJyaWRlRGFwcGVyVmVyc2lvbiI6IiIsIm92ZXJyaWRlcyI6bnVsbCwiZGVidWdSZXF1ZXN0IjpmYWxzZX0="
 }
\ No newline at end of file
diff --git a/CodegenTests/test-requests/DefaultSchemaEnum/request.message b/CodegenTests/test-requests/DefaultSchemaEnum/request.message
index 0e8fb7c8..d56158b3 100644
--- a/CodegenTests/test-requests/DefaultSchemaEnum/request.message
+++ b/CodegenTests/test-requests/DefaultSchemaEnum/request.message
@@ -10,4 +10,4 @@
 dummy_column0
R
dummy_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.sqlB
dummy_table"v1.27.0*Г
{"overrideDriverVersion":"","generateCsproj":true,"targetFramework":"net8.0","namespaceName":"","useDapper":false,"overrideDapperVersion":"","overrides":null,"debugRequest":false}
\ No newline at end of file
+dummy_column0
Rpublicdummy_tablebdummy_table_dummy_columnzdummy_column:	query.sqlB
dummy_table"v1.30.0*Г
{"overrideDriverVersion":"","generateCsproj":true,"targetFramework":"net8.0","namespaceName":"","useDapper":false,"overrideDapperVersion":"","overrides":null,"debugRequest":false}
\ No newline at end of file
diff --git a/CodegenTests/test-requests/SchemaScopedEnum/request.json b/CodegenTests/test-requests/SchemaScopedEnum/request.json
index 9229b7c9..7b2a146d 100644
--- a/CodegenTests/test-requests/SchemaScopedEnum/request.json
+++ b/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="
 }
\ No newline at end of file
diff --git a/CodegenTests/test-requests/SchemaScopedEnum/request.message b/CodegenTests/test-requests/SchemaScopedEnum/request.message
index 7fac4f53..766cd0c5 100644
--- a/CodegenTests/test-requests/SchemaScopedEnum/request.message
+++ b/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}
\ No newline at end of file
+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}
\ No newline at end of file
diff --git a/Drivers/ColumnMapping.cs b/Drivers/ColumnMapping.cs
index 87c1bd7c..05f51481 100644
--- a/Drivers/ColumnMapping.cs
+++ b/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;
 }
\ No newline at end of file
diff --git a/Drivers/DbDriver.cs b/Drivers/DbDriver.cs
index 6fb12f61..c96fecf6 100644
--- a/Drivers/DbDriver.cs
+++ b/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;
diff --git a/Drivers/MySqlConnectorDriver.cs b/Drivers/MySqlConnectorDriver.cs
index 596db8b1..d302333d 100644
--- a/Drivers/MySqlConnectorDriver.cs
+++ b/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;
diff --git a/Drivers/NpgsqlDriver.cs b/Drivers/NpgsqlDriver.cs
index 69936a4b..9061a906 100644
--- a/Drivers/NpgsqlDriver.cs
+++ b/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;
diff --git a/examples/MySqlConnectorDapperExample/request.json b/examples/MySqlConnectorDapperExample/request.json
index 23d0fc09..19472626 100644
--- a/examples/MySqlConnectorDapperExample/request.json
+++ b/examples/MySqlConnectorDapperExample/request.json
@@ -3770,6 +3770,6 @@
       "filename": "query.sql"
     }
   ],
-  "sqlc_version": "v1.27.0",
+  "sqlc_version": "v1.30.0",
   "plugin_options": "eyJvdmVycmlkZURyaXZlclZlcnNpb24iOiIiLCJnZW5lcmF0ZUNzcHJvaiI6dHJ1ZSwidGFyZ2V0RnJhbWV3b3JrIjoibmV0OC4wIiwibmFtZXNwYWNlTmFtZSI6Ik15U3FsQ29ubmVjdG9yRGFwcGVyRXhhbXBsZUdlbiIsInVzZURhcHBlciI6dHJ1ZSwib3ZlcnJpZGVEYXBwZXJWZXJzaW9uIjoiIiwib3ZlcnJpZGVzIjpbeyJjb2x1bW4iOiJHZXRNeXNxbEZ1bmN0aW9uczptYXhfaW50IiwiY3NoYXJwX3R5cGUiOnsidHlwZSI6ImludCIsIm5vdE51bGwiOmZhbHNlfX0seyJjb2x1bW4iOiJHZXRNeXNxbEZ1bmN0aW9uczptYXhfdmFyY2hhciIsImNzaGFycF90eXBlIjp7InR5cGUiOiJzdHJpbmciLCJub3ROdWxsIjpmYWxzZX19LHsiY29sdW1uIjoiR2V0TXlzcWxGdW5jdGlvbnM6bWF4X3RpbWVzdGFtcCIsImNzaGFycF90eXBlIjp7InR5cGUiOiJEYXRlVGltZSIsIm5vdE51bGwiOnRydWV9fSx7ImNvbHVtbiI6Iio6Y19qc29uX3N0cmluZ19vdmVycmlkZSIsImNzaGFycF90eXBlIjp7InR5cGUiOiJzdHJpbmciLCJub3ROdWxsIjpmYWxzZX19XSwiZGVidWdSZXF1ZXN0IjpmYWxzZX0="
 }
\ No newline at end of file
diff --git a/examples/MySqlConnectorDapperExample/request.message b/examples/MySqlConnectorDapperExample/request.message
index 29881c40..7390bc73 100644
Binary files a/examples/MySqlConnectorDapperExample/request.message and b/examples/MySqlConnectorDapperExample/request.message differ
diff --git a/examples/MySqlConnectorDapperLegacyExample/request.json b/examples/MySqlConnectorDapperLegacyExample/request.json
index f2f8ce44..337b546b 100644
--- a/examples/MySqlConnectorDapperLegacyExample/request.json
+++ b/examples/MySqlConnectorDapperLegacyExample/request.json
@@ -3770,6 +3770,6 @@
       "filename": "query.sql"
     }
   ],
-  "sqlc_version": "v1.27.0",
+  "sqlc_version": "v1.30.0",
   "plugin_options": "eyJvdmVycmlkZURyaXZlclZlcnNpb24iOiIiLCJnZW5lcmF0ZUNzcHJvaiI6dHJ1ZSwidGFyZ2V0RnJhbWV3b3JrIjoibmV0c3RhbmRhcmQyLjAiLCJuYW1lc3BhY2VOYW1lIjoiTXlTcWxDb25uZWN0b3JEYXBwZXJMZWdhY3lFeGFtcGxlR2VuIiwidXNlRGFwcGVyIjp0cnVlLCJvdmVycmlkZURhcHBlclZlcnNpb24iOiIiLCJvdmVycmlkZXMiOlt7ImNvbHVtbiI6IkdldE15c3FsRnVuY3Rpb25zOm1heF9pbnQiLCJjc2hhcnBfdHlwZSI6eyJ0eXBlIjoiaW50Iiwibm90TnVsbCI6ZmFsc2V9fSx7ImNvbHVtbiI6IkdldE15c3FsRnVuY3Rpb25zOm1heF92YXJjaGFyIiwiY3NoYXJwX3R5cGUiOnsidHlwZSI6InN0cmluZyIsIm5vdE51bGwiOmZhbHNlfX0seyJjb2x1bW4iOiJHZXRNeXNxbEZ1bmN0aW9uczptYXhfdGltZXN0YW1wIiwiY3NoYXJwX3R5cGUiOnsidHlwZSI6IkRhdGVUaW1lIiwibm90TnVsbCI6dHJ1ZX19LHsiY29sdW1uIjoiKjpjX2pzb25fc3RyaW5nX292ZXJyaWRlIiwiY3NoYXJwX3R5cGUiOnsidHlwZSI6InN0cmluZyIsIm5vdE51bGwiOmZhbHNlfX1dLCJkZWJ1Z1JlcXVlc3QiOmZhbHNlfQ=="
 }
\ No newline at end of file
diff --git a/examples/MySqlConnectorDapperLegacyExample/request.message b/examples/MySqlConnectorDapperLegacyExample/request.message
index 31569fb1..3aa6a63e 100644
Binary files a/examples/MySqlConnectorDapperLegacyExample/request.message and b/examples/MySqlConnectorDapperLegacyExample/request.message differ
diff --git a/examples/MySqlConnectorExample/request.json b/examples/MySqlConnectorExample/request.json
index cfae6b86..b024268c 100644
--- a/examples/MySqlConnectorExample/request.json
+++ b/examples/MySqlConnectorExample/request.json
@@ -3770,6 +3770,6 @@
       "filename": "query.sql"
     }
   ],
-  "sqlc_version": "v1.27.0",
+  "sqlc_version": "v1.30.0",
   "plugin_options": "eyJvdmVycmlkZURyaXZlclZlcnNpb24iOiIiLCJnZW5lcmF0ZUNzcHJvaiI6dHJ1ZSwidGFyZ2V0RnJhbWV3b3JrIjoibmV0OC4wIiwibmFtZXNwYWNlTmFtZSI6Ik15U3FsQ29ubmVjdG9yRXhhbXBsZUdlbiIsInVzZURhcHBlciI6ZmFsc2UsIm92ZXJyaWRlRGFwcGVyVmVyc2lvbiI6IiIsIm92ZXJyaWRlcyI6W3siY29sdW1uIjoiR2V0TXlzcWxGdW5jdGlvbnM6bWF4X2ludCIsImNzaGFycF90eXBlIjp7InR5cGUiOiJpbnQiLCJub3ROdWxsIjpmYWxzZX19LHsiY29sdW1uIjoiR2V0TXlzcWxGdW5jdGlvbnM6bWF4X3ZhcmNoYXIiLCJjc2hhcnBfdHlwZSI6eyJ0eXBlIjoic3RyaW5nIiwibm90TnVsbCI6ZmFsc2V9fSx7ImNvbHVtbiI6IkdldE15c3FsRnVuY3Rpb25zOm1heF90aW1lc3RhbXAiLCJjc2hhcnBfdHlwZSI6eyJ0eXBlIjoiRGF0ZVRpbWUiLCJub3ROdWxsIjp0cnVlfX0seyJjb2x1bW4iOiIqOmNfanNvbl9zdHJpbmdfb3ZlcnJpZGUiLCJjc2hhcnBfdHlwZSI6eyJ0eXBlIjoic3RyaW5nIiwibm90TnVsbCI6ZmFsc2V9fV0sImRlYnVnUmVxdWVzdCI6ZmFsc2V9"
 }
\ No newline at end of file
diff --git a/examples/MySqlConnectorExample/request.message b/examples/MySqlConnectorExample/request.message
index 1d678969..7e0add10 100644
Binary files a/examples/MySqlConnectorExample/request.message and b/examples/MySqlConnectorExample/request.message differ
diff --git a/examples/MySqlConnectorLegacyExample/request.json b/examples/MySqlConnectorLegacyExample/request.json
index 350da4df..9407eaa2 100644
--- a/examples/MySqlConnectorLegacyExample/request.json
+++ b/examples/MySqlConnectorLegacyExample/request.json
@@ -3770,6 +3770,6 @@
       "filename": "query.sql"
     }
   ],
-  "sqlc_version": "v1.27.0",
+  "sqlc_version": "v1.30.0",
   "plugin_options": "eyJvdmVycmlkZURyaXZlclZlcnNpb24iOiIiLCJnZW5lcmF0ZUNzcHJvaiI6dHJ1ZSwidGFyZ2V0RnJhbWV3b3JrIjoibmV0c3RhbmRhcmQyLjAiLCJuYW1lc3BhY2VOYW1lIjoiTXlTcWxDb25uZWN0b3JMZWdhY3lFeGFtcGxlR2VuIiwidXNlRGFwcGVyIjpmYWxzZSwib3ZlcnJpZGVEYXBwZXJWZXJzaW9uIjoiIiwib3ZlcnJpZGVzIjpbeyJjb2x1bW4iOiJHZXRNeXNxbEZ1bmN0aW9uczptYXhfaW50IiwiY3NoYXJwX3R5cGUiOnsidHlwZSI6ImludCIsIm5vdE51bGwiOmZhbHNlfX0seyJjb2x1bW4iOiJHZXRNeXNxbEZ1bmN0aW9uczptYXhfdmFyY2hhciIsImNzaGFycF90eXBlIjp7InR5cGUiOiJzdHJpbmciLCJub3ROdWxsIjpmYWxzZX19LHsiY29sdW1uIjoiR2V0TXlzcWxGdW5jdGlvbnM6bWF4X3RpbWVzdGFtcCIsImNzaGFycF90eXBlIjp7InR5cGUiOiJEYXRlVGltZSIsIm5vdE51bGwiOnRydWV9fSx7ImNvbHVtbiI6Iio6Y19qc29uX3N0cmluZ19vdmVycmlkZSIsImNzaGFycF90eXBlIjp7InR5cGUiOiJzdHJpbmciLCJub3ROdWxsIjpmYWxzZX19XSwiZGVidWdSZXF1ZXN0IjpmYWxzZX0="
 }
\ No newline at end of file
diff --git a/examples/MySqlConnectorLegacyExample/request.message b/examples/MySqlConnectorLegacyExample/request.message
index 41fbe903..2356033c 100644
Binary files a/examples/MySqlConnectorLegacyExample/request.message and b/examples/MySqlConnectorLegacyExample/request.message differ
diff --git a/examples/NpgsqlDapperExample/request.json b/examples/NpgsqlDapperExample/request.json
index adda0828..8ace9fd4 100644
--- a/examples/NpgsqlDapperExample/request.json
+++ b/examples/NpgsqlDapperExample/request.json
@@ -601,6 +601,7 @@
                   "name": "postgres_special_types"
                 },
                 "type": {
+                  "schema": "pg_catalog",
                   "name": "json"
                 }
               },
@@ -611,6 +612,7 @@
                   "name": "postgres_special_types"
                 },
                 "type": {
+                  "schema": "pg_catalog",
                   "name": "json"
                 }
               },
@@ -35047,7 +35049,7 @@
               "name": "postgres_special_types"
             },
             "type": {
-              "name": "json"
+              "name": "pg_catalog.json"
             },
             "originalName": "c_json"
           }
@@ -35058,6 +35060,7 @@
             "name": "c_json_string_override",
             "length": -1,
             "type": {
+              "schema": "pg_catalog",
               "name": "json"
             }
           }
@@ -35155,6 +35158,7 @@
             "name": "postgres_special_types"
           },
           "type": {
+            "schema": "pg_catalog",
             "name": "json"
           },
           "originalName": "c_json"
@@ -35166,6 +35170,7 @@
             "name": "postgres_special_types"
           },
           "type": {
+            "schema": "pg_catalog",
             "name": "json"
           },
           "originalName": "c_json_string_override"
@@ -35275,7 +35280,7 @@
               "name": "postgres_special_types"
             },
             "type": {
-              "name": "json"
+              "name": "pg_catalog.json"
             },
             "originalName": "c_json"
           }
@@ -35322,6 +35327,7 @@
           "notNull": true,
           "length": -1,
           "type": {
+            "schema": "pg_catalog",
             "name": "json"
           }
         },
@@ -36121,6 +36127,6 @@
       "filename": "query.sql"
     }
   ],
-  "sqlc_version": "v1.27.0",
+  "sqlc_version": "v1.30.0",
   "plugin_options": "eyJvdmVycmlkZURyaXZlclZlcnNpb24iOiIiLCJnZW5lcmF0ZUNzcHJvaiI6dHJ1ZSwidGFyZ2V0RnJhbWV3b3JrIjoibmV0OC4wIiwibmFtZXNwYWNlTmFtZSI6Ik5wZ3NxbERhcHBlckV4YW1wbGVHZW4iLCJ1c2VEYXBwZXIiOnRydWUsIm92ZXJyaWRlRGFwcGVyVmVyc2lvbiI6IiIsIm92ZXJyaWRlcyI6W3siY29sdW1uIjoiR2V0UG9zdGdyZXNGdW5jdGlvbnM6bWF4X2ludGVnZXIiLCJjc2hhcnBfdHlwZSI6eyJ0eXBlIjoiaW50Iiwibm90TnVsbCI6ZmFsc2V9fSx7ImNvbHVtbiI6IkdldFBvc3RncmVzRnVuY3Rpb25zOm1heF92YXJjaGFyIiwiY3NoYXJwX3R5cGUiOnsidHlwZSI6InN0cmluZyIsIm5vdE51bGwiOmZhbHNlfX0seyJjb2x1bW4iOiJHZXRQb3N0Z3Jlc0Z1bmN0aW9uczptYXhfdGltZXN0YW1wIiwiY3NoYXJwX3R5cGUiOnsidHlwZSI6IkRhdGVUaW1lIiwibm90TnVsbCI6dHJ1ZX19LHsiY29sdW1uIjoiR2V0UG9zdGdyZXNTcGVjaWFsVHlwZXNDbnQ6Y19qc29uIiwiY3NoYXJwX3R5cGUiOnsidHlwZSI6Ikpzb25FbGVtZW50Iiwibm90TnVsbCI6ZmFsc2V9fSx7ImNvbHVtbiI6IkdldFBvc3RncmVzU3BlY2lhbFR5cGVzQ250OmNfanNvbmIiLCJjc2hhcnBfdHlwZSI6eyJ0eXBlIjoiSnNvbkVsZW1lbnQiLCJub3ROdWxsIjpmYWxzZX19LHsiY29sdW1uIjoiKjpjX2pzb25fc3RyaW5nX292ZXJyaWRlIiwiY3NoYXJwX3R5cGUiOnsidHlwZSI6InN0cmluZyIsIm5vdE51bGwiOmZhbHNlfX0seyJjb2x1bW4iOiIqOmNfeG1sX3N0cmluZ19vdmVycmlkZSIsImNzaGFycF90eXBlIjp7InR5cGUiOiJzdHJpbmciLCJub3ROdWxsIjpmYWxzZX19LHsiY29sdW1uIjoiKjpjX21hY2FkZHI4IiwiY3NoYXJwX3R5cGUiOnsidHlwZSI6InN0cmluZyIsIm5vdE51bGwiOmZhbHNlfX1dLCJkZWJ1Z1JlcXVlc3QiOmZhbHNlfQ=="
 }
\ No newline at end of file
diff --git a/examples/NpgsqlDapperExample/request.message b/examples/NpgsqlDapperExample/request.message
index 2e17c374..cd48e311 100644
--- a/examples/NpgsqlDapperExample/request.message
+++ b/examples/NpgsqlDapperExample/request.message
@@ -3,7 +3,7 @@
 
2
 postgresql-examples/config/postgresql/authors/schema.sql+examples/config/postgresql/types/schema.sql",examples/config/postgresql/authors/query.sql"*examples/config/postgresql/types/query.sqlbЅ
 examples/NpgsqlDapperExamplecsharpц{"debugRequest":true,"generateCsproj":true,"namespaceName":"NpgsqlDapperExampleGen","overrides":[{"column":"GetPostgresFunctions:max_integer","csharp_type":{"notNull":false,"type":"int"}},{"column":"GetPostgresFunctions:max_varchar","csharp_type":{"notNull":false,"type":"string"}},{"column":"GetPostgresFunctions:max_timestamp","csharp_type":{"notNull":true,"type":"DateTime"}},{"column":"GetPostgresSpecialTypesCnt:c_json","csharp_type":{"notNull":false,"type":"JsonElement"}},{"column":"GetPostgresSpecialTypesCnt:c_jsonb","csharp_type":{"notNull":false,"type":"JsonElement"}},{"column":"*:c_json_string_override","csharp_type":{"notNull":false,"type":"string"}},{"column":"*:c_xml_string_override","csharp_type":{"notNull":false,"type":"string"}},{"column":"*:c_macaddr8","csharp_type":{"notNull":false,"type":"string"}}],"targetFramework":"net8.0","useDapper":true}*
-./dist/LocalRunnerУьpublic"…publicƒ

+./dist/LocalRunnerльpublic"publicƒ

 	authors)
 id
0џџџџџџџџџ
R	authorsb	bigserial&
 name
0џџџџџџџџџ
R	authorsbtext#
@@ -81,12 +81,14 @@ pg_catalog	timestamp
 c_box0џџџџџџџџџ
Rpostgres_geometric_typesbbox7
 c_path0џџџџџџџџџ
Rpostgres_geometric_typesbpath=
 	c_polygon0џџџџџџџџџ
Rpostgres_geometric_typesb	polygon;
-c_circle0џџџџџџџџџ
Rpostgres_geometric_typesbcircleњ
+c_circle0џџџџџџџџџ
Rpostgres_geometric_typesbcircle’
 postgres_special_types5
 c_uuid0џџџџџџџџџ
Rpostgres_special_typesbuuid7
-c_enum0џџџџџџџџџ
Rpostgres_special_typesbc_enum5
-c_json0џџџџџџџџџ
Rpostgres_special_typesbjsonE
-c_json_string_override0џџџџџџџџџ
Rpostgres_special_typesbjson7
+c_enum0џџџџџџџџџ
Rpostgres_special_typesbc_enumA
+c_json0џџџџџџџџџ
Rpostgres_special_typesb
+pg_catalogjsonQ
+c_json_string_override0џџџџџџџџџ
Rpostgres_special_typesb
+pg_catalogjson7
 c_jsonb0џџџџџџџџџ
Rpostgres_special_typesbjsonb=
 
 c_jsonpath0џџџџџџџџџ
Rpostgres_special_typesb
@@ -10670,7 +10672,7 @@ LIMIT 1GetPostgresNetworkTypesCnt:one"=
 ) VALUES ($1, $2, $3)InsertPostgresNetworkTypesBatch	:copyfrom*I
E
 c_cidr0џџџџџџџџџ
R publicpostgres_network_typesbcidrzc_cidr*IE
 c_inet0џџџџџџџџџ
R publicpostgres_network_typesbinetzc_inet*RN
-	c_macaddr0џџџџџџџџџ
R publicpostgres_network_typesb	macaddrz	c_macaddr:	query.sqlBpostgres_network_typesЈ
+	c_macaddr0џџџџџџџџџ
R publicpostgres_network_typesb	macaddrz	c_macaddr:	query.sqlBpostgres_network_typesП
 —
 INSERT INTO postgres_special_types
 (
@@ -10692,9 +10694,10 @@ VALUES (
     $6::xml,
     $7,
     $8::c_enum
-)InsertPostgresSpecialTypes:exec*K
G
-c_json0џџџџџџџџџ
8
R publicpostgres_special_typesbjsonzc_json*/+
-c_json_string_override0џџџџџџџџџ
bjson*NJ
+)InsertPostgresSpecialTypes:exec*V
R
+c_json0џџџџџџџџџ
8
R publicpostgres_special_typesbpg_catalog.jsonzc_json*;7
+c_json_string_override0џџџџџџџџџ
b
+pg_catalogjson*NJ
 c_jsonb0џџџџџџџџџ
8
R publicpostgres_special_typesbjsonbzc_jsonb*'#
 
 c_jsonpath0џџџџџџџџџ
b
@@ -10702,7 +10705,7 @@ c_jsonpath0
 c_xml0џџџџџџџџџ
bxml*-)
 c_xml_string_override0џџџџџџџџџ
bxml*KG
 c_uuid0џџџџџџџџџ
8
R publicpostgres_special_typesbuuidzc_uuid*!
-c_enum0џџџџџџџџџ
bc_enum2 Special types :	query.sqlBpostgres_special_types
+c_enum0џџџџџџџџџ
bc_enum2 Special types :	query.sqlBpostgres_special_typesЕ
 ­
SELECT
     c_json,
     c_json_string_override,
@@ -10713,9 +10716,11 @@ c_jsonpath0
     c_uuid,
     c_enum
 FROM postgres_special_types 
-LIMIT 1GetPostgresSpecialTypes:one"=
-c_json0џџџџџџџџџ
Rpostgres_special_typesbjsonzc_json"]
-c_json_string_override0џџџџџџџџџ
Rpostgres_special_typesbjsonzc_json_string_override"@
+LIMIT 1GetPostgresSpecialTypes:one"I
+c_json0џџџџџџџџџ
Rpostgres_special_typesb
+pg_catalogjsonzc_json"i
+c_json_string_override0џџџџџџџџџ
Rpostgres_special_typesb
+pg_catalogjsonzc_json_string_override"@
 c_jsonb0џџџџџџџџџ
Rpostgres_special_typesbjsonbzc_jsonb"I
 
 c_jsonpath0џџџџџџџџџ
Rpostgres_special_typesb
@@ -10725,7 +10730,7 @@ c_jsonpath":
 c_xml_string_override0џџџџџџџџџ
Rpostgres_special_typesbxmlzc_xml_string_override"=
 c_uuid0џџџџџџџџџ
Rpostgres_special_typesbuuidzc_uuid"?
 c_enum0џџџџџџџџџ
Rpostgres_special_typesbc_enumzc_enum:	query.sqlW
-%TRUNCATE TABLE postgres_special_typesTruncatePostgresSpecialTypes:exec:	query.sqlЃ
+%TRUNCATE TABLE postgres_special_typesTruncatePostgresSpecialTypes:exec:	query.sqlЎ
 lINSERT INTO postgres_special_types
 (
     c_uuid,
@@ -10737,9 +10742,9 @@ VALUES (
     $2,
     $3
 )InsertPostgresSpecialTypesBatch	:copyfrom*I
E
-c_uuid0џџџџџџџџџ
R publicpostgres_special_typesbuuidzc_uuid*IE
-c_json0џџџџџџџџџ
R publicpostgres_special_typesbjsonzc_json*LH
-c_jsonb0џџџџџџџџџ
R publicpostgres_special_typesbjsonbzc_jsonb:	query.sqlBpostgres_special_typesл
+c_uuid0џџџџџџџџџ
R publicpostgres_special_typesbuuidzc_uuid*TP
+c_json0џџџџџџџџџ
R publicpostgres_special_typesbpg_catalog.jsonzc_json*LH
+c_jsonb0џџџџџџџџџ
R publicpostgres_special_typesbjsonbzc_jsonb:	query.sqlBpostgres_special_typesч
 їWITH grouped_json_types AS (
     SELECT
         c_uuid,
@@ -10760,8 +10765,9 @@ SELECT
     cnt
 FROM grouped_json_types
 LIMIT 1GetPostgresSpecialTypesCnt:one"9
-c_uuid0џџџџџџџџџ
Rgrouped_json_typesbuuidzc_uuid"
-c_json
0џџџџџџџџџ
bjson"
+c_uuid0џџџџџџџџџ
Rgrouped_json_typesbuuidzc_uuid")
+c_json
0џџџџџџџџџ
b
+pg_catalogjson"
 c_jsonb
0џџџџџџџџџ
bjsonb"7
 cnt
0џџџџџџџџџ
Rgrouped_json_typesbbigintzcnt:	query.sqlн
 Я

@@ -10889,4 +10895,4 @@ hSELECT c_point, c_line, c_lseg, c_box, c_path, c_polygon, c_circle FROM postgre
 c_path0џџџџџџџџџ
Rpostgres_geometric_typesbpathzc_path"H
 	c_polygon0џџџџџџџџџ
Rpostgres_geometric_typesb	polygonz	c_polygon"E
 c_circle0џџџџџџџџџ
Rpostgres_geometric_typesbcirclezc_circle:	query.sqlU
-'TRUNCATE TABLE postgres_geometric_typesTruncatePostgresGeoTypes:exec:	query.sql"v1.27.0*{"overrideDriverVersion":"","generateCsproj":true,"targetFramework":"net8.0","namespaceName":"NpgsqlDapperExampleGen","useDapper":true,"overrideDapperVersion":"","overrides":[{"column":"GetPostgresFunctions:max_integer","csharp_type":{"type":"int","notNull":false}},{"column":"GetPostgresFunctions:max_varchar","csharp_type":{"type":"string","notNull":false}},{"column":"GetPostgresFunctions:max_timestamp","csharp_type":{"type":"DateTime","notNull":true}},{"column":"GetPostgresSpecialTypesCnt:c_json","csharp_type":{"type":"JsonElement","notNull":false}},{"column":"GetPostgresSpecialTypesCnt:c_jsonb","csharp_type":{"type":"JsonElement","notNull":false}},{"column":"*:c_json_string_override","csharp_type":{"type":"string","notNull":false}},{"column":"*:c_xml_string_override","csharp_type":{"type":"string","notNull":false}},{"column":"*:c_macaddr8","csharp_type":{"type":"string","notNull":false}}],"debugRequest":false}
\ No newline at end of file
+'TRUNCATE TABLE postgres_geometric_typesTruncatePostgresGeoTypes:exec:	query.sql"v1.30.0*{"overrideDriverVersion":"","generateCsproj":true,"targetFramework":"net8.0","namespaceName":"NpgsqlDapperExampleGen","useDapper":true,"overrideDapperVersion":"","overrides":[{"column":"GetPostgresFunctions:max_integer","csharp_type":{"type":"int","notNull":false}},{"column":"GetPostgresFunctions:max_varchar","csharp_type":{"type":"string","notNull":false}},{"column":"GetPostgresFunctions:max_timestamp","csharp_type":{"type":"DateTime","notNull":true}},{"column":"GetPostgresSpecialTypesCnt:c_json","csharp_type":{"type":"JsonElement","notNull":false}},{"column":"GetPostgresSpecialTypesCnt:c_jsonb","csharp_type":{"type":"JsonElement","notNull":false}},{"column":"*:c_json_string_override","csharp_type":{"type":"string","notNull":false}},{"column":"*:c_xml_string_override","csharp_type":{"type":"string","notNull":false}},{"column":"*:c_macaddr8","csharp_type":{"type":"string","notNull":false}}],"debugRequest":false}
\ No newline at end of file
diff --git a/examples/NpgsqlDapperLegacyExample/request.json b/examples/NpgsqlDapperLegacyExample/request.json
index 58fb083d..ee160451 100644
--- a/examples/NpgsqlDapperLegacyExample/request.json
+++ b/examples/NpgsqlDapperLegacyExample/request.json
@@ -601,6 +601,7 @@
                   "name": "postgres_special_types"
                 },
                 "type": {
+                  "schema": "pg_catalog",
                   "name": "json"
                 }
               },
@@ -611,6 +612,7 @@
                   "name": "postgres_special_types"
                 },
                 "type": {
+                  "schema": "pg_catalog",
                   "name": "json"
                 }
               },
@@ -35047,7 +35049,7 @@
               "name": "postgres_special_types"
             },
             "type": {
-              "name": "json"
+              "name": "pg_catalog.json"
             },
             "originalName": "c_json"
           }
@@ -35058,6 +35060,7 @@
             "name": "c_json_string_override",
             "length": -1,
             "type": {
+              "schema": "pg_catalog",
               "name": "json"
             }
           }
@@ -35155,6 +35158,7 @@
             "name": "postgres_special_types"
           },
           "type": {
+            "schema": "pg_catalog",
             "name": "json"
           },
           "originalName": "c_json"
@@ -35166,6 +35170,7 @@
             "name": "postgres_special_types"
           },
           "type": {
+            "schema": "pg_catalog",
             "name": "json"
           },
           "originalName": "c_json_string_override"
@@ -35275,7 +35280,7 @@
               "name": "postgres_special_types"
             },
             "type": {
-              "name": "json"
+              "name": "pg_catalog.json"
             },
             "originalName": "c_json"
           }
@@ -35322,6 +35327,7 @@
           "notNull": true,
           "length": -1,
           "type": {
+            "schema": "pg_catalog",
             "name": "json"
           }
         },
@@ -36121,6 +36127,6 @@
       "filename": "query.sql"
     }
   ],
-  "sqlc_version": "v1.27.0",
+  "sqlc_version": "v1.30.0",
   "plugin_options": "eyJvdmVycmlkZURyaXZlclZlcnNpb24iOiIiLCJnZW5lcmF0ZUNzcHJvaiI6dHJ1ZSwidGFyZ2V0RnJhbWV3b3JrIjoibmV0c3RhbmRhcmQyLjAiLCJuYW1lc3BhY2VOYW1lIjoiTnBnc3FsRGFwcGVyTGVnYWN5RXhhbXBsZUdlbiIsInVzZURhcHBlciI6dHJ1ZSwib3ZlcnJpZGVEYXBwZXJWZXJzaW9uIjoiIiwib3ZlcnJpZGVzIjpbeyJjb2x1bW4iOiJHZXRQb3N0Z3Jlc0Z1bmN0aW9uczptYXhfaW50ZWdlciIsImNzaGFycF90eXBlIjp7InR5cGUiOiJpbnQiLCJub3ROdWxsIjpmYWxzZX19LHsiY29sdW1uIjoiR2V0UG9zdGdyZXNGdW5jdGlvbnM6bWF4X3ZhcmNoYXIiLCJjc2hhcnBfdHlwZSI6eyJ0eXBlIjoic3RyaW5nIiwibm90TnVsbCI6ZmFsc2V9fSx7ImNvbHVtbiI6IkdldFBvc3RncmVzRnVuY3Rpb25zOm1heF90aW1lc3RhbXAiLCJjc2hhcnBfdHlwZSI6eyJ0eXBlIjoiRGF0ZVRpbWUiLCJub3ROdWxsIjp0cnVlfX0seyJjb2x1bW4iOiJHZXRQb3N0Z3Jlc1NwZWNpYWxUeXBlc0NudDpjX2pzb24iLCJjc2hhcnBfdHlwZSI6eyJ0eXBlIjoiSnNvbkVsZW1lbnQiLCJub3ROdWxsIjpmYWxzZX19LHsiY29sdW1uIjoiR2V0UG9zdGdyZXNTcGVjaWFsVHlwZXNDbnQ6Y19qc29uYiIsImNzaGFycF90eXBlIjp7InR5cGUiOiJKc29uRWxlbWVudCIsIm5vdE51bGwiOmZhbHNlfX0seyJjb2x1bW4iOiIqOmNfanNvbl9zdHJpbmdfb3ZlcnJpZGUiLCJjc2hhcnBfdHlwZSI6eyJ0eXBlIjoic3RyaW5nIiwibm90TnVsbCI6ZmFsc2V9fSx7ImNvbHVtbiI6Iio6Y194bWxfc3RyaW5nX292ZXJyaWRlIiwiY3NoYXJwX3R5cGUiOnsidHlwZSI6InN0cmluZyIsIm5vdE51bGwiOmZhbHNlfX0seyJjb2x1bW4iOiIqOmNfbWFjYWRkcjgiLCJjc2hhcnBfdHlwZSI6eyJ0eXBlIjoic3RyaW5nIiwibm90TnVsbCI6ZmFsc2V9fV0sImRlYnVnUmVxdWVzdCI6ZmFsc2V9"
 }
\ No newline at end of file
diff --git a/examples/NpgsqlDapperLegacyExample/request.message b/examples/NpgsqlDapperLegacyExample/request.message
index a0ac81db..dc27d44d 100644
--- a/examples/NpgsqlDapperLegacyExample/request.message
+++ b/examples/NpgsqlDapperLegacyExample/request.message
@@ -3,7 +3,7 @@
 
2
 postgresql-examples/config/postgresql/authors/schema.sql+examples/config/postgresql/types/schema.sql",examples/config/postgresql/authors/query.sql"*examples/config/postgresql/types/query.sqlbЙ
 "examples/NpgsqlDapperLegacyExamplecsharpє{"debugRequest":true,"generateCsproj":true,"namespaceName":"NpgsqlDapperLegacyExampleGen","overrides":[{"column":"GetPostgresFunctions:max_integer","csharp_type":{"notNull":false,"type":"int"}},{"column":"GetPostgresFunctions:max_varchar","csharp_type":{"notNull":false,"type":"string"}},{"column":"GetPostgresFunctions:max_timestamp","csharp_type":{"notNull":true,"type":"DateTime"}},{"column":"GetPostgresSpecialTypesCnt:c_json","csharp_type":{"notNull":false,"type":"JsonElement"}},{"column":"GetPostgresSpecialTypesCnt:c_jsonb","csharp_type":{"notNull":false,"type":"JsonElement"}},{"column":"*:c_json_string_override","csharp_type":{"notNull":false,"type":"string"}},{"column":"*:c_xml_string_override","csharp_type":{"notNull":false,"type":"string"}},{"column":"*:c_macaddr8","csharp_type":{"notNull":false,"type":"string"}}],"targetFramework":"netstandard2.0","useDapper":true}*
-./dist/LocalRunnerУьpublic"…publicƒ

+./dist/LocalRunnerльpublic"publicƒ

 	authors)
 id
0џџџџџџџџџ
R	authorsb	bigserial&
 name
0џџџџџџџџџ
R	authorsbtext#
@@ -81,12 +81,14 @@ pg_catalog	timestamp
 c_box0џџџџџџџџџ
Rpostgres_geometric_typesbbox7
 c_path0џџџџџџџџџ
Rpostgres_geometric_typesbpath=
 	c_polygon0џџџџџџџџџ
Rpostgres_geometric_typesb	polygon;
-c_circle0џџџџџџџџџ
Rpostgres_geometric_typesbcircleњ
+c_circle0џџџџџџџџџ
Rpostgres_geometric_typesbcircle’
 postgres_special_types5
 c_uuid0џџџџџџџџџ
Rpostgres_special_typesbuuid7
-c_enum0џџџџџџџџџ
Rpostgres_special_typesbc_enum5
-c_json0џџџџџџџџџ
Rpostgres_special_typesbjsonE
-c_json_string_override0џџџџџџџџџ
Rpostgres_special_typesbjson7
+c_enum0џџџџџџџџџ
Rpostgres_special_typesbc_enumA
+c_json0џџџџџџџџџ
Rpostgres_special_typesb
+pg_catalogjsonQ
+c_json_string_override0џџџџџџџџџ
Rpostgres_special_typesb
+pg_catalogjson7
 c_jsonb0џџџџџџџџџ
Rpostgres_special_typesbjsonb=
 
 c_jsonpath0џџџџџџџџџ
Rpostgres_special_typesb
@@ -10670,7 +10672,7 @@ LIMIT 1GetPostgresNetworkTypesCnt:one"=
 ) VALUES ($1, $2, $3)InsertPostgresNetworkTypesBatch	:copyfrom*I
E
 c_cidr0џџџџџџџџџ
R publicpostgres_network_typesbcidrzc_cidr*IE
 c_inet0џџџџџџџџџ
R publicpostgres_network_typesbinetzc_inet*RN
-	c_macaddr0џџџџџџџџџ
R publicpostgres_network_typesb	macaddrz	c_macaddr:	query.sqlBpostgres_network_typesЈ
+	c_macaddr0џџџџџџџџџ
R publicpostgres_network_typesb	macaddrz	c_macaddr:	query.sqlBpostgres_network_typesП
 —
 INSERT INTO postgres_special_types
 (
@@ -10692,9 +10694,10 @@ VALUES (
     $6::xml,
     $7,
     $8::c_enum
-)InsertPostgresSpecialTypes:exec*K
G
-c_json0џџџџџџџџџ
8
R publicpostgres_special_typesbjsonzc_json*/+
-c_json_string_override0џџџџџџџџџ
bjson*NJ
+)InsertPostgresSpecialTypes:exec*V
R
+c_json0џџџџџџџџџ
8
R publicpostgres_special_typesbpg_catalog.jsonzc_json*;7
+c_json_string_override0џџџџџџџџџ
b
+pg_catalogjson*NJ
 c_jsonb0џџџџџџџџџ
8
R publicpostgres_special_typesbjsonbzc_jsonb*'#
 
 c_jsonpath0џџџџџџџџџ
b
@@ -10702,7 +10705,7 @@ c_jsonpath0
 c_xml0џџџџџџџџџ
bxml*-)
 c_xml_string_override0џџџџџџџџџ
bxml*KG
 c_uuid0џџџџџџџџџ
8
R publicpostgres_special_typesbuuidzc_uuid*!
-c_enum0џџџџџџџџџ
bc_enum2 Special types :	query.sqlBpostgres_special_types
+c_enum0џџџџџџџџџ
bc_enum2 Special types :	query.sqlBpostgres_special_typesЕ
 ­
SELECT
     c_json,
     c_json_string_override,
@@ -10713,9 +10716,11 @@ c_jsonpath0
     c_uuid,
     c_enum
 FROM postgres_special_types 
-LIMIT 1GetPostgresSpecialTypes:one"=
-c_json0џџџџџџџџџ
Rpostgres_special_typesbjsonzc_json"]
-c_json_string_override0џџџџџџџџџ
Rpostgres_special_typesbjsonzc_json_string_override"@
+LIMIT 1GetPostgresSpecialTypes:one"I
+c_json0џџџџџџџџџ
Rpostgres_special_typesb
+pg_catalogjsonzc_json"i
+c_json_string_override0џџџџџџџџџ
Rpostgres_special_typesb
+pg_catalogjsonzc_json_string_override"@
 c_jsonb0џџџџџџџџџ
Rpostgres_special_typesbjsonbzc_jsonb"I
 
 c_jsonpath0џџџџџџџџџ
Rpostgres_special_typesb
@@ -10725,7 +10730,7 @@ c_jsonpath":
 c_xml_string_override0џџџџџџџџџ
Rpostgres_special_typesbxmlzc_xml_string_override"=
 c_uuid0џџџџџџџџџ
Rpostgres_special_typesbuuidzc_uuid"?
 c_enum0џџџџџџџџџ
Rpostgres_special_typesbc_enumzc_enum:	query.sqlW
-%TRUNCATE TABLE postgres_special_typesTruncatePostgresSpecialTypes:exec:	query.sqlЃ
+%TRUNCATE TABLE postgres_special_typesTruncatePostgresSpecialTypes:exec:	query.sqlЎ
 lINSERT INTO postgres_special_types
 (
     c_uuid,
@@ -10737,9 +10742,9 @@ VALUES (
     $2,
     $3
 )InsertPostgresSpecialTypesBatch	:copyfrom*I
E
-c_uuid0џџџџџџџџџ
R publicpostgres_special_typesbuuidzc_uuid*IE
-c_json0џџџџџџџџџ
R publicpostgres_special_typesbjsonzc_json*LH
-c_jsonb0џџџџџџџџџ
R publicpostgres_special_typesbjsonbzc_jsonb:	query.sqlBpostgres_special_typesл
+c_uuid0џџџџџџџџџ
R publicpostgres_special_typesbuuidzc_uuid*TP
+c_json0џџџџџџџџџ
R publicpostgres_special_typesbpg_catalog.jsonzc_json*LH
+c_jsonb0џџџџџџџџџ
R publicpostgres_special_typesbjsonbzc_jsonb:	query.sqlBpostgres_special_typesч
 їWITH grouped_json_types AS (
     SELECT
         c_uuid,
@@ -10760,8 +10765,9 @@ SELECT
     cnt
 FROM grouped_json_types
 LIMIT 1GetPostgresSpecialTypesCnt:one"9
-c_uuid0џџџџџџџџџ
Rgrouped_json_typesbuuidzc_uuid"
-c_json
0џџџџџџџџџ
bjson"
+c_uuid0џџџџџџџџџ
Rgrouped_json_typesbuuidzc_uuid")
+c_json
0џџџџџџџџџ
b
+pg_catalogjson"
 c_jsonb
0џџџџџџџџџ
bjsonb"7
 cnt
0џџџџџџџџџ
Rgrouped_json_typesbbigintzcnt:	query.sqlн
 Я

@@ -10889,4 +10895,4 @@ hSELECT c_point, c_line, c_lseg, c_box, c_path, c_polygon, c_circle FROM postgre
 c_path0џџџџџџџџџ
Rpostgres_geometric_typesbpathzc_path"H
 	c_polygon0џџџџџџџџџ
Rpostgres_geometric_typesb	polygonz	c_polygon"E
 c_circle0џџџџџџџџџ
Rpostgres_geometric_typesbcirclezc_circle:	query.sqlU
-'TRUNCATE TABLE postgres_geometric_typesTruncatePostgresGeoTypes:exec:	query.sql"v1.27.0*Ћ{"overrideDriverVersion":"","generateCsproj":true,"targetFramework":"netstandard2.0","namespaceName":"NpgsqlDapperLegacyExampleGen","useDapper":true,"overrideDapperVersion":"","overrides":[{"column":"GetPostgresFunctions:max_integer","csharp_type":{"type":"int","notNull":false}},{"column":"GetPostgresFunctions:max_varchar","csharp_type":{"type":"string","notNull":false}},{"column":"GetPostgresFunctions:max_timestamp","csharp_type":{"type":"DateTime","notNull":true}},{"column":"GetPostgresSpecialTypesCnt:c_json","csharp_type":{"type":"JsonElement","notNull":false}},{"column":"GetPostgresSpecialTypesCnt:c_jsonb","csharp_type":{"type":"JsonElement","notNull":false}},{"column":"*:c_json_string_override","csharp_type":{"type":"string","notNull":false}},{"column":"*:c_xml_string_override","csharp_type":{"type":"string","notNull":false}},{"column":"*:c_macaddr8","csharp_type":{"type":"string","notNull":false}}],"debugRequest":false}
\ No newline at end of file
+'TRUNCATE TABLE postgres_geometric_typesTruncatePostgresGeoTypes:exec:	query.sql"v1.30.0*Ћ{"overrideDriverVersion":"","generateCsproj":true,"targetFramework":"netstandard2.0","namespaceName":"NpgsqlDapperLegacyExampleGen","useDapper":true,"overrideDapperVersion":"","overrides":[{"column":"GetPostgresFunctions:max_integer","csharp_type":{"type":"int","notNull":false}},{"column":"GetPostgresFunctions:max_varchar","csharp_type":{"type":"string","notNull":false}},{"column":"GetPostgresFunctions:max_timestamp","csharp_type":{"type":"DateTime","notNull":true}},{"column":"GetPostgresSpecialTypesCnt:c_json","csharp_type":{"type":"JsonElement","notNull":false}},{"column":"GetPostgresSpecialTypesCnt:c_jsonb","csharp_type":{"type":"JsonElement","notNull":false}},{"column":"*:c_json_string_override","csharp_type":{"type":"string","notNull":false}},{"column":"*:c_xml_string_override","csharp_type":{"type":"string","notNull":false}},{"column":"*:c_macaddr8","csharp_type":{"type":"string","notNull":false}}],"debugRequest":false}
\ No newline at end of file
diff --git a/examples/NpgsqlExample/request.json b/examples/NpgsqlExample/request.json
index 4eef92eb..ab616394 100644
--- a/examples/NpgsqlExample/request.json
+++ b/examples/NpgsqlExample/request.json
@@ -601,6 +601,7 @@
                   "name": "postgres_special_types"
                 },
                 "type": {
+                  "schema": "pg_catalog",
                   "name": "json"
                 }
               },
@@ -611,6 +612,7 @@
                   "name": "postgres_special_types"
                 },
                 "type": {
+                  "schema": "pg_catalog",
                   "name": "json"
                 }
               },
@@ -35047,7 +35049,7 @@
               "name": "postgres_special_types"
             },
             "type": {
-              "name": "json"
+              "name": "pg_catalog.json"
             },
             "originalName": "c_json"
           }
@@ -35058,6 +35060,7 @@
             "name": "c_json_string_override",
             "length": -1,
             "type": {
+              "schema": "pg_catalog",
               "name": "json"
             }
           }
@@ -35155,6 +35158,7 @@
             "name": "postgres_special_types"
           },
           "type": {
+            "schema": "pg_catalog",
             "name": "json"
           },
           "originalName": "c_json"
@@ -35166,6 +35170,7 @@
             "name": "postgres_special_types"
           },
           "type": {
+            "schema": "pg_catalog",
             "name": "json"
           },
           "originalName": "c_json_string_override"
@@ -35275,7 +35280,7 @@
               "name": "postgres_special_types"
             },
             "type": {
-              "name": "json"
+              "name": "pg_catalog.json"
             },
             "originalName": "c_json"
           }
@@ -35322,6 +35327,7 @@
           "notNull": true,
           "length": -1,
           "type": {
+            "schema": "pg_catalog",
             "name": "json"
           }
         },
@@ -36121,6 +36127,6 @@
       "filename": "query.sql"
     }
   ],
-  "sqlc_version": "v1.27.0",
+  "sqlc_version": "v1.30.0",
   "plugin_options": "eyJvdmVycmlkZURyaXZlclZlcnNpb24iOiIiLCJnZW5lcmF0ZUNzcHJvaiI6dHJ1ZSwidGFyZ2V0RnJhbWV3b3JrIjoibmV0OC4wIiwibmFtZXNwYWNlTmFtZSI6Ik5wZ3NxbEV4YW1wbGVHZW4iLCJ1c2VEYXBwZXIiOmZhbHNlLCJvdmVycmlkZURhcHBlclZlcnNpb24iOiIiLCJvdmVycmlkZXMiOlt7ImNvbHVtbiI6IkdldFBvc3RncmVzRnVuY3Rpb25zOm1heF9pbnRlZ2VyIiwiY3NoYXJwX3R5cGUiOnsidHlwZSI6ImludCIsIm5vdE51bGwiOmZhbHNlfX0seyJjb2x1bW4iOiJHZXRQb3N0Z3Jlc0Z1bmN0aW9uczptYXhfdmFyY2hhciIsImNzaGFycF90eXBlIjp7InR5cGUiOiJzdHJpbmciLCJub3ROdWxsIjpmYWxzZX19LHsiY29sdW1uIjoiR2V0UG9zdGdyZXNGdW5jdGlvbnM6bWF4X3RpbWVzdGFtcCIsImNzaGFycF90eXBlIjp7InR5cGUiOiJEYXRlVGltZSIsIm5vdE51bGwiOnRydWV9fSx7ImNvbHVtbiI6IkdldFBvc3RncmVzU3BlY2lhbFR5cGVzQ250OmNfanNvbiIsImNzaGFycF90eXBlIjp7InR5cGUiOiJKc29uRWxlbWVudCIsIm5vdE51bGwiOmZhbHNlfX0seyJjb2x1bW4iOiJHZXRQb3N0Z3Jlc1NwZWNpYWxUeXBlc0NudDpjX2pzb25iIiwiY3NoYXJwX3R5cGUiOnsidHlwZSI6Ikpzb25FbGVtZW50Iiwibm90TnVsbCI6ZmFsc2V9fSx7ImNvbHVtbiI6Iio6Y19qc29uX3N0cmluZ19vdmVycmlkZSIsImNzaGFycF90eXBlIjp7InR5cGUiOiJzdHJpbmciLCJub3ROdWxsIjpmYWxzZX19LHsiY29sdW1uIjoiKjpjX3htbF9zdHJpbmdfb3ZlcnJpZGUiLCJjc2hhcnBfdHlwZSI6eyJ0eXBlIjoic3RyaW5nIiwibm90TnVsbCI6ZmFsc2V9fSx7ImNvbHVtbiI6Iio6Y19tYWNhZGRyOCIsImNzaGFycF90eXBlIjp7InR5cGUiOiJzdHJpbmciLCJub3ROdWxsIjpmYWxzZX19XSwiZGVidWdSZXF1ZXN0IjpmYWxzZX0="
 }
\ No newline at end of file
diff --git a/examples/NpgsqlExample/request.message b/examples/NpgsqlExample/request.message
index b33d2047..b4c6e3a8 100644
--- a/examples/NpgsqlExample/request.message
+++ b/examples/NpgsqlExample/request.message
@@ -3,7 +3,7 @@
 
2
 postgresql-examples/config/postgresql/authors/schema.sql+examples/config/postgresql/types/schema.sql",examples/config/postgresql/authors/query.sql"*examples/config/postgresql/types/query.sqlbš
 examples/NpgsqlExamplecsharpс{"debugRequest":true,"generateCsproj":true,"namespaceName":"NpgsqlExampleGen","overrides":[{"column":"GetPostgresFunctions:max_integer","csharp_type":{"notNull":false,"type":"int"}},{"column":"GetPostgresFunctions:max_varchar","csharp_type":{"notNull":false,"type":"string"}},{"column":"GetPostgresFunctions:max_timestamp","csharp_type":{"notNull":true,"type":"DateTime"}},{"column":"GetPostgresSpecialTypesCnt:c_json","csharp_type":{"notNull":false,"type":"JsonElement"}},{"column":"GetPostgresSpecialTypesCnt:c_jsonb","csharp_type":{"notNull":false,"type":"JsonElement"}},{"column":"*:c_json_string_override","csharp_type":{"notNull":false,"type":"string"}},{"column":"*:c_xml_string_override","csharp_type":{"notNull":false,"type":"string"}},{"column":"*:c_macaddr8","csharp_type":{"notNull":false,"type":"string"}}],"targetFramework":"net8.0","useDapper":false}*
-./dist/LocalRunnerУьpublic"…publicƒ

+./dist/LocalRunnerльpublic"publicƒ

 	authors)
 id
0џџџџџџџџџ
R	authorsb	bigserial&
 name
0џџџџџџџџџ
R	authorsbtext#
@@ -81,12 +81,14 @@ pg_catalog	timestamp
 c_box0џџџџџџџџџ
Rpostgres_geometric_typesbbox7
 c_path0џџџџџџџџџ
Rpostgres_geometric_typesbpath=
 	c_polygon0џџџџџџџџџ
Rpostgres_geometric_typesb	polygon;
-c_circle0џџџџџџџџџ
Rpostgres_geometric_typesbcircleњ
+c_circle0џџџџџџџџџ
Rpostgres_geometric_typesbcircle’
 postgres_special_types5
 c_uuid0џџџџџџџџџ
Rpostgres_special_typesbuuid7
-c_enum0џџџџџџџџџ
Rpostgres_special_typesbc_enum5
-c_json0џџџџџџџџџ
Rpostgres_special_typesbjsonE
-c_json_string_override0џџџџџџџџџ
Rpostgres_special_typesbjson7
+c_enum0џџџџџџџџџ
Rpostgres_special_typesbc_enumA
+c_json0џџџџџџџџџ
Rpostgres_special_typesb
+pg_catalogjsonQ
+c_json_string_override0џџџџџџџџџ
Rpostgres_special_typesb
+pg_catalogjson7
 c_jsonb0џџџџџџџџџ
Rpostgres_special_typesbjsonb=
 
 c_jsonpath0џџџџџџџџџ
Rpostgres_special_typesb
@@ -10670,7 +10672,7 @@ LIMIT 1GetPostgresNetworkTypesCnt:one"=
 ) VALUES ($1, $2, $3)InsertPostgresNetworkTypesBatch	:copyfrom*I
E
 c_cidr0џџџџџџџџџ
R publicpostgres_network_typesbcidrzc_cidr*IE
 c_inet0џџџџџџџџџ
R publicpostgres_network_typesbinetzc_inet*RN
-	c_macaddr0џџџџџџџџџ
R publicpostgres_network_typesb	macaddrz	c_macaddr:	query.sqlBpostgres_network_typesЈ
+	c_macaddr0џџџџџџџџџ
R publicpostgres_network_typesb	macaddrz	c_macaddr:	query.sqlBpostgres_network_typesП
 —
 INSERT INTO postgres_special_types
 (
@@ -10692,9 +10694,10 @@ VALUES (
     $6::xml,
     $7,
     $8::c_enum
-)InsertPostgresSpecialTypes:exec*K
G
-c_json0џџџџџџџџџ
8
R publicpostgres_special_typesbjsonzc_json*/+
-c_json_string_override0џџџџџџџџџ
bjson*NJ
+)InsertPostgresSpecialTypes:exec*V
R
+c_json0џџџџџџџџџ
8
R publicpostgres_special_typesbpg_catalog.jsonzc_json*;7
+c_json_string_override0џџџџџџџџџ
b
+pg_catalogjson*NJ
 c_jsonb0џџџџџџџџџ
8
R publicpostgres_special_typesbjsonbzc_jsonb*'#
 
 c_jsonpath0џџџџџџџџџ
b
@@ -10702,7 +10705,7 @@ c_jsonpath0
 c_xml0џџџџџџџџџ
bxml*-)
 c_xml_string_override0џџџџџџџџџ
bxml*KG
 c_uuid0џџџџџџџџџ
8
R publicpostgres_special_typesbuuidzc_uuid*!
-c_enum0џџџџџџџџџ
bc_enum2 Special types :	query.sqlBpostgres_special_types
+c_enum0џџџџџџџџџ
bc_enum2 Special types :	query.sqlBpostgres_special_typesЕ
 ­
SELECT
     c_json,
     c_json_string_override,
@@ -10713,9 +10716,11 @@ c_jsonpath0
     c_uuid,
     c_enum
 FROM postgres_special_types 
-LIMIT 1GetPostgresSpecialTypes:one"=
-c_json0џџџџџџџџџ
Rpostgres_special_typesbjsonzc_json"]
-c_json_string_override0џџџџџџџџџ
Rpostgres_special_typesbjsonzc_json_string_override"@
+LIMIT 1GetPostgresSpecialTypes:one"I
+c_json0џџџџџџџџџ
Rpostgres_special_typesb
+pg_catalogjsonzc_json"i
+c_json_string_override0џџџџџџџџџ
Rpostgres_special_typesb
+pg_catalogjsonzc_json_string_override"@
 c_jsonb0џџџџџџџџџ
Rpostgres_special_typesbjsonbzc_jsonb"I
 
 c_jsonpath0џџџџџџџџџ
Rpostgres_special_typesb
@@ -10725,7 +10730,7 @@ c_jsonpath":
 c_xml_string_override0џџџџџџџџџ
Rpostgres_special_typesbxmlzc_xml_string_override"=
 c_uuid0џџџџџџџџџ
Rpostgres_special_typesbuuidzc_uuid"?
 c_enum0џџџџџџџџџ
Rpostgres_special_typesbc_enumzc_enum:	query.sqlW
-%TRUNCATE TABLE postgres_special_typesTruncatePostgresSpecialTypes:exec:	query.sqlЃ
+%TRUNCATE TABLE postgres_special_typesTruncatePostgresSpecialTypes:exec:	query.sqlЎ
 lINSERT INTO postgres_special_types
 (
     c_uuid,
@@ -10737,9 +10742,9 @@ VALUES (
     $2,
     $3
 )InsertPostgresSpecialTypesBatch	:copyfrom*I
E
-c_uuid0џџџџџџџџџ
R publicpostgres_special_typesbuuidzc_uuid*IE
-c_json0џџџџџџџџџ
R publicpostgres_special_typesbjsonzc_json*LH
-c_jsonb0џџџџџџџџџ
R publicpostgres_special_typesbjsonbzc_jsonb:	query.sqlBpostgres_special_typesл
+c_uuid0џџџџџџџџџ
R publicpostgres_special_typesbuuidzc_uuid*TP
+c_json0џџџџџџџџџ
R publicpostgres_special_typesbpg_catalog.jsonzc_json*LH
+c_jsonb0џџџџџџџџџ
R publicpostgres_special_typesbjsonbzc_jsonb:	query.sqlBpostgres_special_typesч
 їWITH grouped_json_types AS (
     SELECT
         c_uuid,
@@ -10760,8 +10765,9 @@ SELECT
     cnt
 FROM grouped_json_types
 LIMIT 1GetPostgresSpecialTypesCnt:one"9
-c_uuid0џџџџџџџџџ
Rgrouped_json_typesbuuidzc_uuid"
-c_json
0џџџџџџџџџ
bjson"
+c_uuid0џџџџџџџџџ
Rgrouped_json_typesbuuidzc_uuid")
+c_json
0џџџџџџџџџ
b
+pg_catalogjson"
 c_jsonb
0џџџџџџџџџ
bjsonb"7
 cnt
0џџџџџџџџџ
Rgrouped_json_typesbbigintzcnt:	query.sqlн
 Я

@@ -10889,4 +10895,4 @@ hSELECT c_point, c_line, c_lseg, c_box, c_path, c_polygon, c_circle FROM postgre
 c_path0џџџџџџџџџ
Rpostgres_geometric_typesbpathzc_path"H
 	c_polygon0џџџџџџџџџ
Rpostgres_geometric_typesb	polygonz	c_polygon"E
 c_circle0џџџџџџџџџ
Rpostgres_geometric_typesbcirclezc_circle:	query.sqlU
-'TRUNCATE TABLE postgres_geometric_typesTruncatePostgresGeoTypes:exec:	query.sql"v1.27.0*˜{"overrideDriverVersion":"","generateCsproj":true,"targetFramework":"net8.0","namespaceName":"NpgsqlExampleGen","useDapper":false,"overrideDapperVersion":"","overrides":[{"column":"GetPostgresFunctions:max_integer","csharp_type":{"type":"int","notNull":false}},{"column":"GetPostgresFunctions:max_varchar","csharp_type":{"type":"string","notNull":false}},{"column":"GetPostgresFunctions:max_timestamp","csharp_type":{"type":"DateTime","notNull":true}},{"column":"GetPostgresSpecialTypesCnt:c_json","csharp_type":{"type":"JsonElement","notNull":false}},{"column":"GetPostgresSpecialTypesCnt:c_jsonb","csharp_type":{"type":"JsonElement","notNull":false}},{"column":"*:c_json_string_override","csharp_type":{"type":"string","notNull":false}},{"column":"*:c_xml_string_override","csharp_type":{"type":"string","notNull":false}},{"column":"*:c_macaddr8","csharp_type":{"type":"string","notNull":false}}],"debugRequest":false}
\ No newline at end of file
+'TRUNCATE TABLE postgres_geometric_typesTruncatePostgresGeoTypes:exec:	query.sql"v1.30.0*˜{"overrideDriverVersion":"","generateCsproj":true,"targetFramework":"net8.0","namespaceName":"NpgsqlExampleGen","useDapper":false,"overrideDapperVersion":"","overrides":[{"column":"GetPostgresFunctions:max_integer","csharp_type":{"type":"int","notNull":false}},{"column":"GetPostgresFunctions:max_varchar","csharp_type":{"type":"string","notNull":false}},{"column":"GetPostgresFunctions:max_timestamp","csharp_type":{"type":"DateTime","notNull":true}},{"column":"GetPostgresSpecialTypesCnt:c_json","csharp_type":{"type":"JsonElement","notNull":false}},{"column":"GetPostgresSpecialTypesCnt:c_jsonb","csharp_type":{"type":"JsonElement","notNull":false}},{"column":"*:c_json_string_override","csharp_type":{"type":"string","notNull":false}},{"column":"*:c_xml_string_override","csharp_type":{"type":"string","notNull":false}},{"column":"*:c_macaddr8","csharp_type":{"type":"string","notNull":false}}],"debugRequest":false}
\ No newline at end of file
diff --git a/examples/NpgsqlLegacyExample/request.json b/examples/NpgsqlLegacyExample/request.json
index 4a4c93e1..8a47b829 100644
--- a/examples/NpgsqlLegacyExample/request.json
+++ b/examples/NpgsqlLegacyExample/request.json
@@ -601,6 +601,7 @@
                   "name": "postgres_special_types"
                 },
                 "type": {
+                  "schema": "pg_catalog",
                   "name": "json"
                 }
               },
@@ -611,6 +612,7 @@
                   "name": "postgres_special_types"
                 },
                 "type": {
+                  "schema": "pg_catalog",
                   "name": "json"
                 }
               },
@@ -35047,7 +35049,7 @@
               "name": "postgres_special_types"
             },
             "type": {
-              "name": "json"
+              "name": "pg_catalog.json"
             },
             "originalName": "c_json"
           }
@@ -35058,6 +35060,7 @@
             "name": "c_json_string_override",
             "length": -1,
             "type": {
+              "schema": "pg_catalog",
               "name": "json"
             }
           }
@@ -35155,6 +35158,7 @@
             "name": "postgres_special_types"
           },
           "type": {
+            "schema": "pg_catalog",
             "name": "json"
           },
           "originalName": "c_json"
@@ -35166,6 +35170,7 @@
             "name": "postgres_special_types"
           },
           "type": {
+            "schema": "pg_catalog",
             "name": "json"
           },
           "originalName": "c_json_string_override"
@@ -35275,7 +35280,7 @@
               "name": "postgres_special_types"
             },
             "type": {
-              "name": "json"
+              "name": "pg_catalog.json"
             },
             "originalName": "c_json"
           }
@@ -35322,6 +35327,7 @@
           "notNull": true,
           "length": -1,
           "type": {
+            "schema": "pg_catalog",
             "name": "json"
           }
         },
@@ -36121,6 +36127,6 @@
       "filename": "query.sql"
     }
   ],
-  "sqlc_version": "v1.27.0",
+  "sqlc_version": "v1.30.0",
   "plugin_options": "eyJvdmVycmlkZURyaXZlclZlcnNpb24iOiIiLCJnZW5lcmF0ZUNzcHJvaiI6dHJ1ZSwidGFyZ2V0RnJhbWV3b3JrIjoibmV0c3RhbmRhcmQyLjAiLCJuYW1lc3BhY2VOYW1lIjoiTnBnc3FsTGVnYWN5RXhhbXBsZUdlbiIsInVzZURhcHBlciI6ZmFsc2UsIm92ZXJyaWRlRGFwcGVyVmVyc2lvbiI6IiIsIm92ZXJyaWRlcyI6W3siY29sdW1uIjoiR2V0UG9zdGdyZXNGdW5jdGlvbnM6bWF4X2ludGVnZXIiLCJjc2hhcnBfdHlwZSI6eyJ0eXBlIjoiaW50Iiwibm90TnVsbCI6ZmFsc2V9fSx7ImNvbHVtbiI6IkdldFBvc3RncmVzRnVuY3Rpb25zOm1heF92YXJjaGFyIiwiY3NoYXJwX3R5cGUiOnsidHlwZSI6InN0cmluZyIsIm5vdE51bGwiOmZhbHNlfX0seyJjb2x1bW4iOiJHZXRQb3N0Z3Jlc0Z1bmN0aW9uczptYXhfdGltZXN0YW1wIiwiY3NoYXJwX3R5cGUiOnsidHlwZSI6IkRhdGVUaW1lIiwibm90TnVsbCI6dHJ1ZX19LHsiY29sdW1uIjoiR2V0UG9zdGdyZXNTcGVjaWFsVHlwZXNDbnQ6Y19qc29uIiwiY3NoYXJwX3R5cGUiOnsidHlwZSI6Ikpzb25FbGVtZW50Iiwibm90TnVsbCI6ZmFsc2V9fSx7ImNvbHVtbiI6IkdldFBvc3RncmVzU3BlY2lhbFR5cGVzQ250OmNfanNvbmIiLCJjc2hhcnBfdHlwZSI6eyJ0eXBlIjoiSnNvbkVsZW1lbnQiLCJub3ROdWxsIjpmYWxzZX19LHsiY29sdW1uIjoiKjpjX2pzb25fc3RyaW5nX292ZXJyaWRlIiwiY3NoYXJwX3R5cGUiOnsidHlwZSI6InN0cmluZyIsIm5vdE51bGwiOmZhbHNlfX0seyJjb2x1bW4iOiIqOmNfeG1sX3N0cmluZ19vdmVycmlkZSIsImNzaGFycF90eXBlIjp7InR5cGUiOiJzdHJpbmciLCJub3ROdWxsIjpmYWxzZX19LHsiY29sdW1uIjoiKjpjX21hY2FkZHI4IiwiY3NoYXJwX3R5cGUiOnsidHlwZSI6InN0cmluZyIsIm5vdE51bGwiOmZhbHNlfX1dLCJkZWJ1Z1JlcXVlc3QiOmZhbHNlfQ=="
 }
\ No newline at end of file
diff --git a/examples/NpgsqlLegacyExample/request.message b/examples/NpgsqlLegacyExample/request.message
index 08313b85..5aeaa545 100644
--- a/examples/NpgsqlLegacyExample/request.message
+++ b/examples/NpgsqlLegacyExample/request.message
@@ -3,7 +3,7 @@
 
2
 postgresql-examples/config/postgresql/authors/schema.sql+examples/config/postgresql/types/schema.sql",examples/config/postgresql/authors/query.sql"*examples/config/postgresql/types/query.sqlbЎ
 examples/NpgsqlLegacyExamplecsharpя{"debugRequest":true,"generateCsproj":true,"namespaceName":"NpgsqlLegacyExampleGen","overrides":[{"column":"GetPostgresFunctions:max_integer","csharp_type":{"notNull":false,"type":"int"}},{"column":"GetPostgresFunctions:max_varchar","csharp_type":{"notNull":false,"type":"string"}},{"column":"GetPostgresFunctions:max_timestamp","csharp_type":{"notNull":true,"type":"DateTime"}},{"column":"GetPostgresSpecialTypesCnt:c_json","csharp_type":{"notNull":false,"type":"JsonElement"}},{"column":"GetPostgresSpecialTypesCnt:c_jsonb","csharp_type":{"notNull":false,"type":"JsonElement"}},{"column":"*:c_json_string_override","csharp_type":{"notNull":false,"type":"string"}},{"column":"*:c_xml_string_override","csharp_type":{"notNull":false,"type":"string"}},{"column":"*:c_macaddr8","csharp_type":{"notNull":false,"type":"string"}}],"targetFramework":"netstandard2.0","useDapper":false}*
-./dist/LocalRunnerУьpublic"…publicƒ

+./dist/LocalRunnerльpublic"publicƒ

 	authors)
 id
0џџџџџџџџџ
R	authorsb	bigserial&
 name
0џџџџџџџџџ
R	authorsbtext#
@@ -81,12 +81,14 @@ pg_catalog	timestamp
 c_box0џџџџџџџџџ
Rpostgres_geometric_typesbbox7
 c_path0џџџџџџџџџ
Rpostgres_geometric_typesbpath=
 	c_polygon0џџџџџџџџџ
Rpostgres_geometric_typesb	polygon;
-c_circle0џџџџџџџџџ
Rpostgres_geometric_typesbcircleњ
+c_circle0џџџџџџџџџ
Rpostgres_geometric_typesbcircle’
 postgres_special_types5
 c_uuid0џџџџџџџџџ
Rpostgres_special_typesbuuid7
-c_enum0џџџџџџџџџ
Rpostgres_special_typesbc_enum5
-c_json0џџџџџџџџџ
Rpostgres_special_typesbjsonE
-c_json_string_override0џџџџџџџџџ
Rpostgres_special_typesbjson7
+c_enum0џџџџџџџџџ
Rpostgres_special_typesbc_enumA
+c_json0џџџџџџџџџ
Rpostgres_special_typesb
+pg_catalogjsonQ
+c_json_string_override0џџџџџџџџџ
Rpostgres_special_typesb
+pg_catalogjson7
 c_jsonb0џџџџџџџџџ
Rpostgres_special_typesbjsonb=
 
 c_jsonpath0џџџџџџџџџ
Rpostgres_special_typesb
@@ -10670,7 +10672,7 @@ LIMIT 1GetPostgresNetworkTypesCnt:one"=
 ) VALUES ($1, $2, $3)InsertPostgresNetworkTypesBatch	:copyfrom*I
E
 c_cidr0џџџџџџџџџ
R publicpostgres_network_typesbcidrzc_cidr*IE
 c_inet0џџџџџџџџџ
R publicpostgres_network_typesbinetzc_inet*RN
-	c_macaddr0џџџџџџџџџ
R publicpostgres_network_typesb	macaddrz	c_macaddr:	query.sqlBpostgres_network_typesЈ
+	c_macaddr0џџџџџџџџџ
R publicpostgres_network_typesb	macaddrz	c_macaddr:	query.sqlBpostgres_network_typesП
 —
 INSERT INTO postgres_special_types
 (
@@ -10692,9 +10694,10 @@ VALUES (
     $6::xml,
     $7,
     $8::c_enum
-)InsertPostgresSpecialTypes:exec*K
G
-c_json0џџџџџџџџџ
8
R publicpostgres_special_typesbjsonzc_json*/+
-c_json_string_override0џџџџџџџџџ
bjson*NJ
+)InsertPostgresSpecialTypes:exec*V
R
+c_json0џџџџџџџџџ
8
R publicpostgres_special_typesbpg_catalog.jsonzc_json*;7
+c_json_string_override0џџџџџџџџџ
b
+pg_catalogjson*NJ
 c_jsonb0џџџџџџџџџ
8
R publicpostgres_special_typesbjsonbzc_jsonb*'#
 
 c_jsonpath0џџџџџџџџџ
b
@@ -10702,7 +10705,7 @@ c_jsonpath0
 c_xml0џџџџџџџџџ
bxml*-)
 c_xml_string_override0џџџџџџџџџ
bxml*KG
 c_uuid0џџџџџџџџџ
8
R publicpostgres_special_typesbuuidzc_uuid*!
-c_enum0џџџџџџџџџ
bc_enum2 Special types :	query.sqlBpostgres_special_types
+c_enum0џџџџџџџџџ
bc_enum2 Special types :	query.sqlBpostgres_special_typesЕ
 ­
SELECT
     c_json,
     c_json_string_override,
@@ -10713,9 +10716,11 @@ c_jsonpath0
     c_uuid,
     c_enum
 FROM postgres_special_types 
-LIMIT 1GetPostgresSpecialTypes:one"=
-c_json0џџџџџџџџџ
Rpostgres_special_typesbjsonzc_json"]
-c_json_string_override0џџџџџџџџџ
Rpostgres_special_typesbjsonzc_json_string_override"@
+LIMIT 1GetPostgresSpecialTypes:one"I
+c_json0џџџџџџџџџ
Rpostgres_special_typesb
+pg_catalogjsonzc_json"i
+c_json_string_override0џџџџџџџџџ
Rpostgres_special_typesb
+pg_catalogjsonzc_json_string_override"@
 c_jsonb0џџџџџџџџџ
Rpostgres_special_typesbjsonbzc_jsonb"I
 
 c_jsonpath0џџџџџџџџџ
Rpostgres_special_typesb
@@ -10725,7 +10730,7 @@ c_jsonpath":
 c_xml_string_override0џџџџџџџџџ
Rpostgres_special_typesbxmlzc_xml_string_override"=
 c_uuid0џџџџџџџџџ
Rpostgres_special_typesbuuidzc_uuid"?
 c_enum0џџџџџџџџџ
Rpostgres_special_typesbc_enumzc_enum:	query.sqlW
-%TRUNCATE TABLE postgres_special_typesTruncatePostgresSpecialTypes:exec:	query.sqlЃ
+%TRUNCATE TABLE postgres_special_typesTruncatePostgresSpecialTypes:exec:	query.sqlЎ
 lINSERT INTO postgres_special_types
 (
     c_uuid,
@@ -10737,9 +10742,9 @@ VALUES (
     $2,
     $3
 )InsertPostgresSpecialTypesBatch	:copyfrom*I
E
-c_uuid0џџџџџџџџџ
R publicpostgres_special_typesbuuidzc_uuid*IE
-c_json0џџџџџџџџџ
R publicpostgres_special_typesbjsonzc_json*LH
-c_jsonb0џџџџџџџџџ
R publicpostgres_special_typesbjsonbzc_jsonb:	query.sqlBpostgres_special_typesл
+c_uuid0џџџџџџџџџ
R publicpostgres_special_typesbuuidzc_uuid*TP
+c_json0џџџџџџџџџ
R publicpostgres_special_typesbpg_catalog.jsonzc_json*LH
+c_jsonb0џџџџџџџџџ
R publicpostgres_special_typesbjsonbzc_jsonb:	query.sqlBpostgres_special_typesч
 їWITH grouped_json_types AS (
     SELECT
         c_uuid,
@@ -10760,8 +10765,9 @@ SELECT
     cnt
 FROM grouped_json_types
 LIMIT 1GetPostgresSpecialTypesCnt:one"9
-c_uuid0џџџџџџџџџ
Rgrouped_json_typesbuuidzc_uuid"
-c_json
0џџџџџџџџџ
bjson"
+c_uuid0џџџџџџџџџ
Rgrouped_json_typesbuuidzc_uuid")
+c_json
0џџџџџџџџџ
b
+pg_catalogjson"
 c_jsonb
0џџџџџџџџџ
bjsonb"7
 cnt
0џџџџџџџџџ
Rgrouped_json_typesbbigintzcnt:	query.sqlн
 Я

@@ -10889,4 +10895,4 @@ hSELECT c_point, c_line, c_lseg, c_box, c_path, c_polygon, c_circle FROM postgre
 c_path0џџџџџџџџџ
Rpostgres_geometric_typesbpathzc_path"H
 	c_polygon0џџџџџџџџџ
Rpostgres_geometric_typesb	polygonz	c_polygon"E
 c_circle0џџџџџџџџџ
Rpostgres_geometric_typesbcirclezc_circle:	query.sqlU
-'TRUNCATE TABLE postgres_geometric_typesTruncatePostgresGeoTypes:exec:	query.sql"v1.27.0*І{"overrideDriverVersion":"","generateCsproj":true,"targetFramework":"netstandard2.0","namespaceName":"NpgsqlLegacyExampleGen","useDapper":false,"overrideDapperVersion":"","overrides":[{"column":"GetPostgresFunctions:max_integer","csharp_type":{"type":"int","notNull":false}},{"column":"GetPostgresFunctions:max_varchar","csharp_type":{"type":"string","notNull":false}},{"column":"GetPostgresFunctions:max_timestamp","csharp_type":{"type":"DateTime","notNull":true}},{"column":"GetPostgresSpecialTypesCnt:c_json","csharp_type":{"type":"JsonElement","notNull":false}},{"column":"GetPostgresSpecialTypesCnt:c_jsonb","csharp_type":{"type":"JsonElement","notNull":false}},{"column":"*:c_json_string_override","csharp_type":{"type":"string","notNull":false}},{"column":"*:c_xml_string_override","csharp_type":{"type":"string","notNull":false}},{"column":"*:c_macaddr8","csharp_type":{"type":"string","notNull":false}}],"debugRequest":false}
\ No newline at end of file
+'TRUNCATE TABLE postgres_geometric_typesTruncatePostgresGeoTypes:exec:	query.sql"v1.30.0*І{"overrideDriverVersion":"","generateCsproj":true,"targetFramework":"netstandard2.0","namespaceName":"NpgsqlLegacyExampleGen","useDapper":false,"overrideDapperVersion":"","overrides":[{"column":"GetPostgresFunctions:max_integer","csharp_type":{"type":"int","notNull":false}},{"column":"GetPostgresFunctions:max_varchar","csharp_type":{"type":"string","notNull":false}},{"column":"GetPostgresFunctions:max_timestamp","csharp_type":{"type":"DateTime","notNull":true}},{"column":"GetPostgresSpecialTypesCnt:c_json","csharp_type":{"type":"JsonElement","notNull":false}},{"column":"GetPostgresSpecialTypesCnt:c_jsonb","csharp_type":{"type":"JsonElement","notNull":false}},{"column":"*:c_json_string_override","csharp_type":{"type":"string","notNull":false}},{"column":"*:c_xml_string_override","csharp_type":{"type":"string","notNull":false}},{"column":"*:c_macaddr8","csharp_type":{"type":"string","notNull":false}}],"debugRequest":false}
\ No newline at end of file
diff --git a/examples/SqliteDapperExample/request.json b/examples/SqliteDapperExample/request.json
index 26e13959..00fc2790 100644
--- a/examples/SqliteDapperExample/request.json
+++ b/examples/SqliteDapperExample/request.json
@@ -1246,6 +1246,6 @@
       "filename": "query.sql"
     }
   ],
-  "sqlc_version": "v1.27.0",
+  "sqlc_version": "v1.30.0",
   "plugin_options": "eyJvdmVycmlkZURyaXZlclZlcnNpb24iOiIiLCJnZW5lcmF0ZUNzcHJvaiI6dHJ1ZSwidGFyZ2V0RnJhbWV3b3JrIjoibmV0OC4wIiwibmFtZXNwYWNlTmFtZSI6IlNxbGl0ZURhcHBlckV4YW1wbGVHZW4iLCJ1c2VEYXBwZXIiOnRydWUsIm92ZXJyaWRlRGFwcGVyVmVyc2lvbiI6IiIsIm92ZXJyaWRlcyI6W3siY29sdW1uIjoiR2V0U3FsaXRlRnVuY3Rpb25zOm1heF9pbnRlZ2VyIiwiY3NoYXJwX3R5cGUiOnsidHlwZSI6ImludCIsIm5vdE51bGwiOmZhbHNlfX0seyJjb2x1bW4iOiJHZXRTcWxpdGVGdW5jdGlvbnM6bWF4X3ZhcmNoYXIiLCJjc2hhcnBfdHlwZSI6eyJ0eXBlIjoic3RyaW5nIiwibm90TnVsbCI6ZmFsc2V9fSx7ImNvbHVtbiI6IkdldFNxbGl0ZUZ1bmN0aW9uczptYXhfcmVhbCIsImNzaGFycF90eXBlIjp7InR5cGUiOiJkZWNpbWFsIiwibm90TnVsbCI6dHJ1ZX19XSwiZGVidWdSZXF1ZXN0IjpmYWxzZX0="
 }
\ No newline at end of file
diff --git a/examples/SqliteDapperExample/request.message b/examples/SqliteDapperExample/request.message
index 199d63ac..d14c5beb 100644
Binary files a/examples/SqliteDapperExample/request.message and b/examples/SqliteDapperExample/request.message differ
diff --git a/examples/SqliteDapperLegacyExample/request.json b/examples/SqliteDapperLegacyExample/request.json
index 249c7805..a005622b 100644
--- a/examples/SqliteDapperLegacyExample/request.json
+++ b/examples/SqliteDapperLegacyExample/request.json
@@ -1246,6 +1246,6 @@
       "filename": "query.sql"
     }
   ],
-  "sqlc_version": "v1.27.0",
+  "sqlc_version": "v1.30.0",
   "plugin_options": "eyJvdmVycmlkZURyaXZlclZlcnNpb24iOiIiLCJnZW5lcmF0ZUNzcHJvaiI6dHJ1ZSwidGFyZ2V0RnJhbWV3b3JrIjoibmV0c3RhbmRhcmQyLjAiLCJuYW1lc3BhY2VOYW1lIjoiU3FsaXRlRGFwcGVyTGVnYWN5RXhhbXBsZUdlbiIsInVzZURhcHBlciI6dHJ1ZSwib3ZlcnJpZGVEYXBwZXJWZXJzaW9uIjoiIiwib3ZlcnJpZGVzIjpbeyJjb2x1bW4iOiJHZXRTcWxpdGVGdW5jdGlvbnM6bWF4X2ludGVnZXIiLCJjc2hhcnBfdHlwZSI6eyJ0eXBlIjoiaW50Iiwibm90TnVsbCI6ZmFsc2V9fSx7ImNvbHVtbiI6IkdldFNxbGl0ZUZ1bmN0aW9uczptYXhfdmFyY2hhciIsImNzaGFycF90eXBlIjp7InR5cGUiOiJzdHJpbmciLCJub3ROdWxsIjpmYWxzZX19LHsiY29sdW1uIjoiR2V0U3FsaXRlRnVuY3Rpb25zOm1heF9yZWFsIiwiY3NoYXJwX3R5cGUiOnsidHlwZSI6ImRlY2ltYWwiLCJub3ROdWxsIjp0cnVlfX1dLCJkZWJ1Z1JlcXVlc3QiOmZhbHNlfQ=="
 }
\ No newline at end of file
diff --git a/examples/SqliteDapperLegacyExample/request.message b/examples/SqliteDapperLegacyExample/request.message
index 1cbcf38d..6b790025 100644
Binary files a/examples/SqliteDapperLegacyExample/request.message and b/examples/SqliteDapperLegacyExample/request.message differ
diff --git a/examples/SqliteExample/request.json b/examples/SqliteExample/request.json
index 6c5ae56a..407c978c 100644
--- a/examples/SqliteExample/request.json
+++ b/examples/SqliteExample/request.json
@@ -1246,6 +1246,6 @@
       "filename": "query.sql"
     }
   ],
-  "sqlc_version": "v1.27.0",
+  "sqlc_version": "v1.30.0",
   "plugin_options": "eyJvdmVycmlkZURyaXZlclZlcnNpb24iOiIiLCJnZW5lcmF0ZUNzcHJvaiI6dHJ1ZSwidGFyZ2V0RnJhbWV3b3JrIjoibmV0OC4wIiwibmFtZXNwYWNlTmFtZSI6IlNxbGl0ZUV4YW1wbGVHZW4iLCJ1c2VEYXBwZXIiOmZhbHNlLCJvdmVycmlkZURhcHBlclZlcnNpb24iOiIiLCJvdmVycmlkZXMiOlt7ImNvbHVtbiI6IkdldFNxbGl0ZUZ1bmN0aW9uczptYXhfaW50ZWdlciIsImNzaGFycF90eXBlIjp7InR5cGUiOiJpbnQiLCJub3ROdWxsIjpmYWxzZX19LHsiY29sdW1uIjoiR2V0U3FsaXRlRnVuY3Rpb25zOm1heF92YXJjaGFyIiwiY3NoYXJwX3R5cGUiOnsidHlwZSI6InN0cmluZyIsIm5vdE51bGwiOmZhbHNlfX0seyJjb2x1bW4iOiJHZXRTcWxpdGVGdW5jdGlvbnM6bWF4X3JlYWwiLCJjc2hhcnBfdHlwZSI6eyJ0eXBlIjoiZGVjaW1hbCIsIm5vdE51bGwiOnRydWV9fV0sImRlYnVnUmVxdWVzdCI6ZmFsc2V9"
 }
\ No newline at end of file
diff --git a/examples/SqliteExample/request.message b/examples/SqliteExample/request.message
index f923db5f..8f7fa9fb 100644
Binary files a/examples/SqliteExample/request.message and b/examples/SqliteExample/request.message differ
diff --git a/examples/SqliteLegacyExample/request.json b/examples/SqliteLegacyExample/request.json
index 0bdcc6fe..1de23ed5 100644
--- a/examples/SqliteLegacyExample/request.json
+++ b/examples/SqliteLegacyExample/request.json
@@ -1246,6 +1246,6 @@
       "filename": "query.sql"
     }
   ],
-  "sqlc_version": "v1.27.0",
+  "sqlc_version": "v1.30.0",
   "plugin_options": "eyJvdmVycmlkZURyaXZlclZlcnNpb24iOiIiLCJnZW5lcmF0ZUNzcHJvaiI6dHJ1ZSwidGFyZ2V0RnJhbWV3b3JrIjoibmV0c3RhbmRhcmQyLjAiLCJuYW1lc3BhY2VOYW1lIjoiU3FsaXRlTGVnYWN5RXhhbXBsZUdlbiIsInVzZURhcHBlciI6ZmFsc2UsIm92ZXJyaWRlRGFwcGVyVmVyc2lvbiI6IiIsIm92ZXJyaWRlcyI6W3siY29sdW1uIjoiR2V0U3FsaXRlRnVuY3Rpb25zOm1heF9pbnRlZ2VyIiwiY3NoYXJwX3R5cGUiOnsidHlwZSI6ImludCIsIm5vdE51bGwiOmZhbHNlfX0seyJjb2x1bW4iOiJHZXRTcWxpdGVGdW5jdGlvbnM6bWF4X3ZhcmNoYXIiLCJjc2hhcnBfdHlwZSI6eyJ0eXBlIjoic3RyaW5nIiwibm90TnVsbCI6ZmFsc2V9fSx7ImNvbHVtbiI6IkdldFNxbGl0ZUZ1bmN0aW9uczptYXhfcmVhbCIsImNzaGFycF90eXBlIjp7InR5cGUiOiJkZWNpbWFsIiwibm90TnVsbCI6dHJ1ZX19XSwiZGVidWdSZXF1ZXN0IjpmYWxzZX0="
 }
\ No newline at end of file
diff --git a/examples/SqliteLegacyExample/request.message b/examples/SqliteLegacyExample/request.message
index c8070b76..fdef83c1 100644
Binary files a/examples/SqliteLegacyExample/request.message and b/examples/SqliteLegacyExample/request.message differ