From 6bfaafd3c34325515e8ffbe7446b9beda3f49698 Mon Sep 17 00:00:00 2001 From: apocelipes Date: Fri, 29 Mar 2024 20:09:37 +0000 Subject: database/sql: use slices to simplify the code Change-Id: Ia198272330626271ee7d4e1ae46afca819ab2933 GitHub-Last-Rev: e713ac31638671f60cc3cf62fa514f784e834e66 GitHub-Pull-Request: golang/go#66572 Reviewed-on: https://go-review.googlesource.com/c/go/+/574995 Reviewed-by: Emmanuel Odeke Reviewed-by: Ian Lance Taylor Auto-Submit: Ian Lance Taylor Reviewed-by: Than McIntosh LUCI-TryBot-Result: Go LUCI Reviewed-by: qiulaidongfeng <2645477756@qq.com> --- src/database/sql/sql.go | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'src/database/sql/sql.go') diff --git a/src/database/sql/sql.go b/src/database/sql/sql.go index 36995a1059..5b4a3f5409 100644 --- a/src/database/sql/sql.go +++ b/src/database/sql/sql.go @@ -24,7 +24,7 @@ import ( "math/rand/v2" "reflect" "runtime" - "sort" + "slices" "strconv" "sync" "sync/atomic" @@ -69,7 +69,7 @@ func Drivers() []string { for name := range drivers { list = append(list, name) } - sort.Strings(list) + slices.Sort(list) return list } @@ -3452,10 +3452,8 @@ func (r *Row) Scan(dest ...any) error { // they were obtained from the network anyway) But for now we // don't care. defer r.rows.Close() - for _, dp := range dest { - if _, ok := dp.(*RawBytes); ok { - return errors.New("sql: RawBytes isn't allowed on Row.Scan") - } + if scanArgsContainRawBytes(dest) { + return errors.New("sql: RawBytes isn't allowed on Row.Scan") } if !r.rows.Next() { -- cgit v1.3