milvus-io
/
milvus
mirror of https://github.com/milvus-io/milvus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix wrong operation model for user (#18614) (#18615) 

Signed-off-by: kejiang <ke.jiang@zilliz.com>

Signed-off-by: kejiang <ke.jiang@zilliz.com>
Co-authored-by: kejiang <ke.jiang@zilliz.com>
pull/18647/head
codeman 2022-08-11 20:22:38 +08:00 committed by GitHub
parent 2d7a49fad1
commit 174130c7d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/metastore/db/dao/user.go
View File

@ -53,7 +53,7 @@ func (s *userDb) Insert(in *dbmodel.User) error {
}
func (s *userDb) MarkDeletedByUsername(tenantID string, username string) error {
err := s.db.Model(&dbmodel.Index{}).Where("tenant_id = ? AND username = ?", tenantID, username).Update("is_deleted", true).Error
err := s.db.Model(&dbmodel.User{}).Where("tenant_id = ? AND username = ?", tenantID, username).Update("is_deleted", true).Error
if err != nil {
log.Error("update credential_users is_deleted=true failed", zap.String("tenant", tenantID), zap.String("username", username), zap.Error(err))
return err

4
internal/metastore/db/dao/user_test.go
View File

@ -144,7 +144,7 @@ func TestUser_MarkDeletedByUsername(t *testing.T) {
// expectation
mock.ExpectBegin()
mock.ExpectExec("UPDATE `indexes` SET `is_deleted`=?,`updated_at`=? WHERE tenant_id = ? AND username = ?").
mock.ExpectExec("UPDATE `credential_users` SET `is_deleted`=?,`updated_at`=? WHERE tenant_id = ? AND username = ?").
WithArgs(true, AnyTime{}, tenantID, username).
WillReturnResult(sqlmock.NewResult(1, 1))
mock.ExpectCommit()
@ -159,7 +159,7 @@ func TestUser_MarkDeletedByUsername_Error(t *testing.T) {
// expectation
mock.ExpectBegin()
mock.ExpectExec("UPDATE `indexes` SET `is_deleted`=?,`updated_at`=? WHERE tenant_id = ? AND username = ?").
mock.ExpectExec("UPDATE `credential_users` SET `is_deleted`=?,`updated_at`=? WHERE tenant_id = ? AND username = ?").
WithArgs(true, AnyTime{}, tenantID, username).
WillReturnError(errors.New("test error"))
mock.ExpectRollback()