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/project.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/project.go')
| -rw-r--r-- | models/project.go | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/models/project.go b/models/project.go index 1e520b877e..8aaff50e15 100644 --- a/models/project.go +++ b/models/project.go @@ -90,7 +90,7 @@ type ProjectSearchOptions struct { // GetProjects returns a list of all projects that have been created in the repository func GetProjects(opts ProjectSearchOptions) ([]*Project, int64, error) { - return getProjects(db.DefaultContext().Engine(), opts) + return getProjects(db.GetEngine(db.DefaultContext), opts) } func getProjects(e db.Engine, opts ProjectSearchOptions) ([]*Project, int64, error) { @@ -143,7 +143,7 @@ func NewProject(p *Project) error { return errors.New("project type is not valid") } - sess := db.DefaultContext().NewSession() + sess := db.NewSession(db.DefaultContext) defer sess.Close() if err := sess.Begin(); err != nil { @@ -167,7 +167,7 @@ func NewProject(p *Project) error { // GetProjectByID returns the projects in a repository func GetProjectByID(id int64) (*Project, error) { - return getProjectByID(db.DefaultContext().Engine(), id) + return getProjectByID(db.GetEngine(db.DefaultContext), id) } func getProjectByID(e db.Engine, id int64) (*Project, error) { @@ -185,7 +185,7 @@ func getProjectByID(e db.Engine, id int64) (*Project, error) { // UpdateProject updates project properties func UpdateProject(p *Project) error { - return updateProject(db.DefaultContext().Engine(), p) + return updateProject(db.GetEngine(db.DefaultContext), p) } func updateProject(e db.Engine, p *Project) error { @@ -220,7 +220,7 @@ func updateRepositoryProjectCount(e db.Engine, repoID int64) error { // ChangeProjectStatusByRepoIDAndID toggles a project between opened and closed func ChangeProjectStatusByRepoIDAndID(repoID, projectID int64, isClosed bool) error { - sess := db.DefaultContext().NewSession() + sess := db.NewSession(db.DefaultContext) defer sess.Close() if err := sess.Begin(); err != nil { return err @@ -244,7 +244,7 @@ func ChangeProjectStatusByRepoIDAndID(repoID, projectID int64, isClosed bool) er // ChangeProjectStatus toggle a project between opened and closed func ChangeProjectStatus(p *Project, isClosed bool) error { - sess := db.DefaultContext().NewSession() + sess := db.NewSession(db.DefaultContext) defer sess.Close() if err := sess.Begin(); err != nil { return err @@ -273,7 +273,7 @@ func changeProjectStatus(e db.Engine, p *Project, isClosed bool) error { // DeleteProjectByID deletes a project from a repository. func DeleteProjectByID(id int64) error { - sess := db.DefaultContext().NewSession() + sess := db.NewSession(db.DefaultContext) defer sess.Close() if err := sess.Begin(); err != nil { return err |