cybercyst/go
1
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-05-29 11:25:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

database/sql: rename ErrTransactionFinished to ErrTxDone

Browse Source 
Part of issue 2843

R=golang-dev, gri
CC=golang-dev
https://golang.org/cl/5646063
This commit is contained in:
Brad Fitzpatrick 2012-02-10 09:12:32 +11:00
parent bb40196ebf
commit 00651a2e63
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/pkg/database/sql/sql.go
View File

@ -368,7 +368,7 @@ func (db *DB) Begin() (*Tx, error) {
}, nil }, nil
} }
// DriverDatabase returns the database's underlying driver. // Driver returns the database's underlying driver.
func (db *DB) Driver() driver.Driver { func (db *DB) Driver() driver.Driver {
return db.driver return db.driver
} }
@ -378,7 +378,7 @@ func (db *DB) Driver() driver.Driver {
// A transaction must end with a call to Commit or Rollback. // A transaction must end with a call to Commit or Rollback.
// //
// After a call to Commit or Rollback, all operations on the // After a call to Commit or Rollback, all operations on the
// transaction fail with ErrTransactionFinished. // transaction fail with ErrTxDone.
type Tx struct { type Tx struct {
db *DB db *DB
@ -393,11 +393,11 @@ type Tx struct {
// done transitions from false to true exactly once, on Commit // done transitions from false to true exactly once, on Commit
// or Rollback. once done, all operations fail with // or Rollback. once done, all operations fail with
// ErrTransactionFinished. // ErrTxDone.
done bool done bool
} }
var ErrTransactionFinished = errors.New("sql: Transaction has already been committed or rolled back") var ErrTxDone = errors.New("sql: Transaction has already been committed or rolled back")
func (tx *Tx) close() { func (tx *Tx) close() {
if tx.done { if tx.done {
@ -411,7 +411,7 @@ func (tx *Tx) close() {
func (tx *Tx) grabConn() (driver.Conn, error) { func (tx *Tx) grabConn() (driver.Conn, error) {
if tx.done { if tx.done {
return nil, ErrTransactionFinished return nil, ErrTxDone
} }
tx.cimu.Lock() tx.cimu.Lock()
return tx.ci, nil return tx.ci, nil
@ -424,7 +424,7 @@ func (tx *Tx) releaseConn() {
// Commit commits the transaction. // Commit commits the transaction.
func (tx *Tx) Commit() error { func (tx *Tx) Commit() error {
if tx.done { if tx.done {
return ErrTransactionFinished return ErrTxDone
} }
defer tx.close() defer tx.close()
return tx.txi.Commit() return tx.txi.Commit()
@ -433,7 +433,7 @@ func (tx *Tx) Commit() error {
// Rollback aborts the transaction. // Rollback aborts the transaction.
func (tx *Tx) Rollback() error { func (tx *Tx) Rollback() error {
if tx.done { if tx.done {
return ErrTransactionFinished return ErrTxDone
} }
defer tx.close() defer tx.close()
return tx.txi.Rollback() return tx.txi.Rollback()
@ -550,7 +550,7 @@ func (tx *Tx) Exec(query string, args ...interface{}) (Result, error) {
// Query executes a query that returns rows, typically a SELECT. // Query executes a query that returns rows, typically a SELECT.
func (tx *Tx) Query(query string, args ...interface{}) (*Rows, error) { func (tx *Tx) Query(query string, args ...interface{}) (*Rows, error) {
if tx.done { if tx.done {
return nil, ErrTransactionFinished return nil, ErrTxDone
} }
stmt, err := tx.Prepare(query) stmt, err := tx.Prepare(query)
if err != nil { if err != nil {