GOMODULES/pgx
1
0
Fork 0
mirror of https://github.com/jackc/pgx.git synced 2025-05-28 10:12:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Makes Oid casting consistent

Browse Source 
Also fixes uint32 encoding in a few places.
This commit is contained in:
Manni Wood 2016-09-03 18:19:33 -04:00
parent 7dbfd4bf4b
commit 99bfc154f0
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
messages.go
View File

@ -138,6 +138,12 @@ func (wb *WriteBuf) WriteInt32(n int32) {
wb.buf = append(wb.buf, b...) wb.buf = append(wb.buf, b...)
} }
func (wb *WriteBuf) WriteUint32(n uint32) {
b := make([]byte, 4)
binary.BigEndian.PutUint32(b, n)
wb.buf = append(wb.buf, b...)
}
func (wb *WriteBuf) WriteInt64(n int64) { func (wb *WriteBuf) WriteInt64(n int64) {
b := make([]byte, 8) b := make([]byte, 8)
binary.BigEndian.PutUint64(b, uint64(n)) binary.BigEndian.PutUint64(b, uint64(n))

10
values.go
View File

@ -1299,19 +1299,19 @@ func decodeInt4(vr *ValueReader) int32 {
func decodeOid(vr *ValueReader) Oid { func decodeOid(vr *ValueReader) Oid {
if vr.Len() == -1 { if vr.Len() == -1 {
vr.Fatal(ProtocolError("Cannot decode null into Oid")) vr.Fatal(ProtocolError("Cannot decode null into Oid"))
return 0 return Oid(0)
} }
if vr.Type().DataType != OidOid { if vr.Type().DataType != OidOid {
vr.Fatal(ProtocolError(fmt.Sprintf("Cannot decode oid %v into pgx.Oid", vr.Type().DataType))) vr.Fatal(ProtocolError(fmt.Sprintf("Cannot decode oid %v into pgx.Oid", vr.Type().DataType)))
return 0 return Oid(0)
} }
// Oid needs to decode text format because it is used in loadPgTypes // Oid needs to decode text format because it is used in loadPgTypes
switch vr.Type().FormatCode { switch vr.Type().FormatCode {
case TextFormatCode: case TextFormatCode:
s := vr.ReadString(vr.Len()) s := vr.ReadString(vr.Len())
n, err := strconv.ParseInt(s, 10, 32) n, err := strconv.ParseUint(s, 10, 32)
if err != nil { if err != nil {
vr.Fatal(ProtocolError(fmt.Sprintf("Received invalid Oid: %v", s))) vr.Fatal(ProtocolError(fmt.Sprintf("Received invalid Oid: %v", s)))
} }
@ -1319,7 +1319,7 @@ func decodeOid(vr *ValueReader) Oid {
case BinaryFormatCode: case BinaryFormatCode:
if vr.Len() != 4 { if vr.Len() != 4 {
vr.Fatal(ProtocolError(fmt.Sprintf("Received an invalid size for an Oid: %d", vr.Len()))) vr.Fatal(ProtocolError(fmt.Sprintf("Received an invalid size for an Oid: %d", vr.Len())))
return 0 return Oid(0)
} }
return Oid(vr.ReadInt32()) return Oid(vr.ReadInt32())
default: default:
@ -1334,7 +1334,7 @@ func encodeOid(w *WriteBuf, oid Oid, value Oid) error {
} }
w.WriteInt32(4) w.WriteInt32(4)
w.WriteInt32(int32(value)) w.WriteUint32(uint32(value))
return nil return nil
} }