Commit 7162c4d0 authored by Tamir Duberstein's avatar Tamir Duberstein Committed by Brad Fitzpatrick

database/sql/driver: remove string exclusion

The exclusion of string from IsScanValue prevents driver authors from
writing their drivers in such a way that would allow users to
distinguish between strings and byte arrays returned from a database.
Such drivers are possible today, but require their authors to deviate
from the guidance provided by the standard library.

This exclusion has been in place since the birth of this package in
https://github.com/golang/go/commit/357f2cb1a385f4d1418e48856f9abe0cce,
but the fakedb implementation shipped in the same commit violates the
exclusion!

Strictly speaking this is a breaking change, but it increases the set
of permissible Scan types, and should not cause breakage in practice.

No test changes are necessary because fakedb already exercises this.

Fixes #6497.

Change-Id: I69dbd3a59d90464bcae8c852d7ec6c97bfd120f8
Reviewed-on: https://go-review.googlesource.com/19439
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: default avatarBrad Fitzpatrick <bradfitz@golang.org>
parent bac0005e
...@@ -17,7 +17,7 @@ import "errors" ...@@ -17,7 +17,7 @@ import "errors"
// float64 // float64
// bool // bool
// []byte // []byte
// string [*] everywhere except from Rows.Next. // string
// time.Time // time.Time
type Value interface{} type Value interface{}
...@@ -165,10 +165,6 @@ type Rows interface { ...@@ -165,10 +165,6 @@ type Rows interface {
// the provided slice. The provided slice will be the same // the provided slice. The provided slice will be the same
// size as the Columns() are wide. // size as the Columns() are wide.
// //
// The dest slice may be populated only with
// a driver Value type, but excluding string.
// All string values must be converted to []byte.
//
// Next should return io.EOF when there are no more rows. // Next should return io.EOF when there are no more rows.
Next(dest []Value) error Next(dest []Value) error
} }
......
...@@ -172,28 +172,21 @@ func (n NotNull) ConvertValue(v interface{}) (Value, error) { ...@@ -172,28 +172,21 @@ func (n NotNull) ConvertValue(v interface{}) (Value, error) {
} }
// IsValue reports whether v is a valid Value parameter type. // IsValue reports whether v is a valid Value parameter type.
// Unlike IsScanValue, IsValue permits the string type.
func IsValue(v interface{}) bool { func IsValue(v interface{}) bool {
if IsScanValue(v) { if v == nil {
return true return true
} }
if _, ok := v.(string); ok { switch v.(type) {
case []byte, bool, float64, int64, string, time.Time:
return true return true
} }
return false return false
} }
// IsScanValue reports whether v is a valid Value scan type. // IsScanValue is equivalent to IsValue.
// Unlike IsValue, IsScanValue does not permit the string type. // It exists for compatibility.
func IsScanValue(v interface{}) bool { func IsScanValue(v interface{}) bool {
if v == nil { return IsValue(v)
return true
}
switch v.(type) {
case int64, float64, []byte, bool, time.Time:
return true
}
return false
} }
// DefaultParameterConverter is the default implementation of // DefaultParameterConverter is the default implementation of
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment