GOMODULES
/
pgx
mirror of https://github.com/jackc/pgx.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/utrack/pgx into utrack-master

pull/126/head
Jack Christensen 2016-03-11 07:51:20 -06:00
parent 49b82deee4 7f9f79656b
commit 935bfb6f44
1 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
values.go
View File

@ -686,6 +686,36 @@ func Decode(vr *ValueReader, d interface{}) error {
*v = decodeInt2(vr)
case *int32:
*v = decodeInt4(vr)
case *uint32:
var valInt int32
switch vr.Type().DataType {
case Int2Oid:
valInt = int32(decodeInt2(vr))
case Int4Oid:
valInt = decodeInt4(vr)
default:
return fmt.Errorf("Can't convert OID %v to uint32", vr.Type().DataType)
}
if valInt < 0 {
return fmt.Errorf("%d is less than zero for uint32", valInt)
}
*v = uint32(valInt)
case *uint64:
var valInt int64
switch vr.Type().DataType {
case Int2Oid:
valInt = int64(decodeInt2(vr))
case Int4Oid:
valInt = int64(decodeInt4(vr))
case Int8Oid:
valInt = decodeInt8(vr)
default:
return fmt.Errorf("Can't convert OID %v to uint64", vr.Type().DataType)
}
if valInt < 0 {
return fmt.Errorf("%d is less than zero for uint64", valInt)
}
*v = uint64(valInt)
case *Oid:
*v = decodeOid(vr)
case *string:
@ -1009,6 +1039,7 @@ func encodeUInt64(w *WriteBuf, oid Oid, value uint64) error {
return fmt.Errorf("%d is larger than max int32 %d", value, math.MaxInt32)
}
case Int8Oid:
if value <= math.MaxInt64 {
w.WriteInt32(8)
w.WriteInt64(int64(value))