From 888dee3b5f931062ea97e57130b26d1943e5173e Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Mon, 20 Mar 2017 22:13:52 +0800 Subject: [PATCH] fix delete user failed on sqlite (#1321) --- models/external_login_user.go | 10 +++++----- 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 ad303d7535..72c21f4369 100644 --- a/models/user.go +++ b/models/user.go @@ -990,7 +990,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 *****