From 21680959f81cd7577a524b960c9b65ce87fa608f Mon Sep 17 00:00:00 2001 From: Jinzhu Date: Fri, 13 May 2022 23:11:16 +0000 Subject: [PATCH] database/sql: follow convention for field naming Change-Id: I161072698dad8f184b46c6e627bbfbcb18a1b5c6 GitHub-Last-Rev: 7c8d2412806e6017e7129a5535adace396e6be30 GitHub-Pull-Request: golang/go#52770 Reviewed-on: https://go-review.googlesource.com/c/go/+/404934 Reviewed-by: Ian Lance Taylor Run-TryBot: Ian Lance Taylor Auto-Submit: Ian Lance Taylor Reviewed-by: Dmitri Shuralyov TryBot-Result: Gopher Robot --- src/database/sql/sql.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/database/sql/sql.go b/src/database/sql/sql.go index f408a34234..04897b3360 100644 --- a/src/database/sql/sql.go +++ b/src/database/sql/sql.go @@ -79,7 +79,7 @@ func Drivers() []string { // For a more concise way to create NamedArg values, see // the Named function. type NamedArg struct { - _Named_Fields_Required struct{} + _NamedFieldsRequired struct{} // Name is the name of the parameter placeholder. // @@ -423,7 +423,7 @@ type Scanner interface { // var outArg string // _, err := db.ExecContext(ctx, "ProcName", sql.Named("Arg1", sql.Out{Dest: &outArg})) type Out struct { - _Named_Fields_Required struct{} + _NamedFieldsRequired struct{} // Dest is a pointer to the value that will be set to the result of the // stored procedure's OUTPUT parameter. @@ -721,7 +721,6 @@ func (db *DB) removeDep(x finalCloser, dep any) error { } func (db *DB) removeDepLocked(x finalCloser, dep any) func() error { - xdep, ok := db.dep[x] if !ok { panic(fmt.Sprintf("unpaired removeDep: no deps for %T", x)) -- 2.50.0