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

revert change in if

pull/2288/head
Felix Röhrich 2025-03-24 15:01:22 +01:00
parent 5c1fbf4806
commit 63422c7d6c
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pgtype/json.go
View File

@ -197,7 +197,7 @@ type scanPlanJSONToJSONUnmarshal struct {
} }
func (s *scanPlanJSONToJSONUnmarshal) Scan(src []byte, dst any) error { func (s *scanPlanJSONToJSONUnmarshal) Scan(src []byte, dst any) error {
if src == nil || string(src) == "null" { if src == nil {
dstValue := reflect.ValueOf(dst) dstValue := reflect.ValueOf(dst)
if dstValue.Kind() == reflect.Ptr { if dstValue.Kind() == reflect.Ptr {
el := dstValue.Elem() el := dstValue.Elem()

7
pgtype/json_test.go
View File

@ -335,8 +335,7 @@ func TestJSONCodecScanNull(t *testing.T) {
require.Contains(t, err.Error(), "cannot scan NULL into *struct {}") require.Contains(t, err.Error(), "cannot scan NULL into *struct {}")
err = conn.QueryRow(ctx, "select 'null'::jsonb").Scan(&dest) err = conn.QueryRow(ctx, "select 'null'::jsonb").Scan(&dest)
require.Error(t, err) require.NoError(t, err)
require.Contains(t, err.Error(), "cannot scan NULL into *struct {}")
var destPointer *struct{} var destPointer *struct{}
err = conn.QueryRow(ctx, "select null::jsonb").Scan(&destPointer) err = conn.QueryRow(ctx, "select null::jsonb").Scan(&destPointer)
@ -346,6 +345,10 @@ func TestJSONCodecScanNull(t *testing.T) {
err = conn.QueryRow(ctx, "select 'null'::jsonb").Scan(&destPointer) err = conn.QueryRow(ctx, "select 'null'::jsonb").Scan(&destPointer)
require.NoError(t, err) require.NoError(t, err)
require.Nil(t, destPointer) require.Nil(t, destPointer)
var raw json.RawMessage
require.NoError(t, conn.QueryRow(ctx, "select 'null'::jsonb").Scan(&raw))
require.Equal(t, json.RawMessage("null"), raw)
}) })
} }