aboutsummaryrefslogtreecommitdiff
path: root/src/database/sql
diff options
context:
space:
mode:
Diffstat (limited to 'src/database/sql')
-rw-r--r--src/database/sql/convert.go12
1 files changed, 5 insertions, 7 deletions
diff --git a/src/database/sql/convert.go b/src/database/sql/convert.go
index b79ec3f7b2..92a2ebe0e9 100644
--- a/src/database/sql/convert.go
+++ b/src/database/sql/convert.go
@@ -379,10 +379,9 @@ func convertAssign(dest, src interface{}) error {
if src == nil {
dv.Set(reflect.Zero(dv.Type()))
return nil
- } else {
- dv.Set(reflect.New(dv.Type().Elem()))
- return convertAssign(dv.Interface(), src)
}
+ dv.Set(reflect.New(dv.Type().Elem()))
+ return convertAssign(dv.Interface(), src)
case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
s := asString(src)
i64, err := strconv.ParseInt(s, 10, dv.Type().Bits())
@@ -434,11 +433,10 @@ func strconvErr(err error) error {
func cloneBytes(b []byte) []byte {
if b == nil {
return nil
- } else {
- c := make([]byte, len(b))
- copy(c, b)
- return c
}
+ c := make([]byte, len(b))
+ copy(c, b)
+ return c
}
func asString(src interface{}) string {