From 34283a74e85278fed2c9b70d6f8749dc6a4001ca Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Sun, 13 Nov 2022 04:18:50 +0800 Subject: 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 Co-authored-by: 6543 <6543@obermui.de> --- models/user/setting.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'models/user/setting.go') diff --git a/models/user/setting.go b/models/user/setting.go index 896f3c8da1..41de499de9 100644 --- a/models/user/setting.go +++ b/models/user/setting.go @@ -163,7 +163,7 @@ func SetUserSetting(userID int64, key, value string) error { } func upsertUserSettingValue(userID int64, key, value string) error { - return db.WithTx(func(ctx context.Context) error { + return db.WithTx(db.DefaultContext, func(ctx context.Context) error { e := db.GetEngine(ctx) // here we use a general method to do a safe upsert for different databases (and most transaction levels) -- cgit v1.2.3