summaryrefslogtreecommitdiffstats
path: root/services/user/user.go
diff options
context:
space:
mode:
authorLunny Xiao <xiaolunwen@gmail.com>2022-11-12 21:18:50 +0100
committerGitHub <noreply@github.com>2022-11-12 21:18:50 +0100
commit34283a74e85278fed2c9b70d6f8749dc6a4001ca (patch)
treef8fa43399cb723d55efc34dacf7947faf0ed5acf /services/user/user.go
parentAdd some documentation to packages (#21648) (diff)
downloadforgejo-34283a74e85278fed2c9b70d6f8749dc6a4001ca.tar.xz
forgejo-34283a74e85278fed2c9b70d6f8749dc6a4001ca.zip
Allow detect whether it's in a database transaction for a context.Context (#21756)
Fix #19513 This PR introduce a new db method `InTransaction(context.Context)`, and also builtin check on `db.TxContext` and `db.WithTx`. There is also a new method `db.AutoTx` has been introduced but could be used by other PRs. `WithTx` will always open a new transaction, if a transaction exist in context, return an error. `AutoTx` will try to open a new transaction if no transaction exist in context. That means it will always enter a transaction if there is no error. Co-authored-by: delvh <dev.lh@web.de> Co-authored-by: 6543 <6543@obermui.de>
Diffstat (limited to '')
-rw-r--r--services/user/user.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/services/user/user.go b/services/user/user.go
index c8b497a5c4..4186efe682 100644
--- a/services/user/user.go
+++ b/services/user/user.go
@@ -132,7 +132,7 @@ func DeleteUser(ctx context.Context, u *user_model.User, purge bool) error {
}
}
- ctx, committer, err := db.TxContext()
+ ctx, committer, err := db.TxContext(db.DefaultContext)
if err != nil {
return err
}
@@ -235,7 +235,7 @@ func UploadAvatar(u *user_model.User, data []byte) error {
return err
}
- ctx, committer, err := db.TxContext()
+ ctx, committer, err := db.TxContext(db.DefaultContext)
if err != nil {
return err
}