GOMODULES/pgx
1
0
Fork 0
mirror of https://github.com/jackc/pgx.git synced 2025-05-31 11:42:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update for rename of pgconn.PreparedStatementDescription

Browse Source
This commit is contained in:
Jack Christensen 2019-08-24 20:44:56 -05:00
parent 0c3e59b07a
commit 3675337e5b
7 changed files with 65 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
conn.go
View File

@ -52,7 +52,7 @@ type BuildPreparedStatementCacheFunc func(conn *pgconn.PgConn) stmtcache.Cache
type Conn struct { type Conn struct {
pgConn *pgconn.PgConn pgConn *pgconn.PgConn
config *ConnConfig // config used when establishing this connection config *ConnConfig // config used when establishing this connection
preparedStatements map[string]*pgconn.PreparedStatementDescription preparedStatements map[string]*pgconn.StatementDescription
stmtcache stmtcache.Cache stmtcache stmtcache.Cache
logger Logger logger Logger
logLevel LogLevel logLevel LogLevel
@ -212,7 +212,7 @@ func connect(ctx context.Context, config *ConnConfig) (c *Conn, err error) {
return nil, err return nil, err
} }
c.preparedStatements = make(map[string]*pgconn.PreparedStatementDescription) c.preparedStatements = make(map[string]*pgconn.StatementDescription)
c.doneChan = make(chan struct{}) c.doneChan = make(chan struct{})
c.closedChan = make(chan error) c.closedChan = make(chan error)
c.wbuf = make([]byte, 0, 1024) c.wbuf = make([]byte, 0, 1024)
@ -251,11 +251,11 @@ func (c *Conn) Close(ctx context.Context) error {
// Prepare is idempotent; i.e. it is safe to call Prepare multiple times with the same // Prepare is idempotent; i.e. it is safe to call Prepare multiple times with the same
// name and sql arguments. This allows a code path to Prepare and Query/Exec without // name and sql arguments. This allows a code path to Prepare and Query/Exec without
// concern for if the statement has already been prepared. // concern for if the statement has already been prepared.
func (c *Conn) Prepare(ctx context.Context, name, sql string) (psd *pgconn.PreparedStatementDescription, err error) { func (c *Conn) Prepare(ctx context.Context, name, sql string) (sd *pgconn.StatementDescription, err error) {
if name != "" { if name != "" {
var ok bool var ok bool
if psd, ok = c.preparedStatements[name]; ok && psd.SQL == sql { if sd, ok = c.preparedStatements[name]; ok && sd.SQL == sql {
return psd, nil return sd, nil
} }
} }
@ -267,16 +267,16 @@ func (c *Conn) Prepare(ctx context.Context, name, sql string) (psd *pgconn.Prepa
}() }()
} }
psd, err = c.pgConn.Prepare(ctx, name, sql, nil) sd, err = c.pgConn.Prepare(ctx, name, sql, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
if name != "" { if name != "" {
c.preparedStatements[name] = psd c.preparedStatements[name] = sd
} }
return psd, nil return sd, nil
} }
// Deallocate released a prepared statement // Deallocate released a prepared statement
@ -428,8 +428,8 @@ func connInfoFromRows(rows Rows, err error) (map[string]uint32, error) {
// is used and the connection must be returned to the same state before any *pgx.Conn methods are again used. // is used and the connection must be returned to the same state before any *pgx.Conn methods are again used.
func (c *Conn) PgConn() *pgconn.PgConn { return c.pgConn } func (c *Conn) PgConn() *pgconn.PgConn { return c.pgConn }
// StmtCache returns the statement cache used for this connection. // StatementCache returns the statement cache used for this connection.
func (c *Conn) StmtCache() stmtcache.Cache { return c.stmtcache } func (c *Conn) StatementCache() stmtcache.Cache { return c.stmtcache }
// Exec executes sql. sql can be either a prepared statement name or an SQL string. arguments should be referenced // Exec executes sql. sql can be either a prepared statement name or an SQL string. arguments should be referenced
// positionally from the sql string as $1, $2, etc. // positionally from the sql string as $1, $2, etc.
@ -470,8 +470,8 @@ optionLoop:
return c.execSimpleProtocol(ctx, sql, arguments) return c.execSimpleProtocol(ctx, sql, arguments)
} }
if ps, ok := c.preparedStatements[sql]; ok { if sd, ok := c.preparedStatements[sql]; ok {
return c.execPrepared(ctx, ps, arguments) return c.execPrepared(ctx, sd, arguments)
} }
if len(arguments) == 0 { if len(arguments) == 0 {
@ -479,22 +479,22 @@ optionLoop:
} }
if c.stmtcache != nil { if c.stmtcache != nil {
ps, err := c.stmtcache.Get(ctx, sql) sd, err := c.stmtcache.Get(ctx, sql)
if err != nil { if err != nil {
return nil, err return nil, err
} }
if c.stmtcache.Mode() == stmtcache.ModeDescribe { if c.stmtcache.Mode() == stmtcache.ModeDescribe {
return c.execParams(ctx, ps, arguments) return c.execParams(ctx, sd, arguments)
} }
return c.execPrepared(ctx, ps, arguments) return c.execPrepared(ctx, sd, arguments)
} }
ps, err := c.Prepare(ctx, "", sql) sd, err := c.Prepare(ctx, "", sql)
if err != nil { if err != nil {
return nil, err return nil, err
} }
return c.execPrepared(ctx, ps, arguments) return c.execPrepared(ctx, sd, arguments)
} }
func (c *Conn) execSimpleProtocol(ctx context.Context, sql string, arguments []interface{}) (commandTag pgconn.CommandTag, err error) { func (c *Conn) execSimpleProtocol(ctx context.Context, sql string, arguments []interface{}) (commandTag pgconn.CommandTag, err error) {
@ -513,7 +513,7 @@ func (c *Conn) execSimpleProtocol(ctx context.Context, sql string, arguments []i
return commandTag, err return commandTag, err
} }
func (c *Conn) execParamsAndPreparedPrefix(ps *pgconn.PreparedStatementDescription, arguments []interface{}) error { func (c *Conn) execParamsAndPreparedPrefix(sd *pgconn.StatementDescription, arguments []interface{}) error {
c.eqb.Reset() c.eqb.Reset()
args, err := convertDriverValuers(arguments) args, err := convertDriverValuers(arguments)
@ -522,14 +522,14 @@ func (c *Conn) execParamsAndPreparedPrefix(ps *pgconn.PreparedStatementDescripti
} }
for i := range args { for i := range args {
err = c.eqb.AppendParam(c.ConnInfo, ps.ParamOIDs[i], args[i]) err = c.eqb.AppendParam(c.ConnInfo, sd.ParamOIDs[i], args[i])
if err != nil { if err != nil {
return err return err
} }
} }
for i := range ps.Fields { for i := range sd.Fields {
if dt, ok := c.ConnInfo.DataTypeForOID(uint32(ps.Fields[i].DataTypeOID)); ok { if dt, ok := c.ConnInfo.DataTypeForOID(uint32(sd.Fields[i].DataTypeOID)); ok {
if _, ok := dt.Value.(pgtype.BinaryDecoder); ok { if _, ok := dt.Value.(pgtype.BinaryDecoder); ok {
c.eqb.AppendResultFormat(BinaryFormatCode) c.eqb.AppendResultFormat(BinaryFormatCode)
} else { } else {
@ -541,23 +541,23 @@ func (c *Conn) execParamsAndPreparedPrefix(ps *pgconn.PreparedStatementDescripti
return nil return nil
} }
func (c *Conn) execParams(ctx context.Context, ps *pgconn.PreparedStatementDescription, arguments []interface{}) (pgconn.CommandTag, error) { func (c *Conn) execParams(ctx context.Context, sd *pgconn.StatementDescription, arguments []interface{}) (pgconn.CommandTag, error) {
err := c.execParamsAndPreparedPrefix(ps, arguments) err := c.execParamsAndPreparedPrefix(sd, arguments)
if err != nil { if err != nil {
return nil, err return nil, err
} }
result := c.pgConn.ExecParams(ctx, ps.SQL, c.eqb.paramValues, ps.ParamOIDs, c.eqb.paramFormats, c.eqb.resultFormats).Read() result := c.pgConn.ExecParams(ctx, sd.SQL, c.eqb.paramValues, sd.ParamOIDs, c.eqb.paramFormats, c.eqb.resultFormats).Read()
return result.CommandTag, result.Err return result.CommandTag, result.Err
} }
func (c *Conn) execPrepared(ctx context.Context, ps *pgconn.PreparedStatementDescription, arguments []interface{}) (pgconn.CommandTag, error) { func (c *Conn) execPrepared(ctx context.Context, sd *pgconn.StatementDescription, arguments []interface{}) (pgconn.CommandTag, error) {
err := c.execParamsAndPreparedPrefix(ps, arguments) err := c.execParamsAndPreparedPrefix(sd, arguments)
if err != nil { if err != nil {
return nil, err return nil, err
} }
result := c.pgConn.ExecPrepared(ctx, ps.Name, c.eqb.paramValues, c.eqb.paramFormats, c.eqb.resultFormats).Read() result := c.pgConn.ExecPrepared(ctx, sd.Name, c.eqb.paramValues, c.eqb.paramFormats, c.eqb.resultFormats).Read()
return result.CommandTag, result.Err return result.CommandTag, result.Err
} }
@ -637,28 +637,28 @@ optionLoop:
c.eqb.Reset() c.eqb.Reset()
ps, ok := c.preparedStatements[sql] sd, ok := c.preparedStatements[sql]
if !ok { if !ok {
if c.stmtcache != nil { if c.stmtcache != nil {
ps, err = c.stmtcache.Get(ctx, sql) sd, err = c.stmtcache.Get(ctx, sql)
if err != nil { if err != nil {
rows.fatal(err) rows.fatal(err)
return rows, rows.err return rows, rows.err
} }
} else { } else {
ps, err = c.pgConn.Prepare(ctx, "", sql, nil) sd, err = c.pgConn.Prepare(ctx, "", sql, nil)
if err != nil { if err != nil {
rows.fatal(err) rows.fatal(err)
return rows, rows.err return rows, rows.err
} }
} }
} }
if len(ps.ParamOIDs) != len(args) { if len(sd.ParamOIDs) != len(args) {
rows.fatal(errors.Errorf("expected %d arguments, got %d", len(ps.ParamOIDs), len(args))) rows.fatal(errors.Errorf("expected %d arguments, got %d", len(sd.ParamOIDs), len(args)))
return rows, rows.err return rows, rows.err
} }
rows.sql = ps.SQL rows.sql = sd.SQL
args, err = convertDriverValuers(args) args, err = convertDriverValuers(args)
if err != nil { if err != nil {
@ -667,7 +667,7 @@ optionLoop:
} }
for i := range args { for i := range args {
err = c.eqb.AppendParam(c.ConnInfo, ps.ParamOIDs[i], args[i]) err = c.eqb.AppendParam(c.ConnInfo, sd.ParamOIDs[i], args[i])
if err != nil { if err != nil {
rows.fatal(err) rows.fatal(err)
return rows, rows.err return rows, rows.err
@ -675,15 +675,15 @@ optionLoop:
} }
if resultFormatsByOID != nil { if resultFormatsByOID != nil {
resultFormats = make([]int16, len(ps.Fields)) resultFormats = make([]int16, len(sd.Fields))
for i := range resultFormats { for i := range resultFormats {
resultFormats[i] = resultFormatsByOID[uint32(ps.Fields[i].DataTypeOID)] resultFormats[i] = resultFormatsByOID[uint32(sd.Fields[i].DataTypeOID)]
} }
} }
if resultFormats == nil { if resultFormats == nil {
for i := range ps.Fields { for i := range sd.Fields {
if dt, ok := c.ConnInfo.DataTypeForOID(uint32(ps.Fields[i].DataTypeOID)); ok { if dt, ok := c.ConnInfo.DataTypeForOID(uint32(sd.Fields[i].DataTypeOID)); ok {
if _, ok := dt.Value.(pgtype.BinaryDecoder); ok { if _, ok := dt.Value.(pgtype.BinaryDecoder); ok {
c.eqb.AppendResultFormat(BinaryFormatCode) c.eqb.AppendResultFormat(BinaryFormatCode)
} else { } else {
@ -696,9 +696,9 @@ optionLoop:
} }
if c.stmtcache != nil && c.stmtcache.Mode() == stmtcache.ModeDescribe { if c.stmtcache != nil && c.stmtcache.Mode() == stmtcache.ModeDescribe {
rows.resultReader = c.pgConn.ExecParams(ctx, sql, c.eqb.paramValues, ps.ParamOIDs, c.eqb.paramFormats, resultFormats) rows.resultReader = c.pgConn.ExecParams(ctx, sql, c.eqb.paramValues, sd.ParamOIDs, c.eqb.paramFormats, resultFormats)
} else { } else {
rows.resultReader = c.pgConn.ExecPrepared(ctx, ps.Name, c.eqb.paramValues, c.eqb.paramFormats, resultFormats) rows.resultReader = c.pgConn.ExecPrepared(ctx, sd.Name, c.eqb.paramValues, c.eqb.paramFormats, resultFormats)
} }
return rows, rows.err return rows, rows.err
@ -721,10 +721,10 @@ func (c *Conn) SendBatch(ctx context.Context, b *Batch) BatchResults {
c.eqb.Reset() c.eqb.Reset()
var parameterOIDs []uint32 var parameterOIDs []uint32
ps := c.preparedStatements[bi.query] sd := c.preparedStatements[bi.query]
if ps != nil { if sd != nil {
parameterOIDs = ps.ParamOIDs parameterOIDs = sd.ParamOIDs
} else { } else {
parameterOIDs = bi.parameterOIDs parameterOIDs = bi.parameterOIDs
} }
@ -742,12 +742,12 @@ func (c *Conn) SendBatch(ctx context.Context, b *Batch) BatchResults {
} }
if ps != nil { if sd != nil {
resultFormats := bi.resultFormatCodes resultFormats := bi.resultFormatCodes
if resultFormats == nil { if resultFormats == nil {
for i := range ps.Fields { for i := range sd.Fields {
if dt, ok := c.ConnInfo.DataTypeForOID(uint32(ps.Fields[i].DataTypeOID)); ok { if dt, ok := c.ConnInfo.DataTypeForOID(uint32(sd.Fields[i].DataTypeOID)); ok {
if _, ok := dt.Value.(pgtype.BinaryDecoder); ok { if _, ok := dt.Value.(pgtype.BinaryDecoder); ok {
c.eqb.AppendResultFormat(BinaryFormatCode) c.eqb.AppendResultFormat(BinaryFormatCode)
} else { } else {
@ -759,7 +759,7 @@ func (c *Conn) SendBatch(ctx context.Context, b *Batch) BatchResults {
resultFormats = c.eqb.resultFormats resultFormats = c.eqb.resultFormats
} }
batch.ExecPrepared(ps.Name, c.eqb.paramValues, c.eqb.paramFormats, resultFormats) batch.ExecPrepared(sd.Name, c.eqb.paramValues, c.eqb.paramFormats, resultFormats)
} else { } else {
oids := make([]uint32, len(parameterOIDs)) oids := make([]uint32, len(parameterOIDs))
for i := 0; i < len(parameterOIDs); i++ { for i := 0; i < len(parameterOIDs); i++ {

8
copy_from.go
View File

@ -69,7 +69,7 @@ func (ct *copyFrom) run(ctx context.Context) (int64, error) {
} }
quotedColumnNames := cbuf.String() quotedColumnNames := cbuf.String()
ps, err := ct.conn.Prepare(ctx, "", fmt.Sprintf("select %s from %s", quotedColumnNames, quotedTableName)) sd, err := ct.conn.Prepare(ctx, "", fmt.Sprintf("select %s from %s", quotedColumnNames, quotedTableName))
if err != nil { if err != nil {
return 0, err return 0, err
} }
@ -87,7 +87,7 @@ func (ct *copyFrom) run(ctx context.Context) (int64, error) {
moreRows := true moreRows := true
for moreRows { for moreRows {
var err error var err error
moreRows, buf, err = ct.buildCopyBuf(buf, ps) moreRows, buf, err = ct.buildCopyBuf(buf, sd)
if err != nil { if err != nil {
w.CloseWithError(err) w.CloseWithError(err)
return return
@ -117,7 +117,7 @@ func (ct *copyFrom) run(ctx context.Context) (int64, error) {
return commandTag.RowsAffected(), err return commandTag.RowsAffected(), err
} }
func (ct *copyFrom) buildCopyBuf(buf []byte, ps *pgconn.PreparedStatementDescription) (bool, []byte, error) { func (ct *copyFrom) buildCopyBuf(buf []byte, sd *pgconn.StatementDescription) (bool, []byte, error) {
for ct.rowSrc.Next() { for ct.rowSrc.Next() {
values, err := ct.rowSrc.Values() values, err := ct.rowSrc.Values()
@ -130,7 +130,7 @@ func (ct *copyFrom) buildCopyBuf(buf []byte, ps *pgconn.PreparedStatementDescrip
buf = pgio.AppendInt16(buf, int16(len(ct.columnNames))) buf = pgio.AppendInt16(buf, int16(len(ct.columnNames)))
for i, val := range values { for i, val := range values {
buf, err = encodePreparedStatementArgument(ct.conn.ConnInfo, buf, ps.Fields[i].DataTypeOID, val) buf, err = encodePreparedStatementArgument(ct.conn.ConnInfo, buf, sd.Fields[i].DataTypeOID, val)
if err != nil { if err != nil {
return false, nil, err return false, nil, err
} }

2
go.mod
View File

@ -6,7 +6,7 @@ require (
github.com/cockroachdb/apd v1.1.0 github.com/cockroachdb/apd v1.1.0
github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f // indirect github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f // indirect
github.com/go-stack/stack v1.8.0 // indirect github.com/go-stack/stack v1.8.0 // indirect
github.com/jackc/pgconn v0.0.0-20190825004843-78abbdf1d7ee github.com/jackc/pgconn v0.0.0-20190825013903-da9fc85c4404
github.com/jackc/pgio v1.0.0 github.com/jackc/pgio v1.0.0
github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190609003834-432c2951c711 github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190609003834-432c2951c711
github.com/jackc/pgtype v0.0.0-20190824184912-ab885b375b90 github.com/jackc/pgtype v0.0.0-20190824184912-ab885b375b90

2
go.sum
View File

@ -23,6 +23,8 @@ github.com/jackc/pgconn v0.0.0-20190824221829-beba629bb5d5 h1:fGy7MTsuLbREyDs7o1
github.com/jackc/pgconn v0.0.0-20190824221829-beba629bb5d5/go.mod h1:lLjNuW/+OfW9/pnVKPazfWOgNfH2aPem8YQ7ilXGvJE= github.com/jackc/pgconn v0.0.0-20190824221829-beba629bb5d5/go.mod h1:lLjNuW/+OfW9/pnVKPazfWOgNfH2aPem8YQ7ilXGvJE=
github.com/jackc/pgconn v0.0.0-20190825004843-78abbdf1d7ee h1:uHUd7Cnu7QjzOqOWj6MYqz8zvNGoDZG1tK6jQASP2j0= github.com/jackc/pgconn v0.0.0-20190825004843-78abbdf1d7ee h1:uHUd7Cnu7QjzOqOWj6MYqz8zvNGoDZG1tK6jQASP2j0=
github.com/jackc/pgconn v0.0.0-20190825004843-78abbdf1d7ee/go.mod h1:lLjNuW/+OfW9/pnVKPazfWOgNfH2aPem8YQ7ilXGvJE= github.com/jackc/pgconn v0.0.0-20190825004843-78abbdf1d7ee/go.mod h1:lLjNuW/+OfW9/pnVKPazfWOgNfH2aPem8YQ7ilXGvJE=
github.com/jackc/pgconn v0.0.0-20190825013903-da9fc85c4404 h1:ufozZrr6aX2OernEsOAA1Ewa8agH/FdeNbWFDvespbM=
github.com/jackc/pgconn v0.0.0-20190825013903-da9fc85c4404/go.mod h1:lLjNuW/+OfW9/pnVKPazfWOgNfH2aPem8YQ7ilXGvJE=
github.com/jackc/pgio v1.0.0 h1:g12B9UwVnzGhueNavwioyEEpAmqMe1E/BN9ES+8ovkE= github.com/jackc/pgio v1.0.0 h1:g12B9UwVnzGhueNavwioyEEpAmqMe1E/BN9ES+8ovkE=
github.com/jackc/pgio v1.0.0/go.mod h1:oP+2QK2wFfUWgr+gxjoBH9KGBb31Eio69xUb0w5bYf8= github.com/jackc/pgio v1.0.0/go.mod h1:oP+2QK2wFfUWgr+gxjoBH9KGBb31Eio69xUb0w5bYf8=
github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM= github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=

2
pgxpool/tx.go
View File

@ -46,7 +46,7 @@ func (tx *Tx) LargeObjects() pgx.LargeObjects {
return tx.t.LargeObjects() return tx.t.LargeObjects()
} }
func (tx *Tx) Prepare(ctx context.Context, name, sql string) (*pgconn.PreparedStatementDescription, error) { func (tx *Tx) Prepare(ctx context.Context, name, sql string) (*pgconn.StatementDescription, error) {
return tx.t.Prepare(ctx, name, sql) return tx.t.Prepare(ctx, name, sql)
} }

14
stdlib/sql.go
View File

@ -164,12 +164,12 @@ func (c *Conn) PrepareContext(ctx context.Context, query string) (driver.Stmt, e
name := fmt.Sprintf("pgx_%d", c.psCount) name := fmt.Sprintf("pgx_%d", c.psCount)
c.psCount++ c.psCount++
psd, err := c.conn.Prepare(ctx, name, query) sd, err := c.conn.Prepare(ctx, name, query)
if err != nil { if err != nil {
return nil, err return nil, err
} }
return &Stmt{psd: psd, conn: c}, nil return &Stmt{sd: sd, conn: c}, nil
} }
func (c *Conn) Close() error { func (c *Conn) Close() error {
@ -265,16 +265,16 @@ func (c *Conn) Ping(ctx context.Context) error {
} }
type Stmt struct { type Stmt struct {
psd *pgconn.PreparedStatementDescription sd *pgconn.StatementDescription
conn *Conn conn *Conn
} }
func (s *Stmt) Close() error { func (s *Stmt) Close() error {
return s.conn.conn.Deallocate(context.Background(), s.psd.Name) return s.conn.conn.Deallocate(context.Background(), s.sd.Name)
} }
func (s *Stmt) NumInput() int { func (s *Stmt) NumInput() int {
return len(s.psd.ParamOIDs) return len(s.sd.ParamOIDs)
} }
func (s *Stmt) Exec(argsV []driver.Value) (driver.Result, error) { func (s *Stmt) Exec(argsV []driver.Value) (driver.Result, error) {
@ -282,7 +282,7 @@ func (s *Stmt) Exec(argsV []driver.Value) (driver.Result, error) {
} }
func (s *Stmt) ExecContext(ctx context.Context, argsV []driver.NamedValue) (driver.Result, error) { func (s *Stmt) ExecContext(ctx context.Context, argsV []driver.NamedValue) (driver.Result, error) {
return s.conn.ExecContext(ctx, s.psd.Name, argsV) return s.conn.ExecContext(ctx, s.sd.Name, argsV)
} }
func (s *Stmt) Query(argsV []driver.Value) (driver.Rows, error) { func (s *Stmt) Query(argsV []driver.Value) (driver.Rows, error) {
@ -290,7 +290,7 @@ func (s *Stmt) Query(argsV []driver.Value) (driver.Rows, error) {
} }
func (s *Stmt) QueryContext(ctx context.Context, argsV []driver.NamedValue) (driver.Rows, error) { func (s *Stmt) QueryContext(ctx context.Context, argsV []driver.NamedValue) (driver.Rows, error) {
return s.conn.QueryContext(ctx, s.psd.Name, argsV) return s.conn.QueryContext(ctx, s.sd.Name, argsV)
} }
type Rows struct { type Rows struct {

6
tx.go
View File

@ -95,7 +95,7 @@ type Tx interface {
SendBatch(ctx context.Context, b *Batch) BatchResults SendBatch(ctx context.Context, b *Batch) BatchResults
LargeObjects() LargeObjects LargeObjects() LargeObjects
Prepare(ctx context.Context, name, sql string) (*pgconn.PreparedStatementDescription, error) Prepare(ctx context.Context, name, sql string) (*pgconn.StatementDescription, error)
Exec(ctx context.Context, sql string, arguments ...interface{}) (commandTag pgconn.CommandTag, err error) Exec(ctx context.Context, sql string, arguments ...interface{}) (commandTag pgconn.CommandTag, err error)
Query(ctx context.Context, sql string, args ...interface{}) (Rows, error) Query(ctx context.Context, sql string, args ...interface{}) (Rows, error)
@ -174,7 +174,7 @@ func (tx *dbTx) Exec(ctx context.Context, sql string, arguments ...interface{})
} }
// Prepare delegates to the underlying *Conn // Prepare delegates to the underlying *Conn
func (tx *dbTx) Prepare(ctx context.Context, name, sql string) (*pgconn.PreparedStatementDescription, error) { func (tx *dbTx) Prepare(ctx context.Context, name, sql string) (*pgconn.StatementDescription, error) {
if tx.closed { if tx.closed {
return nil, ErrTxClosed return nil, ErrTxClosed
} }
@ -264,7 +264,7 @@ func (sp *dbSavepoint) Exec(ctx context.Context, sql string, arguments ...interf
} }
// Prepare delegates to the underlying Tx // Prepare delegates to the underlying Tx
func (sp *dbSavepoint) Prepare(ctx context.Context, name, sql string) (*pgconn.PreparedStatementDescription, error) { func (sp *dbSavepoint) Prepare(ctx context.Context, name, sql string) (*pgconn.StatementDescription, error) {
if sp.closed { if sp.closed {
return nil, ErrTxClosed return nil, ErrTxClosed
} }