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/upload.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/upload.go')
| -rw-r--r-- | models/upload.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/models/upload.go b/models/upload.go index ca88c6a393..503220db57 100644 --- a/models/upload.go +++ b/models/upload.go @@ -73,7 +73,7 @@ func NewUpload(name string, buf []byte, file multipart.File) (_ *Upload, err err return nil, fmt.Errorf("Copy: %v", err) } - if _, err := db.DefaultContext().Engine().Insert(upload); err != nil { + if _, err := db.GetEngine(db.DefaultContext).Insert(upload); err != nil { return nil, err } @@ -83,7 +83,7 @@ func NewUpload(name string, buf []byte, file multipart.File) (_ *Upload, err err // GetUploadByUUID returns the Upload by UUID func GetUploadByUUID(uuid string) (*Upload, error) { upload := &Upload{} - has, err := db.DefaultContext().Engine().Where("uuid=?", uuid).Get(upload) + has, err := db.GetEngine(db.DefaultContext).Where("uuid=?", uuid).Get(upload) if err != nil { return nil, err } else if !has { @@ -100,7 +100,7 @@ func GetUploadsByUUIDs(uuids []string) ([]*Upload, error) { // Silently drop invalid uuids. uploads := make([]*Upload, 0, len(uuids)) - return uploads, db.DefaultContext().Engine().In("uuid", uuids).Find(&uploads) + return uploads, db.GetEngine(db.DefaultContext).In("uuid", uuids).Find(&uploads) } // DeleteUploads deletes multiple uploads @@ -109,7 +109,7 @@ func DeleteUploads(uploads ...*Upload) (err error) { return nil } - sess := db.DefaultContext().NewSession() + sess := db.NewSession(db.DefaultContext) defer sess.Close() if err = sess.Begin(); err != nil { return err |