From 50beae6104f10ea0c6ebc2fb91f8db5eb6aa7440 Mon Sep 17 00:00:00 2001 From: LinkinStars Date: Thu, 31 Aug 2023 16:16:45 +0800 Subject: [PATCH] fix(user): Adding quotes to the user keyword to fix compatibility issues under PostgreSQL #424 --- internal/repo/answer/answer_repo.go | 2 +- internal/repo/user/user_backyard_repo.go | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/internal/repo/answer/answer_repo.go b/internal/repo/answer/answer_repo.go index a662225d..a2fe119e 100644 --- a/internal/repo/answer/answer_repo.go +++ b/internal/repo/answer/answer_repo.go @@ -258,7 +258,7 @@ func (ar *answerRepo) SearchList(ctx context.Context, search *entity.AnswerSearc search.PageSize = constant.DefaultPageSize } offset := search.Page * search.PageSize - session := ar.data.DB.Context(ctx).Where("") + session := ar.data.DB.Context(ctx) if search.QuestionID != "" { session = session.And("question_id = ?", search.QuestionID) diff --git a/internal/repo/user/user_backyard_repo.go b/internal/repo/user/user_backyard_repo.go index 1b06f2dc..bb2b1034 100644 --- a/internal/repo/user/user_backyard_repo.go +++ b/internal/repo/user/user_backyard_repo.go @@ -131,21 +131,21 @@ func (ur *userAdminRepo) GetUserPage(ctx context.Context, page, pageSize int, us session := ur.data.DB.Context(ctx) switch user.Status { case entity.UserStatusDeleted: - session.Desc("user.deleted_at") + session.Desc("`user`.deleted_at") case entity.UserStatusSuspended: - session.Desc("user.suspended_at") + session.Desc("`user`.suspended_at") default: - session.Desc("user.created_at") + session.Desc("`user`.created_at") } if len(usernameOrDisplayName) > 0 { session.And(builder.Or( - builder.Like{"user.username", usernameOrDisplayName}, - builder.Like{"user.display_name", usernameOrDisplayName}, + builder.Like{"`user`.username", usernameOrDisplayName}, + builder.Like{"`user`.display_name", usernameOrDisplayName}, )) } if isStaff { - session.Join("INNER", "user_role_rel", "user.id = user_role_rel.user_id AND user_role_rel.role_id > 1") + session.Join("INNER", "user_role_rel", "`user`.id = `user_role_rel`.user_id AND `user_role_rel`.role_id > 1") } total, err = pager.Help(page, pageSize, &users, user, session)