From 4cc09cd5320a2bea4f27a1db59970d4b715f6522 Mon Sep 17 00:00:00 2001 From: Frédéric Guillot Date: Wed, 25 Jul 2018 16:36:11 -0700 Subject: database/sql: fix driverStmt.Close() comment typo Change-Id: I2256c850e071882b00c362da03abc8b021c1ec2a Reviewed-on: https://go-review.googlesource.com/126015 Reviewed-by: Brad Fitzpatrick --- src/database/sql/sql.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/database/sql') diff --git a/src/database/sql/sql.go b/src/database/sql/sql.go index 1e7a989089..36179855db 100644 --- a/src/database/sql/sql.go +++ b/src/database/sql/sql.go @@ -540,7 +540,7 @@ type driverStmt struct { closeErr error // return value of previous Close call } -// Close ensures dirver.Stmt is only closed once any always returns the same +// Close ensures driver.Stmt is only closed once and always returns the same // result. func (ds *driverStmt) Close() error { ds.Lock() -- cgit v1.3 From 5ed30d82b7ad4d5be12db588f088c34f8c1c0a86 Mon Sep 17 00:00:00 2001 From: Alexey Palazhchenko Date: Mon, 3 Sep 2018 16:24:12 +0000 Subject: database/sql: fix Rows.Columns() documentation Fixes #27202 Change-Id: I83620748a81500e433795c7b2b7f13399d17f777 GitHub-Last-Rev: 64457e12ceaa408efc7f75091f1b30c35b8e5d44 GitHub-Pull-Request: golang/go#27472 Reviewed-on: https://go-review.googlesource.com/133057 Reviewed-by: Daniel Theophanes --- src/database/sql/sql.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/database/sql') diff --git a/src/database/sql/sql.go b/src/database/sql/sql.go index 36179855db..7537f87d47 100644 --- a/src/database/sql/sql.go +++ b/src/database/sql/sql.go @@ -2735,8 +2735,7 @@ func (rs *Rows) Err() error { } // Columns returns the column names. -// Columns returns an error if the rows are closed, or if the rows -// are from QueryRow and there was a deferred error. +// Columns returns an error if the rows are closed. func (rs *Rows) Columns() ([]string, error) { rs.closemu.RLock() defer rs.closemu.RUnlock() -- cgit v1.3