fix issue #2356

gogf · Feb 7, 2023 · 559c1ab · 559c1ab
1 parent b7badf5
commit 559c1ab
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 15 deletions.
diff --git a/database/gdb/gdb_core_underlying.go b/database/gdb/gdb_core_underlying.go
@@ -410,20 +410,21 @@ func (c *Core) RowsToResult(ctx context.Context, rows *sql.Rows) (Result, error)
 }
 
 func (c *Core) columnValueToLocalValue(ctx context.Context, value interface{}, columnType *sql.ColumnType) (interface{}, error) {
-	switch columnType.ScanType().Kind() {
-	case
+	var scanType = columnType.ScanType()
+	if scanType != nil {
 		// Common basic builtin types.
-		reflect.Bool,
-		reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64,
-		reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64,
-		reflect.Float32, reflect.Float64:
-		return gconv.Convert(
-			gconv.String(value),
-			columnType.ScanType().String(),
-		), nil
-
-	default:
-		// Other complex types, especially custom types.
-		return c.db.ConvertValueForLocal(ctx, columnType.DatabaseTypeName(), value)
+		switch scanType.Kind() {
+		case
+			reflect.Bool,
+			reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64,
+			reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64,
+			reflect.Float32, reflect.Float64:
+			return gconv.Convert(
+				gconv.String(value),
+				columnType.ScanType().String(),
+			), nil
+		}
 	}
+	// Other complex types, especially custom types.
+	return c.db.ConvertValueForLocal(ctx, columnType.DatabaseTypeName(), value)
 }
diff --git a/util/gconv/gconv_struct.go b/util/gconv/gconv_struct.go
@@ -382,7 +382,7 @@ func bindVarToStructAttr(structReflectValue reflect.Value, attrName string, valu
 }
 
 // bindVarToReflectValueWithInterfaceCheck does bind using common interfaces checks.
-func bindVarToReflectValueWithInterfaceCheck(reflectValue reflect.Value, value interface{}) (err error, ok bool) {
+func bindVarToReflectValueWithInterfaceCheck(reflectValue reflect.Value, value interface{}) (error, bool) {
 	var pointer interface{}
 	if reflectValue.Kind() != reflect.Ptr && reflectValue.CanAddr() {
 		reflectValueAddr := reflectValue.Addr()