optimize

Author: hwbrzzl

database/db/row.go

@@ -134,7 +134,7 @@ func ToScannerHookFunc() mapstructure.DecodeHookFunc {
 
 		// Call the Scan method with the data
 		if err := scanner.Scan(scanData); err != nil {
-			return data, err
+			return nil, err
 		}
 
 		return result.Elem().Interface(), nil
@@ -159,7 +159,7 @@ func ToSliceHookFunc() mapstructure.DecodeHookFunc {
 
 		result := reflect.New(t).Interface()
 		if err := json.Unmarshal([]byte(str), result); err != nil {
-			return data, nil
+			return nil, err
 		}
 
 		return reflect.ValueOf(result).Elem().Interface(), nil
@@ -184,7 +184,7 @@ func ToMapHookFunc() mapstructure.DecodeHookFunc {
 
 		result := reflect.MakeMap(t).Interface()
 		if err := json.Unmarshal([]byte(str), &result); err != nil {
-			return data, nil
+			return nil, err
 		}
 
 		return result, nil

tests/query_test.go

@@ -2,7 +2,6 @@ package tests
 
 import (
 	"context"
-	"database/sql/driver"
 	"encoding/json"
 	"fmt"
 	"strconv"
@@ -763,11 +762,6 @@ type ResultData struct {
 	}
 }
 
-func (r *ResultData) Value() (driver.Value, error) {
-	bytes, err := json.Marshal(r)
-	return string(bytes), err
-}
-
 func (r *ResultData) Scan(value any) (err error) {
 	if data, ok := value.([]byte); ok && len(data) > 0 {
 		err = json.Unmarshal(data, &r)