Stowage/go
2
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-12-08 06:10:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

database/sql: update minor sql docs

Browse source 
Replace the work "session" with "connection" in docs. Fix
The ErrConnDone documentation. Clarify what the context is used
for in StmtContext.

Change-Id: I2f07e58d0cd6321b386a73b038cf6070cb8e2572
Reviewed-on: https://go-review.googlesource.com/65732
Reviewed-by: Ian Lance Taylor <iant@golang.org>
This commit is contained in:
Daniel Theophanes 2017-09-23 17:04:51 -07:00
parent 24ca86f308
commit 14a1d934b6
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/database/sql/sql.go
View file

@ -1492,7 +1492,7 @@ func (db *DB) Driver() driver.Driver {
} }
// ErrConnDone is returned by any operation that is performed on a connection // ErrConnDone is returned by any operation that is performed on a connection
// that has already been committed or rolled back. // that has already been returned to the connection pool.
var ErrConnDone = errors.New("database/sql: connection is already closed") var ErrConnDone = errors.New("database/sql: connection is already closed")
// Conn returns a single connection by either opening a new connection // Conn returns a single connection by either opening a new connection
@ -1527,9 +1527,9 @@ func (db *DB) Conn(ctx context.Context) (*Conn, error) {
type releaseConn func(error) type releaseConn func(error)
// Conn represents a single database session rather than a pool of database // Conn represents a single database connection rather than a pool of database
// sessions. Prefer running queries from DB unless there is a specific // connections. Prefer running queries from DB unless there is a specific
// need for a continuous single database session. // need for a continuous single database connection.
// //
// A Conn must call Close to return the connection to the database pool // A Conn must call Close to return the connection to the database pool
// and may do so concurrently with a running query. // and may do so concurrently with a running query.
@ -1893,6 +1893,9 @@ func (tx *Tx) Prepare(query string) (*Stmt, error) {
// ... // ...
// res, err := tx.StmtContext(ctx, updateMoney).Exec(123.45, 98293203) // res, err := tx.StmtContext(ctx, updateMoney).Exec(123.45, 98293203)
// //
// The provided context is used for the preparation of the statement, not for the
// execution of the statement.
//
// The returned statement operates within the transaction and will be closed // The returned statement operates within the transaction and will be closed
// when the transaction has been committed or rolled back. // when the transaction has been committed or rolled back.
func (tx *Tx) StmtContext(ctx context.Context, stmt *Stmt) *Stmt { func (tx *Tx) StmtContext(ctx context.Context, stmt *Stmt) *Stmt {