gopkg/pgx
2
0
Fork 0
Code Activity

MessageReader uses ReadCString and ReadString names

Browse Source 
Make consistent with MessageWriter
This commit is contained in:
Jack Christensen
2013-07-20 08:40:37 -05:00
parent ce2d53c4fb
commit 0c3753e507
5 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
connection.go
+12 -12
View File
@@ -499,7 +499,7 @@ func (c *Connection) Execute(sql string, arguments ...interface{}) (commandTag s
case dataRow: case dataRow:
case bindComplete: case bindComplete:
case commandComplete: case commandComplete:
commandTag = r.ReadString() commandTag = r.ReadCString()
default: default:
if e := c.processContextFreeMsg(t, r); e != nil && err == nil { if e := c.processContextFreeMsg(t, r); e != nil && err == nil {
err = e err = e
@@ -623,7 +623,7 @@ func (c *Connection) rxAuthenticationX(r *MessageReader) (err error) {
case 3: // AuthenticationCleartextPassword case 3: // AuthenticationCleartextPassword
c.txPasswordMessage(c.parameters.Password) c.txPasswordMessage(c.parameters.Password)
case 5: // AuthenticationMD5Password case 5: // AuthenticationMD5Password
salt := r.ReadByteString(4) salt := r.ReadString(4)
digestedPassword := "md5" + hexMD5(hexMD5(c.parameters.Password+c.parameters.User)+salt) digestedPassword := "md5" + hexMD5(hexMD5(c.parameters.Password+c.parameters.User)+salt)
c.txPasswordMessage(digestedPassword) c.txPasswordMessage(digestedPassword)
default: default:
@@ -640,8 +640,8 @@ func hexMD5(s string) string {
} }
func (c *Connection) rxParameterStatus(r *MessageReader) { func (c *Connection) rxParameterStatus(r *MessageReader) {
key := r.ReadString() key := r.ReadCString()
value := r.ReadString() value := r.ReadCString()
c.RuntimeParams[key] = value c.RuntimeParams[key] = value
} }
@@ -649,15 +649,15 @@ func (c *Connection) rxErrorResponse(r *MessageReader) (err PgError) {
for { for {
switch r.ReadByte() { switch r.ReadByte() {
case 'S': case 'S':
err.Severity = r.ReadString() err.Severity = r.ReadCString()
case 'C': case 'C':
err.Code = r.ReadString() err.Code = r.ReadCString()
case 'M': case 'M':
err.Message = r.ReadString() err.Message = r.ReadCString()
case 0: // End of error message case 0: // End of error message
return return
default: // Ignore other error fields default: // Ignore other error fields
r.ReadString() r.ReadCString()
} }
} }
} }
@@ -676,7 +676,7 @@ func (c *Connection) rxRowDescription(r *MessageReader) (fields []FieldDescripti
fields = make([]FieldDescription, fieldCount) fields = make([]FieldDescription, fieldCount)
for i := int16(0); i < fieldCount; i++ { for i := int16(0); i < fieldCount; i++ {
f := &fields[i] f := &fields[i]
f.Name = r.ReadString() f.Name = r.ReadCString()
f.Table = r.ReadOid() f.Table = r.ReadOid()
f.AttributeNumber = r.ReadInt16() f.AttributeNumber = r.ReadInt16()
f.DataType = r.ReadOid() f.DataType = r.ReadOid()
@@ -707,14 +707,14 @@ func (c *Connection) rxDataRow(r *DataRowReader) (row map[string]interface{}) {
} }
func (c *Connection) rxCommandComplete(r *MessageReader) string { func (c *Connection) rxCommandComplete(r *MessageReader) string {
return r.ReadString() return r.ReadCString()
} }
func (c *Connection) rxNotificationResponse(r *MessageReader) (err error) { func (c *Connection) rxNotificationResponse(r *MessageReader) (err error) {
n := new(Notification) n := new(Notification)
n.Pid = r.ReadInt32() n.Pid = r.ReadInt32()
n.Channel = r.ReadString() n.Channel = r.ReadCString()
n.Payload = r.ReadString() n.Payload = r.ReadCString()
c.notifications = append(c.notifications, n) c.notifications = append(c.notifications, n)
return return
} }
data_row_reader.go
+1 -1
View File
@@ -37,7 +37,7 @@ func (r *DataRowReader) ReadValue() interface{} {
panic("Unknown format") panic("Unknown format")
} }
} else { } else {
return r.mr.ReadByteString(size) return r.mr.ReadString(size)
} }
} else { } else {
return nil return nil
example_value_transcoder_test.go
+1 -1
View File
@@ -32,7 +32,7 @@ func Example_customValueTranscoder() {
} }
func decodePointFromText(mr *pgx.MessageReader, size int32) interface{} { func decodePointFromText(mr *pgx.MessageReader, size int32) interface{} {
s := mr.ReadByteString(size) s := mr.ReadString(size)
match := pointRegexp.FindStringSubmatch(s) match := pointRegexp.FindStringSubmatch(s)
if match == nil { if match == nil {
panic(fmt.Sprintf("Received invalid point: %v", s)) panic(fmt.Sprintf("Received invalid point: %v", s))
message_reader.go
+3 -3
View File
@@ -85,7 +85,7 @@ func (r *MessageReader) ReadOid() (oid Oid) {
} }
// ReadString reads a null terminated string // ReadString reads a null terminated string
func (r *MessageReader) ReadString() (s string) { func (r *MessageReader) ReadCString() (s string) {
if r.Err != nil { if r.Err != nil {
return return
} }
@@ -99,8 +99,8 @@ func (r *MessageReader) ReadString() (s string) {
return string(b[:len(b)-1]) return string(b[:len(b)-1])
} }
// ReadByteString reads count bytes and return as string // ReadString reads count bytes and returns as string
func (r *MessageReader) ReadByteString(count int32) (s string) { func (r *MessageReader) ReadString(count int32) (s string) {
if r.Err != nil { if r.Err != nil {
return return
} }
value_transcoder.go
+10 -10
View File
@@ -105,7 +105,7 @@ func init() {
} }
func decodeBoolFromText(mr *MessageReader, size int32) interface{} { func decodeBoolFromText(mr *MessageReader, size int32) interface{} {
s := mr.ReadByteString(size) s := mr.ReadString(size)
switch s { switch s {
case "t": case "t":
return true return true
@@ -135,7 +135,7 @@ func encodeBool(w *MessageWriter, value interface{}) {
} }
func decodeInt8FromText(mr *MessageReader, size int32) interface{} { func decodeInt8FromText(mr *MessageReader, size int32) interface{} {
s := mr.ReadByteString(size) s := mr.ReadString(size)
n, err := strconv.ParseInt(s, 10, 64) n, err := strconv.ParseInt(s, 10, 64)
if err != nil { if err != nil {
panic(fmt.Sprintf("Received invalid int8: %v", s)) panic(fmt.Sprintf("Received invalid int8: %v", s))
@@ -157,7 +157,7 @@ func encodeInt8(w *MessageWriter, value interface{}) {
} }
func decodeInt2FromText(mr *MessageReader, size int32) interface{} { func decodeInt2FromText(mr *MessageReader, size int32) interface{} {
s := mr.ReadByteString(size) s := mr.ReadString(size)
n, err := strconv.ParseInt(s, 10, 16) n, err := strconv.ParseInt(s, 10, 16)
if err != nil { if err != nil {
panic(fmt.Sprintf("Received invalid int2: %v", s)) panic(fmt.Sprintf("Received invalid int2: %v", s))
@@ -179,7 +179,7 @@ func encodeInt2(w *MessageWriter, value interface{}) {
} }
func decodeInt4FromText(mr *MessageReader, size int32) interface{} { func decodeInt4FromText(mr *MessageReader, size int32) interface{} {
s := mr.ReadByteString(size) s := mr.ReadString(size)
n, err := strconv.ParseInt(s, 10, 32) n, err := strconv.ParseInt(s, 10, 32)
if err != nil { if err != nil {
panic(fmt.Sprintf("Received invalid int4: %v", s)) panic(fmt.Sprintf("Received invalid int4: %v", s))
@@ -201,7 +201,7 @@ func encodeInt4(w *MessageWriter, value interface{}) {
} }
func decodeFloat4FromText(mr *MessageReader, size int32) interface{} { func decodeFloat4FromText(mr *MessageReader, size int32) interface{} {
s := mr.ReadByteString(size) s := mr.ReadString(size)
n, err := strconv.ParseFloat(s, 32) n, err := strconv.ParseFloat(s, 32)
if err != nil { if err != nil {
panic(fmt.Sprintf("Received invalid float4: %v", s)) panic(fmt.Sprintf("Received invalid float4: %v", s))
@@ -226,7 +226,7 @@ func encodeFloat4(w *MessageWriter, value interface{}) {
} }
func decodeFloat8FromText(mr *MessageReader, size int32) interface{} { func decodeFloat8FromText(mr *MessageReader, size int32) interface{} {
s := mr.ReadByteString(size) s := mr.ReadString(size)
v, err := strconv.ParseFloat(s, 64) v, err := strconv.ParseFloat(s, 64)
if err != nil { if err != nil {
panic(fmt.Sprintf("Received invalid float8: %v", s)) panic(fmt.Sprintf("Received invalid float8: %v", s))
@@ -251,7 +251,7 @@ func encodeFloat8(w *MessageWriter, value interface{}) {
} }
func decodeTextFromText(mr *MessageReader, size int32) interface{} { func decodeTextFromText(mr *MessageReader, size int32) interface{} {
return mr.ReadByteString(size) return mr.ReadString(size)
} }
func encodeText(w *MessageWriter, value interface{}) { func encodeText(w *MessageWriter, value interface{}) {
@@ -261,7 +261,7 @@ func encodeText(w *MessageWriter, value interface{}) {
} }
func decodeByteaFromText(mr *MessageReader, size int32) interface{} { func decodeByteaFromText(mr *MessageReader, size int32) interface{} {
s := mr.ReadByteString(size) s := mr.ReadString(size)
b, err := hex.DecodeString(s[2:]) b, err := hex.DecodeString(s[2:])
if err != nil { if err != nil {
panic("Can't decode byte array") panic("Can't decode byte array")
@@ -276,7 +276,7 @@ func encodeBytea(w *MessageWriter, value interface{}) {
} }
func decodeDateFromText(mr *MessageReader, size int32) interface{} { func decodeDateFromText(mr *MessageReader, size int32) interface{} {
s := mr.ReadByteString(size) s := mr.ReadString(size)
t, err := time.ParseInLocation("2006-01-02", s, time.Local) t, err := time.ParseInLocation("2006-01-02", s, time.Local)
if err != nil { if err != nil {
panic("Can't decode date") panic("Can't decode date")
@@ -292,7 +292,7 @@ func encodeDate(w *MessageWriter, value interface{}) {
} }
func decodeTimestampTzFromText(mr *MessageReader, size int32) interface{} { func decodeTimestampTzFromText(mr *MessageReader, size int32) interface{} {
s := mr.ReadByteString(size) s := mr.ReadString(size)
t, err := time.Parse("2006-01-02 15:04:05.999999-07", s) t, err := time.Parse("2006-01-02 15:04:05.999999-07", s)
if err != nil { if err != nil {
panic(fmt.Sprintf("Can't decode timestamptz: %v", err)) panic(fmt.Sprintf("Can't decode timestamptz: %v", err))