Skip to content

fix: prefer codec over driver.Valuer for typed-nil in array/composite encoding #2621

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
waterWang wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: prefer codec over driver.Valuer for typed-nil in array/composite encoding #2621

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 18 additions & 2 deletions pgtype/array_codec.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,15 @@ func (p *encodePlanArrayCodecText) Encode(value any, buf []byte) (newBuf []byte,
return nil, err
}
} else if callNilDriverValuer {
elemBuf, err = (&encodePlanDriverValuer{m: p.m, oid: p.ac.ElementType.OID, formatCode: TextFormatCode}).Encode(elem, inElemBuf)
elemType := reflect.TypeOf(elem)
if lastElemType != elemType {
lastElemType = elemType
encodePlan = p.m.PlanEncode(p.ac.ElementType.OID, TextFormatCode, elem)
if encodePlan == nil {
return nil, fmt.Errorf("unable to encode %v", array.Index(i))
}
}
elemBuf, err = encodePlan.Encode(elem, inElemBuf)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -215,7 +223,15 @@ func (p *encodePlanArrayCodecBinary) Encode(value any, buf []byte) (newBuf []byt
return nil, err
}
} else if callNilDriverValuer {
elemBuf, err = (&encodePlanDriverValuer{m: p.m, oid: p.ac.ElementType.OID, formatCode: BinaryFormatCode}).Encode(elem, buf)
elemType := reflect.TypeOf(elem)
if lastElemType != elemType {
lastElemType = elemType
encodePlan = p.m.PlanEncode(p.ac.ElementType.OID, BinaryFormatCode, elem)
if encodePlan == nil {
return nil, fmt.Errorf("unable to encode %v", array.Index(i))
}
}
elemBuf, err = encodePlan.Encode(elem, buf)
if err != nil {
return nil, err
}
Expand Down
10 changes: 8 additions & 2 deletions pgtype/composite.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -494,7 +494,10 @@ func (b *CompositeBinaryBuilder) AppendValue(oid uint32, field any) {

var plan EncodePlan
if isNil {
plan = &encodePlanDriverValuer{m: b.m, oid: oid, formatCode: BinaryFormatCode}
plan = b.m.PlanEncode(oid, BinaryFormatCode, field)
if plan == nil {
plan = &encodePlanDriverValuer{m: b.m, oid: oid, formatCode: BinaryFormatCode}
}
} else {
plan = b.m.PlanEncode(oid, BinaryFormatCode, field)
if plan == nil {
Expand Down Expand Up @@ -555,7 +558,10 @@ func (b *CompositeTextBuilder) AppendValue(oid uint32, field any) {

var plan EncodePlan
if isNil {
plan = &encodePlanDriverValuer{m: b.m, oid: oid, formatCode: TextFormatCode}
plan = b.m.PlanEncode(oid, TextFormatCode, field)
if plan == nil {
plan = &encodePlanDriverValuer{m: b.m, oid: oid, formatCode: TextFormatCode}
}
} else {
plan = b.m.PlanEncode(oid, TextFormatCode, field)
if plan == nil {
Expand Down