Merge #152307

craig[bot] · rharding6373 · craig[bot] · commit 97dbae075ef7 · 2025-08-22T18:44:50.000Z
152307: changefeedccl: return error for dtimestamptz case in protobuf encoder r=andyyang890 a=rharding6373

When the protobuf encoder encounters an error when parsing the DTimestampTZ type, it does special handling if the code is being run in a benchmark, but neglects to return the error otherwise. This fixes the issue.

Bug found with AI.

Epic: none

Release note: None

Co-authored-by: rharding6373 &lt;harding@cockroachlabs.com&gt;
diff --git a/pkg/ccl/changefeedccl/encoder_protobuf.go b/pkg/ccl/changefeedccl/encoder_protobuf.go
@@ -400,6 +400,7 @@ func datumToProtoValue(
 					Value: &changefeedpb.Value_StringValue{StringValue: v.Time.Format(time.RFC3339Nano)},
 				}, nil
 			}
+			return nil, err
 		}
 		return &changefeedpb.Value{
 			Value: &changefeedpb.Value_TimestampValue{

Original file line number	Diff line number	Diff line change
`@@ -400,6 +400,7 @@ func datumToProtoValue(`
`400`	`400`	`Value: &changefeedpb.Value_StringValue{StringValue: v.Time.Format(time.RFC3339Nano)},`
`401`	`401`	`}, nil`
`402`	`402`	`}`
	`403`	`+ return nil, err`
`403`	`404`	`}`
`404`	`405`	`return &changefeedpb.Value{`
`405`	`406`	`Value: &changefeedpb.Value_TimestampValue{`