self-hosted/focalboard
1
0
Fork 0
mirror of https://github.com/mattermost/focalboard.git synced 2025-04-17 11:36:22 +02:00
Code Issues Releases Activity

Replace query with exec on database update queries (#3420)

Browse Source
This commit is contained in:
Miguel de la Cruz 2022-07-27 09:23:04 +02:00 committed by GitHub
parent f06e10ed79
commit ac717490ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
server/services/store/sqlstore/data_migrations.go
View File

@ -199,8 +199,8 @@ func (s *SQLStore) getIDs(db sq.BaseRunner, table string) ([]string, error) {
s.logger.Error("getIDs error", mlog.String("table", table), mlog.Err(err)) s.logger.Error("getIDs error", mlog.String("table", table), mlog.Err(err))
return nil, err return nil, err
} }
defer s.CloseRows(rows) defer s.CloseRows(rows)
var categoryIDs []string var categoryIDs []string
for rows.Next() { for rows.Next() {
var id string var id string
@ -218,40 +218,29 @@ func (s *SQLStore) getIDs(db sq.BaseRunner, table string) ([]string, error) {
func (s *SQLStore) updateCategoryID(db sq.BaseRunner, oldID, newID string) error { func (s *SQLStore) updateCategoryID(db sq.BaseRunner, oldID, newID string) error {
// update in category table // update in category table
rows, err := s.getQueryBuilder(db). _, err := s.getQueryBuilder(db).
Update(s.tablePrefix+"categories"). Update(s.tablePrefix+"categories").
Set("id", newID). Set("id", newID).
Where(sq.Eq{"id": oldID}). Where(sq.Eq{"id": oldID}).
Query() Exec()
if err != nil { if err != nil {
s.logger.Error("updateCategoryID update category error", mlog.Err(err)) s.logger.Error("updateCategoryID update category error", mlog.Err(err))
return err return err
} }
if err = rows.Close(); err != nil {
s.logger.Error("updateCategoryID error closing rows after updating categories table IDs", mlog.Err(err))
return err
}
// update category boards table // update category boards table
_, err = s.getQueryBuilder(db).
rows, err = s.getQueryBuilder(db).
Update(s.tablePrefix+"category_boards"). Update(s.tablePrefix+"category_boards").
Set("category_id", newID). Set("category_id", newID).
Where(sq.Eq{"category_id": oldID}). Where(sq.Eq{"category_id": oldID}).
Query() Exec()
if err != nil { if err != nil {
s.logger.Error("updateCategoryID update category boards error", mlog.Err(err)) s.logger.Error("updateCategoryID update category boards error", mlog.Err(err))
return err return err
} }
if err := rows.Close(); err != nil {
s.logger.Error("updateCategoryID error closing rows after updating category boards table IDs", mlog.Err(err))
return err
}
return nil return nil
} }
@ -282,17 +271,16 @@ func (s *SQLStore) updateCategoryBlocksIDs(db sq.BaseRunner) error {
func (s *SQLStore) updateCategoryBlocksID(db sq.BaseRunner, oldID, newID string) error { func (s *SQLStore) updateCategoryBlocksID(db sq.BaseRunner, oldID, newID string) error {
// update in category table // update in category table
rows, err := s.getQueryBuilder(db). _, err := s.getQueryBuilder(db).
Update(s.tablePrefix+"category_boards"). Update(s.tablePrefix+"category_boards").
Set("id", newID). Set("id", newID).
Where(sq.Eq{"id": oldID}). Where(sq.Eq{"id": oldID}).
Query() Exec()
if err != nil { if err != nil {
s.logger.Error("updateCategoryBlocksID update category error", mlog.Err(err)) s.logger.Error("updateCategoryBlocksID update category error", mlog.Err(err))
return err return err
} }
rows.Close()
return nil return nil
} }