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

Remove *msgReader.readOID

v3-experimental
Jack Christensen 2017-02-17 07:40:06 -06:00
parent 47eda78ea1
commit 366440d40d
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
conn.go
View File

@ -1157,9 +1157,9 @@ func (c *Conn) rxRowDescription(r *msgReader) (fields []FieldDescription) {
for i := int16(0); i < fieldCount; i++ { for i := int16(0); i < fieldCount; i++ {
f := &fields[i] f := &fields[i]
f.Name = r.readCString() f.Name = r.readCString()
f.Table = r.readOID() f.Table = OID(r.readUint32())
f.AttributeNumber = r.readInt16() f.AttributeNumber = r.readInt16()
f.DataType = r.readOID() f.DataType = OID(r.readUint32())
f.DataTypeSize = r.readInt16() f.DataTypeSize = r.readInt16()
f.Modifier = r.readInt32() f.Modifier = r.readInt32()
f.FormatCode = r.readInt16() f.FormatCode = r.readInt16()
@ -1179,7 +1179,7 @@ func (c *Conn) rxParameterDescription(r *msgReader) (parameters []OID) {
parameters = make([]OID, 0, parameterCount) parameters = make([]OID, 0, parameterCount)
for i := 0; i < parameterCount; i++ { for i := 0; i < parameterCount; i++ {
parameters = append(parameters, r.readOID()) parameters = append(parameters, OID(r.readUint32()))
} }
return return
} }

4
msg_reader.go
View File

@ -178,10 +178,6 @@ func (r *msgReader) readInt64() int64 {
return n return n
} }
func (r *msgReader) readOID() OID {
return OID(r.readInt32())
}
// readCString reads a null terminated string // readCString reads a null terminated string
func (r *msgReader) readCString() string { func (r *msgReader) readCString() string {
if r.err != nil { if r.err != nil {