aboutsummaryrefslogtreecommitdiff
path: root/src/database/sql/driver
diff options
context:
space:
mode:
Diffstat (limited to 'src/database/sql/driver')
-rw-r--r--src/database/sql/driver/driver.go2
-rw-r--r--src/database/sql/driver/types.go18
-rw-r--r--src/database/sql/driver/types_test.go4
3 files changed, 12 insertions, 12 deletions
diff --git a/src/database/sql/driver/driver.go b/src/database/sql/driver/driver.go
index ea1de5a8fb..5342315d12 100644
--- a/src/database/sql/driver/driver.go
+++ b/src/database/sql/driver/driver.go
@@ -58,7 +58,7 @@ import (
// in this package. This is used, for example, when a user selects a cursor
// such as "select cursor(select * from my_table) from dual". If the Rows
// from the select is closed, the cursor Rows will also be closed.
-type Value interface{}
+type Value any
// NamedValue holds both the value name and value.
type NamedValue struct {
diff --git a/src/database/sql/driver/types.go b/src/database/sql/driver/types.go
index 3337c2e0bc..506ce6c2cd 100644
--- a/src/database/sql/driver/types.go
+++ b/src/database/sql/driver/types.go
@@ -29,7 +29,7 @@ import (
// to a user's type in a scan.
type ValueConverter interface {
// ConvertValue converts a value to a driver Value.
- ConvertValue(v interface{}) (Value, error)
+ ConvertValue(v any) (Value, error)
}
// Valuer is the interface providing the Value method.
@@ -60,7 +60,7 @@ var _ ValueConverter = boolType{}
func (boolType) String() string { return "Bool" }
-func (boolType) ConvertValue(src interface{}) (Value, error) {
+func (boolType) ConvertValue(src any) (Value, error) {
switch s := src.(type) {
case bool:
return s, nil
@@ -105,7 +105,7 @@ type int32Type struct{}
var _ ValueConverter = int32Type{}
-func (int32Type) ConvertValue(v interface{}) (Value, error) {
+func (int32Type) ConvertValue(v any) (Value, error) {
rv := reflect.ValueOf(v)
switch rv.Kind() {
case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
@@ -138,7 +138,7 @@ var String stringType
type stringType struct{}
-func (stringType) ConvertValue(v interface{}) (Value, error) {
+func (stringType) ConvertValue(v any) (Value, error) {
switch v.(type) {
case string, []byte:
return v, nil
@@ -152,7 +152,7 @@ type Null struct {
Converter ValueConverter
}
-func (n Null) ConvertValue(v interface{}) (Value, error) {
+func (n Null) ConvertValue(v any) (Value, error) {
if v == nil {
return nil, nil
}
@@ -165,7 +165,7 @@ type NotNull struct {
Converter ValueConverter
}
-func (n NotNull) ConvertValue(v interface{}) (Value, error) {
+func (n NotNull) ConvertValue(v any) (Value, error) {
if v == nil {
return nil, fmt.Errorf("nil value not allowed")
}
@@ -173,7 +173,7 @@ func (n NotNull) ConvertValue(v interface{}) (Value, error) {
}
// IsValue reports whether v is a valid Value parameter type.
-func IsValue(v interface{}) bool {
+func IsValue(v any) bool {
if v == nil {
return true
}
@@ -188,7 +188,7 @@ func IsValue(v interface{}) bool {
// IsScanValue is equivalent to IsValue.
// It exists for compatibility.
-func IsScanValue(v interface{}) bool {
+func IsScanValue(v any) bool {
return IsValue(v)
}
@@ -233,7 +233,7 @@ func callValuerValue(vr Valuer) (v Value, err error) {
return vr.Value()
}
-func (defaultConverter) ConvertValue(v interface{}) (Value, error) {
+func (defaultConverter) ConvertValue(v any) (Value, error) {
if IsValue(v) {
return v, nil
}
diff --git a/src/database/sql/driver/types_test.go b/src/database/sql/driver/types_test.go
index 4c2996da85..80e5e05469 100644
--- a/src/database/sql/driver/types_test.go
+++ b/src/database/sql/driver/types_test.go
@@ -12,8 +12,8 @@ import (
type valueConverterTest struct {
c ValueConverter
- in interface{}
- out interface{}
+ in any
+ out any
err string
}