diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2017-03-20 22:13:52 +0800 |
|---|---|---|
| committer | Kim "BKC" Carlbäcker <kim.carlbacker@gmail.com> | 2017-05-17 12:43:22 +0200 |
| commit | fa059debcaf3515ad51ef98741aca8a850076665 (patch) | |
| tree | 06fdca6b00ed68ec1b5c1bdcd40cf25a4479874b | |
| parent | 2854c8aa47a220bc0d726dfb261bc40de093ea20 (diff) | |
| download | gitea-fa059debcaf3515ad51ef98741aca8a850076665.tar.gz gitea-fa059debcaf3515ad51ef98741aca8a850076665.zip | |
fix delete user failed on sqlite (#1321)
| -rw-r--r-- | models/external_login_user.go | 10 | ||||
| -rw-r--r-- | models/user.go | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/models/external_login_user.go b/models/external_login_user.go index ade1b8a13b..b2680943c4 100644 --- a/models/external_login_user.go +++ b/models/external_login_user.go @@ -9,8 +9,8 @@ import "github.com/markbates/goth" // ExternalLoginUser makes the connecting between some existing user and additional external login sources type ExternalLoginUser struct { ExternalID string `xorm:"NOT NULL"` - UserID int64 `xorm:"NOT NULL"` - LoginSourceID int64 `xorm:"NOT NULL"` + UserID int64 `xorm:"NOT NULL"` + LoginSourceID int64 `xorm:"NOT NULL"` } // GetExternalLogin checks if a externalID in loginSourceID scope already exists @@ -67,8 +67,8 @@ func RemoveAccountLink(user *User, loginSourceID int64) (int64, error) { return deleted, err } -// RemoveAllAccountLinks will remove all external login sources for the given user -func RemoveAllAccountLinks(user *User) error { - _, err := x.Delete(&ExternalLoginUser{UserID: user.ID}) +// removeAllAccountLinks will remove all external login sources for the given user +func removeAllAccountLinks(e Engine, user *User) error { + _, err := e.Delete(&ExternalLoginUser{UserID: user.ID}) return err } diff --git a/models/user.go b/models/user.go index d07da68deb..8cec1788b9 100644 --- a/models/user.go +++ b/models/user.go @@ -989,7 +989,7 @@ func deleteUser(e *xorm.Session, u *User) error { } // ***** START: ExternalLoginUser ***** - if err = RemoveAllAccountLinks(u); err != nil { + if err = removeAllAccountLinks(e, u); err != nil { return fmt.Errorf("ExternalLoginUser: %v", err) } // ***** END: ExternalLoginUser ***** |