Skip to content

Commit

Permalink
Cherrypicking 22606 to old focalboard
Browse files Browse the repository at this point in the history
  • Loading branch information
@harshilsharma63
harshilsharma63 committed Mar 29, 2023
1 parent d7af2be commit 1ff51ad
Show file tree
Hide file tree
Showing 11 changed files with 70 additions and 18 deletions.
6 changes: 2 additions & 4 deletions server/services/store/sqlstore/data_migrations.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -868,10 +868,8 @@ func (s *SQLStore) doesDuplicateCategoryBoardsExist() (bool, error) {
}

func (s *SQLStore) runMySQLDeDuplicateCategoryBoardsMigration() error {
query := "WITH duplicates AS (SELECT id, ROW_NUMBER() OVER(PARTITION BY user_id, board_id) AS rownum " +
"FROM " + s.tablePrefix + "category_boards) " +
"DELETE " + s.tablePrefix + "category_boards FROM " + s.tablePrefix + "category_boards " +
"JOIN duplicates USING(id) WHERE duplicates.rownum > 1;"
query := "DELETE FROM " + s.tablePrefix + "category_boards WHERE id NOT IN " +
"(SELECT * FROM ( SELECT min(id) FROM " + s.tablePrefix + "category_boards GROUP BY user_id, board_id ) as data)"
if _, err := s.db.Exec(query); err != nil {
s.logger.Error("Failed to de-duplicate data in category_boards table", mlog.Err(err))
}
Expand Down
3 changes: 3 additions & 0 deletions server/services/store/sqlstore/migrationstests/boards_migrator_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,9 @@ func (bm *BoardsMigrator) MigrateToStep(step int) error {
func (bm *BoardsMigrator) Interceptors() map[int]foundation.Interceptor {
return map[int]foundation.Interceptor{
18: bm.store.RunDeletedMembershipBoardsMigration,
35: func() error {
return bm.store.RunDeDuplicateCategoryBoardsMigration(35)
},
}
}

Expand Down
28 changes: 28 additions & 0 deletions ...er/services/store/sqlstore/migrationstests/de_duplicate_category_boards_migration_test.go
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
package migrationstests

import (
"github.com/stretchr/testify/assert"
"testing"
)

func TestRunDeDuplicateCategoryBoardsMigration(t *testing.T) {
th, tearDown := SetupTestHelper(t)
defer tearDown()

if th.IsSQLite() {
t.Skip("SQLite is not supported for this")
}

th.f.MigrateToStepSkippingLastInterceptor(35).
ExecFile("./fixtures/testDeDuplicateCategoryBoardsMigration.sql")

th.f.RunInterceptor(35)

// verifying count of rows
var count int
countQuery := "SELECT COUNT(*) FROM focalboard_category_boards"
row := th.f.DB().QueryRow(countQuery)
err := row.Scan(&count)
assert.NoError(t, err)
assert.Equal(t, 4, count)
}
6 changes: 4 additions & 2 deletions server/services/store/sqlstore/migrationstests/fixtures/test33_with_deleted_data.sql
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
INSERT INTO focalboard_category_boards values
INSERT INTO focalboard_category_boards
(id, user_id, category_id, board_id, create_at, update_at, delete_at, sort_order)
values
('id-1', 'user_id-1', 'category-id-1', 'board-id-1', 1672988834402, 1672988834402, 0, 0),
('id-2', 'user_id-1', 'category-id-2', 'board-id-1', 1672988834402, 1672988834402, 0, 0),
('id-3', 'user_id-2', 'category-id-3', 'board-id-2', 1672988834402, 1672988834402, 1672988834402, 0),
('id-4', 'user_id-2', 'category-id-3', 'board-id-4', 1672988834402, 1672988834402, 0, 0),
('id-5', 'user_id-3', 'category-id-4', 'board-id-3', 1672988834402, 1672988834402, 1672988834402, 0);
('id-5', 'user_id-3', 'category-id-4', 'board-id-3', 1672988834402, 1672988834402, 1672988834402, 0);
6 changes: 4 additions & 2 deletions server/services/store/sqlstore/migrationstests/fixtures/test33_with_no_deleted_data.sql
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
INSERT INTO focalboard_category_boards values
INSERT INTO focalboard_category_boards
(id, user_id, category_id, board_id, create_at, update_at, delete_at, sort_order)
values
('id-1', 'user_id-1', 'category-id-1', 'board-id-1', 1672988834402, 1672988834402, 0, 0),
('id-2', 'user_id-1', 'category-id-2', 'board-id-1', 1672988834402, 1672988834402, 0, 0),
('id-3', 'user_id-2', 'category-id-3', 'board-id-2', 1672988834402, 1672988834402, 0, 0),
('id-4', 'user_id-2', 'category-id-3', 'board-id-4', 1672988834402, 1672988834402, 0, 0),
('id-5', 'user_id-3', 'category-id-4', 'board-id-3', 1672988834402, 1672988834402, 0, 0);
('id-5', 'user_id-3', 'category-id-4', 'board-id-3', 1672988834402, 1672988834402, 0, 0);
6 changes: 4 additions & 2 deletions server/services/store/sqlstore/migrationstests/fixtures/test37_valid_data.sql
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
INSERT INTO focalboard_category_boards VALUES
INSERT INTO focalboard_category_boards
(id, user_id, category_id, board_id, create_at, update_at, sort_order, hidden)
VALUES
('id-1', 'user-id-1', 'category-id-1', 'board-id-1', 1672889246832, 1672889246832, 0, false),
('id-2', 'user-id-1', 'category-id-2', 'board-id-2', 1672889246832, 1672889246832, 0, false),
('id-3', 'user-id-2', 'category-id-3', 'board-id-3', 1672889246832, 1672889246832, 0, false),
Expand All @@ -7,4 +9,4 @@ INSERT INTO focalboard_category_boards VALUES

INSERT INTO Preferences VALUES
('user-id-1', 'focalboard', 'hiddenBoardIDs', '["board-id-1"]'),
('user-id-2', 'focalboard', 'hiddenBoardIDs', '["board-id-3", "board-id-4"]');
('user-id-2', 'focalboard', 'hiddenBoardIDs', '["board-id-3", "board-id-4"]');
6 changes: 4 additions & 2 deletions ...r/services/store/sqlstore/migrationstests/fixtures/test37_valid_data_no_hidden_boards.sql
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
INSERT INTO focalboard_category_boards VALUES
INSERT INTO focalboard_category_boards
(id, user_id, category_id, board_id, create_at, update_at, sort_order, hidden)
VALUES
('id-1', 'user-id-1', 'category-id-1', 'board-id-1', 1672889246832, 1672889246832, 0, false),
('id-2', 'user-id-1', 'category-id-2', 'board-id-2', 1672889246832, 1672889246832, 0, false),
('id-3', 'user-id-2', 'category-id-3', 'board-id-3', 1672889246832, 1672889246832, 0, false),
('id-4', 'user-id-2', 'category-id-3', 'board-id-4', 1672889246832, 1672889246832, 0, false),
('id-5', 'user-id-3', 'category-id-4', 'board-id-5', 1672889246832, 1672889246832, 0, false);
('id-5', 'user-id-3', 'category-id-4', 'board-id-5', 1672889246832, 1672889246832, 0, false);
6 changes: 4 additions & 2 deletions ...re/sqlstore/migrationstests/fixtures/test37_valid_data_preference_but_no_hidden_board.sql
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
INSERT INTO focalboard_category_boards VALUES
INSERT INTO focalboard_category_boards
(id, user_id, category_id, board_id, create_at, update_at, sort_order, hidden)
VALUES
('id-1', 'user-id-1', 'category-id-1', 'board-id-1', 1672889246832, 1672889246832, 0, false),
('id-2', 'user-id-1', 'category-id-2', 'board-id-2', 1672889246832, 1672889246832, 0, false),
('id-3', 'user-id-2', 'category-id-3', 'board-id-3', 1672889246832, 1672889246832, 0, false),
Expand All @@ -7,4 +9,4 @@ INSERT INTO focalboard_category_boards VALUES

INSERT INTO Preferences VALUES
('user-id-1', 'focalboard', 'hiddenBoardIDs', ''),
('user-id-2', 'focalboard', 'hiddenBoardIDs', '');
('user-id-2', 'focalboard', 'hiddenBoardIDs', '');
6 changes: 4 additions & 2 deletions server/services/store/sqlstore/migrationstests/fixtures/test37_valid_data_sqlite.sql
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
INSERT INTO focalboard_category_boards VALUES
INSERT INTO focalboard_category_boards
(id, user_id, category_id, board_id, create_at, update_at, sort_order, hidden)
VALUES
('id-1', 'user-id-1', 'category-id-1', 'board-id-1', 1672889246832, 1672889246832, 0, false),
('id-2', 'user-id-1', 'category-id-2', 'board-id-2', 1672889246832, 1672889246832, 0, false),
('id-3', 'user-id-2', 'category-id-3', 'board-id-3', 1672889246832, 1672889246832, 0, false),
Expand All @@ -7,4 +9,4 @@ INSERT INTO focalboard_category_boards VALUES

INSERT INTO focalboard_preferences VALUES
('user-id-1', 'focalboard', 'hiddenBoardIDs', '["board-id-1"]'),
('user-id-2', 'focalboard', 'hiddenBoardIDs', '["board-id-3", "board-id-4"]');
('user-id-2', 'focalboard', 'hiddenBoardIDs', '["board-id-3", "board-id-4"]');
6 changes: 4 additions & 2 deletions ...tore/migrationstests/fixtures/test37_valid_data_sqlite_preference_but_no_hidden_board.sql
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
INSERT INTO focalboard_category_boards VALUES
INSERT INTO focalboard_category_boards
(id, user_id, category_id, board_id, create_at, update_at, sort_order, hidden)
VALUES
('id-1', 'user-id-1', 'category-id-1', 'board-id-1', 1672889246832, 1672889246832, 0, false),
('id-2', 'user-id-1', 'category-id-2', 'board-id-2', 1672889246832, 1672889246832, 0, false),
('id-3', 'user-id-2', 'category-id-3', 'board-id-3', 1672889246832, 1672889246832, 0, false),
Expand All @@ -7,4 +9,4 @@ INSERT INTO focalboard_category_boards VALUES

INSERT INTO focalboard_preferences VALUES
('user-id-1', 'focalboard', 'hiddenBoardIDs', ''),
('user-id-2', 'focalboard', 'hiddenBoardIDs', '');
('user-id-2', 'focalboard', 'hiddenBoardIDs', '');
9 changes: 9 additions & 0 deletions ...rvices/store/sqlstore/migrationstests/fixtures/testDeDuplicateCategoryBoardsMigration.sql
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
INSERT INTO focalboard_category_boards(id, user_id, category_id, board_id, create_at, update_at, sort_order)
VALUES
('id_1', 'user_id_1', 'category_id_1', 'board_id_1', 0, 0, 0),
('id_2', 'user_id_1', 'category_id_2', 'board_id_1', 0, 0, 0),
('id_3', 'user_id_1', 'category_id_3', 'board_id_1', 0, 0, 0),
('id_4', 'user_id_2', 'category_id_4', 'board_id_2', 0, 0, 0),
('id_5', 'user_id_2', 'category_id_5', 'board_id_2', 0, 0, 0),
('id_6', 'user_id_3', 'category_id_6', 'board_id_3', 0, 0, 0),
('id_7', 'user_id_4', 'category_id_6', 'board_id_4', 0, 0, 0);

0 comments on commit 1ff51ad

Please sign in to comment.