From 83d1526a45ca15d3d929f5dacd68880a70ad8dde Mon Sep 17 00:00:00 2001 From: Jan Rada <31016933+ZelvaMan@users.noreply.github.com> Date: Fri, 26 Apr 2024 13:10:58 +0200 Subject: [PATCH] fix nullability of function that retun setof --- dbGen/database.go | 2 +- dbGen/mapper.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dbGen/database.go b/dbGen/database.go index 5bfd4f9..29ce9cc 100755 --- a/dbGen/database.go +++ b/dbGen/database.go @@ -143,7 +143,7 @@ func addParamsToRoutine(conn *common.DbConn, routine *DbRoutine) error { where specific_schema = $1 and specific_name = $2 union - select c.ordinal_position::int, c.column_name::text, 'OUT', c.udt_name::text, c.column_default is not null + select c.ordinal_position::int, c.column_name::text, 'OUT', c.udt_name::text, c.is_nullable = 'YES' from information_schema.columns c where c.table_name = $3 and c.table_schema = coalesce($4, 'public') diff --git a/dbGen/mapper.go b/dbGen/mapper.go index ac5d6f3..33b604a 100755 --- a/dbGen/mapper.go +++ b/dbGen/mapper.go @@ -235,7 +235,7 @@ func getColumnMapping(param DbParameter, routineMapping *RoutineMapping, globalM } if explicitMapping.MappedType != "" { - typeMapping, err = handleTypeMappingOverride(explicitMapping.MappedType, "", config) + typeMapping, err = handleTypeMappingOverride(explicitMapping.MappedType, explicitMapping.MappingFunction, config) if err != nil { return false, nil, err }