gopkg/pgx
2
0
Fork 0
Code Activity

wip

Browse Source
This commit is contained in:
Jack Christensen
2021-12-04 12:53:20 -06:00
parent e22675d20b
commit 550cc7b529
2 changed files with 10 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pgtype.go
+7 -33
View File
@@ -179,12 +179,6 @@ type ResultFormatPreferrer interface {
PreferredResultFormat() int16 PreferredResultFormat() int16
} }
// ParamFormatPreferrer allows a type to specify its preferred param format instead of it being inferred from
// whether it is also a BinaryEncoder.
type ParamFormatPreferrer interface {
PreferredParamFormat() int16
}
type BinaryDecoder interface { type BinaryDecoder interface {
// DecodeBinary decodes src into BinaryDecoder. If src is nil then the // DecodeBinary decodes src into BinaryDecoder. If src is nil then the
// original SQL value is NULL. BinaryDecoder takes ownership of src. The // original SQL value is NULL. BinaryDecoder takes ownership of src. The
@@ -243,7 +237,7 @@ type ConnInfo struct {
oidToDataType map[uint32]*DataType oidToDataType map[uint32]*DataType
nameToDataType map[string]*DataType nameToDataType map[string]*DataType
reflectTypeToName map[reflect.Type]string reflectTypeToName map[reflect.Type]string
oidToParamFormatCode map[uint32]int16 oidToFormatCode map[uint32]int16
oidToResultFormatCode map[uint32]int16 oidToResultFormatCode map[uint32]int16
reflectTypeToDataType map[reflect.Type]*DataType reflectTypeToDataType map[reflect.Type]*DataType
@@ -256,7 +250,7 @@ func newConnInfo() *ConnInfo {
oidToDataType: make(map[uint32]*DataType), oidToDataType: make(map[uint32]*DataType),
nameToDataType: make(map[string]*DataType), nameToDataType: make(map[string]*DataType),
reflectTypeToName: make(map[reflect.Type]string), reflectTypeToName: make(map[reflect.Type]string),
oidToParamFormatCode: make(map[uint32]int16), oidToFormatCode: make(map[uint32]int16),
oidToResultFormatCode: make(map[uint32]int16), oidToResultFormatCode: make(map[uint32]int16),
preferAssignToOverSQLScannerTypes: make(map[reflect.Type]struct{}), preferAssignToOverSQLScannerTypes: make(map[reflect.Type]struct{}),
} }
@@ -392,24 +386,12 @@ func (ci *ConnInfo) RegisterDataType(t DataType) {
{ {
var formatCode int16 var formatCode int16
if pfp, ok := t.Value.(ParamFormatPreferrer); ok { if pfp, ok := t.Value.(FormatSupport); ok {
formatCode = pfp.PreferredParamFormat() formatCode = pfp.PreferredFormat()
} else if _, ok := t.Value.(BinaryEncoder); ok { } else if _, ok := t.Value.(BinaryEncoder); ok {
formatCode = BinaryFormatCode formatCode = BinaryFormatCode
} }
ci.oidToParamFormatCode[t.OID] = formatCode ci.oidToFormatCode[t.OID] = formatCode
}
{
var formatCode int16
if fs, ok := t.Value.(FormatSupport); ok {
formatCode = fs.PreferredFormat()
} else if rfp, ok := t.Value.(ResultFormatPreferrer); ok {
formatCode = rfp.PreferredResultFormat()
} else if _, ok := t.Value.(BinaryDecoder); ok {
formatCode = BinaryFormatCode
}
ci.oidToResultFormatCode[t.OID] = formatCode
} }
if d, ok := t.Value.(ResultDecoder); ok { if d, ok := t.Value.(ResultDecoder); ok {
@@ -477,16 +459,8 @@ func (ci *ConnInfo) DataTypeForValue(v interface{}) (*DataType, bool) {
return dt, ok return dt, ok
} }
func (ci *ConnInfo) ParamFormatCodeForOID(oid uint32) int16 { func (ci *ConnInfo) FormatCodeForOID(oid uint32) int16 {
fc, ok := ci.oidToParamFormatCode[oid] fc, ok := ci.oidToFormatCode[oid]
if ok {
return fc
}
return TextFormatCode
}
func (ci *ConnInfo) ResultFormatCodeForOID(oid uint32) int16 {
fc, ok := ci.oidToResultFormatCode[oid]
if ok { if ok {
return fc return fc
} }
pgtype_test.go
+3 -13
View File
@@ -67,24 +67,14 @@ func mustParseMacaddr(t testing.TB, s string) net.HardwareAddr {
return addr return addr
} }
func TestConnInfoResultFormatCodeForOID(t *testing.T) { func TestConnInfoFormatCodeForOID(t *testing.T) {
ci := pgtype.NewConnInfo()
// pgtype.JSONB implements BinaryDecoder but also implements ResultFormatPreferrer to override it to text.
assert.Equal(t, int16(pgtype.TextFormatCode), ci.ResultFormatCodeForOID(pgtype.JSONBOID))
// pgtype.Int4 implements BinaryDecoder but does not implement ResultFormatPreferrer so it should be binary.
assert.Equal(t, int16(pgtype.BinaryFormatCode), ci.ResultFormatCodeForOID(pgtype.Int4OID))
}
func TestConnInfoParamFormatCodeForOID(t *testing.T) {
ci := pgtype.NewConnInfo() ci := pgtype.NewConnInfo()
// pgtype.JSONB implements BinaryEncoder but also implements ParamFormatPreferrer to override it to text. // pgtype.JSONB implements BinaryEncoder but also implements ParamFormatPreferrer to override it to text.
assert.Equal(t, int16(pgtype.TextFormatCode), ci.ParamFormatCodeForOID(pgtype.JSONBOID)) assert.Equal(t, int16(pgtype.TextFormatCode), ci.FormatCodeForOID(pgtype.JSONBOID))
// pgtype.Int4 implements BinaryEncoder but does not implement ParamFormatPreferrer so it should be binary. // pgtype.Int4 implements BinaryEncoder but does not implement ParamFormatPreferrer so it should be binary.
assert.Equal(t, int16(pgtype.BinaryFormatCode), ci.ParamFormatCodeForOID(pgtype.Int4OID)) assert.Equal(t, int16(pgtype.BinaryFormatCode), ci.FormatCodeForOID(pgtype.Int4OID))
} }
func TestConnInfoScanNilIsNoOp(t *testing.T) { func TestConnInfoScanNilIsNoOp(t *testing.T) {