From 22853628b26b6c6777d389fc13a9253a5ccfddea Mon Sep 17 00:00:00 2001 From: jingkai Date: Mon, 1 Mar 2021 22:43:56 +0800 Subject: [PATCH] Refactor term_of_service_store to use squirrel (#16923) * refactor: replace select statement with squirell * fix: fixed sqlquery for GetLatest * fix: gofmt * fix: replaced old AppError with errors.Wrap Co-authored-by: Mattermod --- store/sqlstore/terms_of_service_store.go | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/store/sqlstore/terms_of_service_store.go b/store/sqlstore/terms_of_service_store.go index ad17d5b754..437bc96428 100644 --- a/store/sqlstore/terms_of_service_store.go +++ b/store/sqlstore/terms_of_service_store.go @@ -55,8 +55,18 @@ func (s SqlTermsOfServiceStore) Save(termsOfService *model.TermsOfService) (*mod func (s SqlTermsOfServiceStore) GetLatest(allowFromCache bool) (*model.TermsOfService, error) { var termsOfService *model.TermsOfService - err := s.GetReplica().SelectOne(&termsOfService, "SELECT * FROM TermsOfService ORDER BY CreateAt DESC LIMIT 1") + query := s.getQueryBuilder(). + Select("*"). + From("TermsOfService"). + OrderBy("CreateAt DESC"). + Limit(uint64(1)) + + queryString, args, err := query.ToSql() if err != nil { + return nil, errors.Wrap(err, "could not build sql query to get latest TOS") + } + + if err := s.GetReplica().SelectOne(&termsOfService, queryString, args...); err != nil { if err == sql.ErrNoRows { return nil, store.NewErrNotFound("TermsOfService", "CreateAt=latest") }