Merge pull request #2288 from felix-roehrich/fr/fix-plan-scan

jackc · web-flow · commit 0e0a7d8344b0 · 2025-03-24T19:46:22.000-05:00
Revert change in `if` from #2236.
diff --git a/pgtype/json.go b/pgtype/json.go
@@ -197,7 +197,7 @@ type scanPlanJSONToJSONUnmarshal struct {
 }
 
 func (s *scanPlanJSONToJSONUnmarshal) Scan(src []byte, dst any) error {
-	if src == nil || string(src) == "null" {
+	if src == nil {
 		dstValue := reflect.ValueOf(dst)
 		if dstValue.Kind() == reflect.Ptr {
 			el := dstValue.Elem()
diff --git a/pgtype/json_test.go b/pgtype/json_test.go
@@ -335,8 +335,7 @@ func TestJSONCodecScanNull(t *testing.T) {
 		require.Contains(t, err.Error(), "cannot scan NULL into *struct {}")
 
 		err = conn.QueryRow(ctx, "select 'null'::jsonb").Scan(&dest)
-		require.Error(t, err)
-		require.Contains(t, err.Error(), "cannot scan NULL into *struct {}")
+		require.NoError(t, err)
 
 		var destPointer *struct{}
 		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)
 		require.NoError(t, err)
 		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)
 	})
 }
 

Original file line number	Diff line number	Diff line change
`@@ -197,7 +197,7 @@ type scanPlanJSONToJSONUnmarshal struct {`
`197`	`197`	`}`
`198`	`198`
`199`	`199`	`func (s *scanPlanJSONToJSONUnmarshal) Scan(src []byte, dst any) error {`
`200`		`- if src == nil \|\| string(src) == "null" {`
	`200`	`+ if src == nil {`
`201`	`201`	`dstValue := reflect.ValueOf(dst)`
`202`	`202`	`if dstValue.Kind() == reflect.Ptr {`
`203`	`203`	`el := dstValue.Elem()`