2
0

pgx uses pgconn.CommandTag instead of own definition

This commit is contained in:
Jack Christensen
2019-01-01 16:55:48 -06:00
parent ddd37cf557
commit 7f9540438c
13 changed files with 106 additions and 118 deletions
+11 -10
View File
@@ -5,6 +5,7 @@ import (
"fmt"
"io"
"github.com/jackc/pgx/pgconn"
"github.com/jackc/pgx/pgio"
"github.com/jackc/pgx/pgproto3"
"github.com/pkg/errors"
@@ -284,13 +285,13 @@ func (c *Conn) CopyFrom(tableName Identifier, columnNames []string, rowSrc CopyF
}
// CopyFromReader uses the PostgreSQL textual format of the copy protocol
func (c *Conn) CopyFromReader(r io.Reader, sql string) (CommandTag, error) {
func (c *Conn) CopyFromReader(r io.Reader, sql string) (pgconn.CommandTag, error) {
if err := c.sendSimpleQuery(sql); err != nil {
return "", err
return nil, err
}
if err := c.readUntilCopyInResponse(); err != nil {
return "", err
return nil, err
}
buf := c.wbuf
@@ -305,7 +306,7 @@ func (c *Conn) CopyFromReader(r io.Reader, sql string) (CommandTag, error) {
pgio.SetInt32(buf[sp:], int32(n+4))
if _, err := c.pgConn.Conn().Write(buf); err != nil {
return "", err
return nil, err
}
}
@@ -314,25 +315,25 @@ func (c *Conn) CopyFromReader(r io.Reader, sql string) (CommandTag, error) {
buf = pgio.AppendInt32(buf, 4)
if _, err := c.pgConn.Conn().Write(buf); err != nil {
return "", err
return nil, err
}
for {
msg, err := c.rxMsg()
if err != nil {
return "", err
return nil, err
}
switch msg := msg.(type) {
case *pgproto3.ReadyForQuery:
c.rxReadyForQuery(msg)
return "", err
return nil, err
case *pgproto3.CommandComplete:
return CommandTag(msg.CommandTag), nil
return pgconn.CommandTag(msg.CommandTag), nil
case *pgproto3.ErrorResponse:
return "", c.rxErrorResponse(msg)
return nil, c.rxErrorResponse(msg)
default:
return "", c.processContextFreeMsg(msg)
return nil, c.processContextFreeMsg(msg)
}
}
}