diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2021-09-19 19:49:59 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-19 19:49:59 +0800 |
| commit | a4bfef265d9e512830350635a0489c2cdcd6508f (patch) | |
| tree | 1e3c2ec94276dfcb2f8ba73a2ac075ba39c4a34a /models/ssh_key_principals.go | |
| parent | 462306e263db5a809dbe2cdf62e99307aeff28de (diff) | |
| download | gitea-a4bfef265d9e512830350635a0489c2cdcd6508f.tar.gz gitea-a4bfef265d9e512830350635a0489c2cdcd6508f.zip | |
Move db related basic functions to models/db (#17075)
* Move db related basic functions to models/db
* Fix lint
* Fix lint
* Fix test
* Fix lint
* Fix lint
* revert unnecessary change
* Fix test
* Fix wrong replace string
* Use *Context
* Correct committer spelling and fix wrong replaced words
Co-authored-by: zeripath <art27@cantab.net>
Diffstat (limited to 'models/ssh_key_principals.go')
| -rw-r--r-- | models/ssh_key_principals.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/models/ssh_key_principals.go b/models/ssh_key_principals.go index 4810855774..5f95cf74df 100644 --- a/models/ssh_key_principals.go +++ b/models/ssh_key_principals.go @@ -9,6 +9,7 @@ import ( "fmt" "strings" + "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/modules/setting" ) @@ -23,7 +24,7 @@ import ( // AddPrincipalKey adds new principal to database and authorized_principals file. func AddPrincipalKey(ownerID int64, content string, loginSourceID int64) (*PublicKey, error) { - sess := x.NewSession() + sess := db.DefaultContext().NewSession() defer sess.Close() if err := sess.Begin(); err != nil { return nil, err @@ -60,7 +61,7 @@ func AddPrincipalKey(ownerID int64, content string, loginSourceID int64) (*Publi return key, RewriteAllPrincipalKeys() } -func addPrincipalKey(e Engine, key *PublicKey) (err error) { +func addPrincipalKey(e db.Engine, key *PublicKey) (err error) { // Save Key representing a principal. if _, err = e.Insert(key); err != nil { return err @@ -112,7 +113,7 @@ func CheckPrincipalKeyString(user *User, content string) (_ string, err error) { // ListPrincipalKeys returns a list of principals belongs to given user. func ListPrincipalKeys(uid int64, listOptions ListOptions) ([]*PublicKey, error) { - sess := x.Where("owner_id = ? AND type = ?", uid, KeyTypePrincipal) + sess := db.DefaultContext().Engine().Where("owner_id = ? AND type = ?", uid, KeyTypePrincipal) if listOptions.Page != 0 { sess = setSessionPagination(sess, &listOptions) |