gopkg/pgx
2
0
Fork 0
Code Activity

Add pgtype.Record and prerequisite restructuring

Browse Source 
Because reading a record type requires the decoder to be able to look up oid
to type mapping and types such as hstore have types that are not fixed between
different PostgreSQL servers it was necessary to restructure the pgtype system
so all encoders and decodes take a *ConnInfo that includes oid/name/type
information.
This commit is contained in:
Jack Christensen
2017-03-18 12:01:16 -05:00
parent 94d56e8556
commit 19c6689752
62 changed files with 2067 additions and 1105 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pgtype/bytea_array.go
+12 -12
View File
@@ -83,7 +83,7 @@ func (src *ByteaArray) AssignTo(dst interface{}) error {
return nil
}
func (dst *ByteaArray) DecodeText(src []byte) error {
func (dst *ByteaArray) DecodeText(ci *ConnInfo, src []byte) error {
if src == nil {
*dst = ByteaArray{Status: Null}
return nil
@@ -105,7 +105,7 @@ func (dst *ByteaArray) DecodeText(src []byte) error {
if s != "NULL" {
elemSrc = []byte(s)
}
err = elem.DecodeText(elemSrc)
err = elem.DecodeText(ci, elemSrc)
if err != nil {
return err
}
@@ -119,14 +119,14 @@ func (dst *ByteaArray) DecodeText(src []byte) error {
return nil
}
func (dst *ByteaArray) DecodeBinary(src []byte) error {
func (dst *ByteaArray) DecodeBinary(ci *ConnInfo, src []byte) error {
if src == nil {
*dst = ByteaArray{Status: Null}
return nil
}
var arrayHeader ArrayHeader
rp, err := arrayHeader.DecodeBinary(src)
rp, err := arrayHeader.DecodeBinary(ci, src)
if err != nil {
return err
}
@@ -151,7 +151,7 @@ func (dst *ByteaArray) DecodeBinary(src []byte) error {
elemSrc = src[rp : rp+elemLen]
rp += elemLen
}
err = elements[i].DecodeBinary(elemSrc)
err = elements[i].DecodeBinary(ci, elemSrc)
if err != nil {
return err
}
@@ -161,7 +161,7 @@ func (dst *ByteaArray) DecodeBinary(src []byte) error {
return nil
}
func (src *ByteaArray) EncodeText(w io.Writer) (bool, error) {
func (src *ByteaArray) EncodeText(ci *ConnInfo, w io.Writer) (bool, error) {
switch src.Status {
case Null:
return true, nil
@@ -208,7 +208,7 @@ func (src *ByteaArray) EncodeText(w io.Writer) (bool, error) {
}
elemBuf := &bytes.Buffer{}
null, err := elem.EncodeText(elemBuf)
null, err := elem.EncodeText(ci, elemBuf)
if err != nil {
return false, err
}
@@ -237,11 +237,11 @@ func (src *ByteaArray) EncodeText(w io.Writer) (bool, error) {
return false, nil
}
func (src *ByteaArray) EncodeBinary(w io.Writer) (bool, error) {
return src.encodeBinary(w, ByteaOid)
func (src *ByteaArray) EncodeBinary(ci *ConnInfo, w io.Writer) (bool, error) {
return src.encodeBinary(ci, w, ByteaOid)
}
func (src *ByteaArray) encodeBinary(w io.Writer, elementOid int32) (bool, error) {
func (src *ByteaArray) encodeBinary(ci *ConnInfo, w io.Writer, elementOid int32) (bool, error) {
switch src.Status {
case Null:
return true, nil
@@ -261,7 +261,7 @@ func (src *ByteaArray) encodeBinary(w io.Writer, elementOid int32) (bool, error)
}
}
err := arrayHeader.EncodeBinary(w)
err := arrayHeader.EncodeBinary(ci, w)
if err != nil {
return false, err
}
@@ -271,7 +271,7 @@ func (src *ByteaArray) encodeBinary(w io.Writer, elementOid int32) (bool, error)
for i := range src.Elements {
elemBuf.Reset()
null, err := src.Elements[i].EncodeBinary(elemBuf)
null, err := src.Elements[i].EncodeBinary(ci, elemBuf)
if err != nil {
return false, err
}