GOMODULES
/
pgx
mirror of https://github.com/jackc/pgx.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix bug relating to reuse of types 

When `LoadTypes` is being called, it does not include the
namespace-qualified types in its result. While these namespaces are
visible to `LoadTypes` itself, `RegisterTypes` will not recognise this
form of the types, only allowing them to be used if they are on the
schema path, and referred to without their namespace component.
pull/2077/head
Nick Farrell 2024-07-07 11:19:30 +10:00
parent 161ce73ec1
commit b770252a3b
No known key found for this signature in database
GPG Key ID: 740D3A86CF435835
3 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
derived_types.go
View File

@ -235,7 +235,9 @@ func (c *Conn) LoadTypes(ctx context.Context, typeNames []string) ([]*pgtype.Typ
if type_ != nil {
m.RegisterType(type_)
if ti.NspName != "" {
m.RegisterType(&pgtype.Type{Name: ti.NspName + "." + type_.Name, OID: type_.OID, Codec: type_.Codec})
nspType := &pgtype.Type{Name: ti.NspName + "." + type_.Name, OID: type_.OID, Codec: type_.Codec}
m.RegisterType(nspType)
result = append(result, nspType)
}
result = append(result, type_)
}

11
derived_types_test.go
View File

@ -29,9 +29,12 @@ create type dtype_test as (
types, err := conn.LoadTypes(ctx, []string{"dtype_test"})
require.NoError(t, err)
require.Len(t, types, 3)
require.Equal(t, types[0].Name, "anotheruint64")
require.Equal(t, types[1].Name, "_anotheruint64")
require.Equal(t, types[2].Name, "dtype_test")
require.Len(t, types, 6)
require.Equal(t, types[0].Name, "public.anotheruint64")
require.Equal(t, types[1].Name, "anotheruint64")
require.Equal(t, types[2].Name, "public._anotheruint64")
require.Equal(t, types[3].Name, "_anotheruint64")
require.Equal(t, types[4].Name, "public.dtype_test")
require.Equal(t, types[5].Name, "dtype_test")
})
}

11
pgtype/derived_types_test.go
View File

@ -28,10 +28,13 @@ create type dt_test as (
defer conn.Exec(ctx, "drop type dt_test")
dtypes, err := conn.LoadTypes(ctx, []string{"dt_test"})
require.Len(t, dtypes, 3)
require.Equal(t, dtypes[0].Name, "dt_uint64")
require.Equal(t, dtypes[1].Name, "_dt_uint64")
require.Equal(t, dtypes[2].Name, "dt_test")
require.Len(t, dtypes, 6)
require.Equal(t, dtypes[0].Name, "public.dt_uint64")
require.Equal(t, dtypes[1].Name, "dt_uint64")
require.Equal(t, dtypes[2].Name, "public._dt_uint64")
require.Equal(t, dtypes[3].Name, "_dt_uint64")
require.Equal(t, dtypes[4].Name, "public.dt_test")
require.Equal(t, dtypes[5].Name, "dt_test")
require.NoError(t, err)
conn.TypeMap().RegisterTypes(dtypes)