diff options
| author | zeripath <art27@cantab.net> | 2021-09-23 16:45:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-23 23:45:36 +0800 |
| commit | 9302eba971611601c3ebf6024e22a11c63f4e151 (patch) | |
| tree | a3e5583986161ef62e7affc694098279ecf2217d /models/action_list.go | |
| parent | b22be7f594401d7bd81196750456ce52185bd391 (diff) | |
| download | gitea-9302eba971611601c3ebf6024e22a11c63f4e151.tar.gz gitea-9302eba971611601c3ebf6024e22a11c63f4e151.zip | |
DBContext is just a Context (#17100)
* DBContext is just a Context
This PR removes some of the specialness from the DBContext and makes it context
This allows us to simplify the GetEngine code to wrap around any context in future
and means that we can change our loadRepo(e Engine) functions to simply take contexts.
Signed-off-by: Andrew Thornton <art27@cantab.net>
* fix unit tests
Signed-off-by: Andrew Thornton <art27@cantab.net>
* another place that needs to set the initial context
Signed-off-by: Andrew Thornton <art27@cantab.net>
* avoid race
Signed-off-by: Andrew Thornton <art27@cantab.net>
* change attachment error
Signed-off-by: Andrew Thornton <art27@cantab.net>
Diffstat (limited to 'models/action_list.go')
| -rw-r--r-- | models/action_list.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/models/action_list.go b/models/action_list.go index a0ceef6bee..69e6aa7312 100644 --- a/models/action_list.go +++ b/models/action_list.go @@ -45,7 +45,7 @@ func (actions ActionList) loadUsers(e db.Engine) ([]*User, error) { // LoadUsers loads actions' all users func (actions ActionList) LoadUsers() ([]*User, error) { - return actions.loadUsers(db.DefaultContext().Engine()) + return actions.loadUsers(db.GetEngine(db.DefaultContext)) } func (actions ActionList) getRepoIDs() []int64 { @@ -80,7 +80,7 @@ func (actions ActionList) loadRepositories(e db.Engine) ([]*Repository, error) { // LoadRepositories loads actions' all repositories func (actions ActionList) LoadRepositories() ([]*Repository, error) { - return actions.loadRepositories(db.DefaultContext().Engine()) + return actions.loadRepositories(db.GetEngine(db.DefaultContext)) } // loadAttributes loads all attributes @@ -98,5 +98,5 @@ func (actions ActionList) loadAttributes(e db.Engine) (err error) { // LoadAttributes loads attributes of the actions func (actions ActionList) LoadAttributes() error { - return actions.loadAttributes(db.DefaultContext().Engine()) + return actions.loadAttributes(db.GetEngine(db.DefaultContext)) } |