gopkg/pgx
2
0
Fork 0
Code Activity

Extract codecDecodeToTextFormat

Browse Source
This commit is contained in:
Jack Christensen
2022-01-03 21:23:29 -06:00
parent f7c0c31e87
commit 6a32f938f1
5 changed files with 22 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pgtype/box.go
+1 -13
View File
@@ -126,19 +126,7 @@ func (BoxCodec) PlanScan(ci *ConnInfo, oid uint32, format int16, target interfac
}
func (c BoxCodec) DecodeDatabaseSQLValue(ci *ConnInfo, oid uint32, format int16, src []byte) (driver.Value, error) {
if format == TextFormatCode {
return string(src), nil
} else {
box, err := c.DecodeValue(ci, oid, format, src)
if err != nil {
return nil, err
}
buf, err := c.Encode(ci, oid, TextFormatCode, box, nil)
if err != nil {
return nil, err
}
return string(buf), nil
}
return codecDecodeToTextFormat(c, ci, oid, format, src)
}
func (c BoxCodec) DecodeValue(ci *ConnInfo, oid uint32, format int16, src []byte) (interface{}, error) {
pgtype/circle.go
+1 -13
View File
@@ -124,19 +124,7 @@ func (CircleCodec) PlanScan(ci *ConnInfo, oid uint32, format int16, target inter
}
func (c CircleCodec) DecodeDatabaseSQLValue(ci *ConnInfo, oid uint32, format int16, src []byte) (driver.Value, error) {
if format == TextFormatCode {
return string(src), nil
} else {
circle, err := c.DecodeValue(ci, oid, format, src)
if err != nil {
return nil, err
}
buf, err := c.Encode(ci, oid, TextFormatCode, circle, nil)
if err != nil {
return nil, err
}
return string(buf), nil
}
return codecDecodeToTextFormat(c, ci, oid, format, src)
}
func (c CircleCodec) DecodeValue(ci *ConnInfo, oid uint32, format int16, src []byte) (interface{}, error) {
pgtype/int.go
+3 -15
View File
@@ -209,11 +209,7 @@ func (c Int2Codec) DecodeDatabaseSQLValue(ci *ConnInfo, oid uint32, format int16
}
var n int64
scanPlan := c.PlanScan(ci, oid, format, &n, true)
if scanPlan == nil {
return nil, fmt.Errorf("PlanScan did not find a plan")
}
err := scanPlan.Scan(ci, oid, format, src, &n)
err := codecScan(c, ci, oid, format, src, &n)
if err != nil {
return nil, err
}
@@ -693,11 +689,7 @@ func (c Int4Codec) DecodeDatabaseSQLValue(ci *ConnInfo, oid uint32, format int16
}
var n int64
scanPlan := c.PlanScan(ci, oid, format, &n, true)
if scanPlan == nil {
return nil, fmt.Errorf("PlanScan did not find a plan")
}
err := scanPlan.Scan(ci, oid, format, src, &n)
err := codecScan(c, ci, oid, format, src, &n)
if err != nil {
return nil, err
}
@@ -1188,11 +1180,7 @@ func (c Int8Codec) DecodeDatabaseSQLValue(ci *ConnInfo, oid uint32, format int16
}
var n int64
scanPlan := c.PlanScan(ci, oid, format, &n, true)
if scanPlan == nil {
return nil, fmt.Errorf("PlanScan did not find a plan")
}
err := scanPlan.Scan(ci, oid, format, src, &n)
err := codecScan(c, ci, oid, format, src, &n)
if err != nil {
return nil, err
}
pgtype/int.go.erb
+1 -5
View File
@@ -210,11 +210,7 @@ func (c Int<%= pg_byte_size %>Codec) DecodeDatabaseSQLValue(ci *ConnInfo, oid ui
}
var n int64
scanPlan := c.PlanScan(ci, oid, format, &n, true)
if scanPlan == nil {
return nil, fmt.Errorf("PlanScan did not find a plan")
}
err := scanPlan.Scan(ci, oid, format, src, &n)
err := codecScan(c, ci, oid, format, src, &n)
if err != nil {
return nil, err
}
pgtype/pgtype.go
+16
View File
@@ -968,3 +968,19 @@ func codecScan(codec Codec, ci *ConnInfo, oid uint32, format int16, src []byte,
}
return scanPlan.Scan(ci, oid, format, src, dst)
}
func codecDecodeToTextFormat(codec Codec, ci *ConnInfo, oid uint32, format int16, src []byte) (driver.Value, error) {
if format == TextFormatCode {
return string(src), nil
} else {
value, err := codec.DecodeValue(ci, oid, format, src)
if err != nil {
return nil, err
}
buf, err := codec.Encode(ci, oid, TextFormatCode, value, nil)
if err != nil {
return nil, err
}
return string(buf), nil
}
}