diff --git a/src/database/sql/convert.go b/src/database/sql/convert.go index cca5d15e07005f..b291c1557c7ab6 100644 --- a/src/database/sql/convert.go +++ b/src/database/sql/convert.go @@ -192,7 +192,7 @@ func driverArgsConnLocked(ci driver.Conn, ds *driverStmt, args []any) ([]driver. } goto nextCheck default: - return nil, fmt.Errorf("sql: converting argument %s type: %v", describeNamedValue(nv), err) + return nil, fmt.Errorf("sql: converting argument %s type: %w", describeNamedValue(nv), err) } } diff --git a/src/database/sql/driver/types.go b/src/database/sql/driver/types.go index 0380572ab19791..a322f85277c6d4 100644 --- a/src/database/sql/driver/types.go +++ b/src/database/sql/driver/types.go @@ -34,6 +34,10 @@ type ValueConverter interface { // Valuer is the interface providing the Value method. // +// Errors returned by the [Value] method are wrapped by the database/sql package. +// This allows callers to use [errors.Is] for precise error handling after operations +// like [database/sql.Query], [database/sql.Exec], or [database/sql.QueryRow]. +// // Types implementing Valuer interface are able to convert // themselves to a driver [Value]. type Valuer interface { diff --git a/src/database/sql/sql_test.go b/src/database/sql/sql_test.go index c38a348ab4f88f..eb4e22fcd8d974 100644 --- a/src/database/sql/sql_test.go +++ b/src/database/sql/sql_test.go @@ -4398,6 +4398,49 @@ func TestRowsScanProperlyWrapsErrors(t *testing.T) { } } +type alwaysErrValuer struct{} + +// errEmpty is returned when an empty value is found +var errEmpty = errors.New("empty value") + +func (v alwaysErrValuer) Value() (driver.Value, error) { + return nil, errEmpty +} + +// Issue 64707: Ensure that Stmt.Exec and Stmt.Query properly wraps underlying errors. +func TestDriverArgsWrapsErrors(t *testing.T) { + db := newTestDB(t, "people") + defer closeDB(t, db) + + t.Run("exec", func(t *testing.T) { + _, err := db.Exec("INSERT|keys|dec1=?", alwaysErrValuer{}) + if err == nil { + t.Fatal("expecting back an error") + } + if !errors.Is(err, errEmpty) { + t.Fatalf("errors.Is mismatch\n%v\nWant: %v", err, errEmpty) + } + // Ensure that error substring matching still correctly works. + if !strings.Contains(err.Error(), errEmpty.Error()) { + t.Fatalf("Error %v does not contain %v", err, errEmpty) + } + }) + + t.Run("query", func(t *testing.T) { + _, err := db.Query("INSERT|keys|dec1=?", alwaysErrValuer{}) + if err == nil { + t.Fatal("expecting back an error") + } + if !errors.Is(err, errEmpty) { + t.Fatalf("errors.Is mismatch\n%v\nWant: %v", err, errEmpty) + } + // Ensure that error substring matching still correctly works. + if !strings.Contains(err.Error(), errEmpty.Error()) { + t.Fatalf("Error %v does not contain %v", err, errEmpty) + } + }) +} + func TestContextCancelDuringRawBytesScan(t *testing.T) { for _, mode := range []string{"nocancel", "top", "bottom", "go"} { t.Run(mode, func(t *testing.T) {