fix delete user failed on sqlite (#1321)

diff --git a/models/external_login_user.go b/models/external_login_user.go
index ade1b8a13bab78a5f3fc1ac12c3c2454729f7dc8..b2680943c43695b0ebcad8b3f40d2afebf218cc7 100644 (file)
--- 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 ad303d753506acd0d831a6dc255dd2f068b7fb9b..72c21f4369443defb5a933d74ecd471db459ffdc 100644 (file)
--- 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 *****