apps/redka
1
0
Fork 0
mirror of https://github.com/nalgeon/redka.git synced 2025-10-29 10:32:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: sqlx - delete TypedError

Browse Source
This commit is contained in:
Anton
2024-04-28 08:49:25 +05:00
parent c6bdaf08a2
commit 1b55ad8652
6 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/rhash/tx.go
View File

@@ -453,7 +453,7 @@ func (tx *Tx) set(key string, field string, value any) error {
} }
_, err := tx.tx.Exec(sqlSet, args...) _, err := tx.tx.Exec(sqlSet, args...)
if err != nil { if err != nil {
return sqlx.TypedError(err) return err
} }
return nil return nil
} }

4
internal/rstring/tx.go
View File

@@ -239,7 +239,7 @@ func set(tx sqlx.Tx, key string, value any, at time.Time) error {
} }
_, err := tx.Exec(sqlSet, args...) _, err := tx.Exec(sqlSet, args...)
if err != nil { if err != nil {
return sqlx.TypedError(err) return err
} }
return nil return nil
} }
@@ -260,7 +260,7 @@ func update(tx sqlx.Tx, key string, value any) error {
} }
_, err := tx.Exec(sqlUpdate, args...) _, err := tx.Exec(sqlUpdate, args...)
if err != nil { if err != nil {
return sqlx.TypedError(err) return err
} }
return nil return nil
} }

2
internal/rzset/inter.go
View File

@@ -181,7 +181,7 @@ func (c InterCmd) store(tx sqlx.Tx) (int, error) {
res, err := tx.Exec(query, args...) res, err := tx.Exec(query, args...)
if err != nil { if err != nil {
return 0, sqlx.TypedError(err) return 0, err
} }
// Return the number of elements in the resulting set. // Return the number of elements in the resulting set.

4
internal/rzset/tx.go
View File

@@ -241,7 +241,7 @@ func (tx *Tx) Incr(key string, elem any, delta float64) (float64, error) {
} }
_, err := tx.tx.Exec(sqlIncr1, args...) _, err := tx.tx.Exec(sqlIncr1, args...)
if err != nil { if err != nil {
return 0, sqlx.TypedError(err) return 0, err
} }
var score float64 var score float64
@@ -373,7 +373,7 @@ func (tx *Tx) add(key string, elem any, score float64) error {
_, err := tx.tx.Exec(sqlAdd, args...) _, err := tx.tx.Exec(sqlAdd, args...)
if err != nil { if err != nil {
return sqlx.TypedError(err) return err
} }
return nil return nil
} }

2
internal/rzset/union.go
View File

@@ -176,7 +176,7 @@ func (c UnionCmd) store(tx sqlx.Tx) (int, error) {
res, err := tx.Exec(query, args...) res, err := tx.Exec(query, args...)
if err != nil { if err != nil {
return 0, sqlx.TypedError(err) return 0, err
} }
// Return the number of elements in the resulting set. // Return the number of elements in the resulting set.

5
internal/sqlx/sql.go
View File

@@ -67,8 +67,3 @@ func Select[T any](db Tx, query string, args []any,
return vals, err return vals, err
} }
// Returns typed errors for some specific cases.
func TypedError(err error) error {
return err
}