diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2022-11-12 21:18:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-12 21:18:50 +0100 |
| commit | 34283a74e85278fed2c9b70d6f8749dc6a4001ca (patch) | |
| tree | f8fa43399cb723d55efc34dacf7947faf0ed5acf /models/activities | |
| parent | Add some documentation to packages (#21648) (diff) | |
| download | forgejo-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 'models/activities')
| -rw-r--r-- | models/activities/action.go | 2 | ||||
| -rw-r--r-- | models/activities/notification.go | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/models/activities/action.go b/models/activities/action.go index cad3263c2d..5c3419c5ec 100644 --- a/models/activities/action.go +++ b/models/activities/action.go @@ -572,7 +572,7 @@ func NotifyWatchers(actions ...*Action) error { // NotifyWatchersActions creates batch of actions for every watcher. func NotifyWatchersActions(acts []*Action) error { - ctx, committer, err := db.TxContext() + ctx, committer, err := db.TxContext(db.DefaultContext) if err != nil { return err } diff --git a/models/activities/notification.go b/models/activities/notification.go index 5748b807a0..28adc8cc4e 100644 --- a/models/activities/notification.go +++ b/models/activities/notification.go @@ -142,7 +142,7 @@ func CountNotifications(opts *FindNotificationOptions) (int64, error) { // CreateRepoTransferNotification creates notification for the user a repository was transferred to func CreateRepoTransferNotification(doer, newOwner *user_model.User, repo *repo_model.Repository) error { - ctx, committer, err := db.TxContext() + ctx, committer, err := db.TxContext(db.DefaultContext) if err != nil { return err } @@ -185,7 +185,7 @@ func CreateRepoTransferNotification(doer, newOwner *user_model.User, repo *repo_ // for each watcher, or updates it if already exists // receiverID > 0 just send to receiver, else send to all watcher func CreateOrUpdateIssueNotifications(issueID, commentID, notificationAuthorID, receiverID int64) error { - ctx, committer, err := db.TxContext() + ctx, committer, err := db.TxContext(db.DefaultContext) if err != nil { return err } |